From 72d2cfae27a2a7aee1c3af58cc4954678329a18f Mon Sep 17 00:00:00 2001
From: Giovanni-Josserand <josserand.giovanni@gmail.com>
Date: Thu, 19 Mar 2026 16:58:21 +0100
Subject: [PATCH] resolve datetime conflict for notifications

---
 src/components/NotificationCard/NotificationCard.tsx   | 2 +-
 src/utils/date/formatDate.ts                           | 4 +++-
 src/utils/date/formatTime.ts                           | 2 +-
 src/utils/echo/listeners/adminNotificationsListener.js | 2 +-
 src/utils/echo/listeners/userNotificationsListener.js  | 7 ++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/NotificationCard/NotificationCard.tsx b/src/components/NotificationCard/NotificationCard.tsx
index b1baa66..5412b0d 100644
--- a/src/components/NotificationCard/NotificationCard.tsx
+++ b/src/components/NotificationCard/NotificationCard.tsx
@@ -14,7 +14,7 @@ function NotificationCard({ notifications, deleteNotification }: NotificationCar
             <div className={styles.notificationCard} key={index}>
                 <div className={styles.cardHeader}>
                     <span className={styles.timeTag}>
-                        Le {formatDate(String(notification.created_at))} à {formatTime(String(notification.created_at))}
+                        Le {formatDate(notification.created_at)} à {formatTime(notification.created_at)}
                     </span>
                     <button
                         className={styles.closeIconButton}
diff --git a/src/utils/date/formatDate.ts b/src/utils/date/formatDate.ts
index 5a14daa..8f4bf1b 100644
--- a/src/utils/date/formatDate.ts
+++ b/src/utils/date/formatDate.ts
@@ -1,4 +1,6 @@
-export default function formatDate(d: string | Date): string {
+export default function formatDate(d: string | Date | number | null | undefined): string {
+  if (!d) return "Date inconnue";
+
   const date = d instanceof Date ? d : new Date(d);
 
   const jj = String(date.getUTCDate()).padStart(2, "0");
diff --git a/src/utils/date/formatTime.ts b/src/utils/date/formatTime.ts
index 93311b9..561d03a 100644
--- a/src/utils/date/formatTime.ts
+++ b/src/utils/date/formatTime.ts
@@ -1,5 +1,5 @@
 
-export default function formatTime(d: string | Date | null | undefined): string {
+export default function formatTime(d: string | Date | number | null | undefined): string {
   if (!d) return "Heure inconnue";
 
   const date = d instanceof Date ? d : new Date(d);
diff --git a/src/utils/echo/listeners/adminNotificationsListener.js b/src/utils/echo/listeners/adminNotificationsListener.js
index 7617b49..ec4fa03 100644
--- a/src/utils/echo/listeners/adminNotificationsListener.js
+++ b/src/utils/echo/listeners/adminNotificationsListener.js
@@ -6,7 +6,7 @@ export const adminNotificationsListener = (echo, userData, setNotifications, set
             const newNotification = {
                 id: Date.now(),
                 content,
-                created_at: Date.now(),
+                created_at: new Date().toISOString(),
                 pivot: { unread: 1 }
             };
             setNotifications(prev => [newNotification, ...prev]);
diff --git a/src/utils/echo/listeners/userNotificationsListener.js b/src/utils/echo/listeners/userNotificationsListener.js
index 7fa193d..253378d 100644
--- a/src/utils/echo/listeners/userNotificationsListener.js
+++ b/src/utils/echo/listeners/userNotificationsListener.js
@@ -3,12 +3,14 @@ export const userNotificationsListener = (echo, userData, setNotifications, setU
     const channelName = `user.${userData.id}`;
 
     const handleNotification = (content) => {
+
         const newNotification = {
             id: Date.now(),
             content,
-            created_at: Date.now(),
+            created_at: new Date().toISOString(),
             pivot: { unread: 1 }
         };
+
         setNotifications(prev => [newNotification, ...prev]);
         setUnreadNotification(true);
     };
@@ -25,5 +27,8 @@ export const userNotificationsListener = (echo, userData, setNotifications, setU
         })
         .listen('.volunteer.unassigned.to.task', (event) => {
             handleNotification(`Vous avez été désassigné de la tâche ${event.task.name} de l'événement ${event.event.name}`);
+        })
+        .listen('.volunteer.role.updated', (event) => {
+            handleNotification(`Votre rôle a changé pour : ${event.role} !`);
         });
 };
\ No newline at end of file