From fee30256cc9eb35f7ff0532a09a988301260e095 Mon Sep 17 00:00:00 2001
From: "audric.sabatier" <audric.sabatier@etu.uca.fr>
Date: Mon, 16 Jan 2023 09:53:43 -0500
Subject: [PATCH] ADD : Timestamp to display messages in order

---
 Sources/dafl_project_flutter/lib/model/message.dart         | 6 +++++-
 .../lib/services/messaging/message_database_service.dart    | 1 +
 .../lib/views/pages/main/p_conversation.dart                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Sources/dafl_project_flutter/lib/model/message.dart b/Sources/dafl_project_flutter/lib/model/message.dart
index fa0bcbd..eca60f9 100644
--- a/Sources/dafl_project_flutter/lib/model/message.dart
+++ b/Sources/dafl_project_flutter/lib/model/message.dart
@@ -4,11 +4,13 @@ class Message {
   String idSender;
   String idReceiver;
   String content;
+  String timestamp;
 
 
   Message({required this.idSender,
     required this.idReceiver,
-    required this.content
+    required this.content,
+    required this.timestamp
   });
 
 
@@ -17,6 +19,7 @@ class Message {
       'idSender': idSender,
       'idReceiver': idReceiver,
       'content': content,
+      'timestamp' : timestamp
     };
   }
 
@@ -26,6 +29,7 @@ class Message {
       idSender: data['idSender'],
       idReceiver: data['idReceiver'],
       content: data['content'],
+        timestamp: data['timestamp']
     );
   }
 }
\ No newline at end of file
diff --git a/Sources/dafl_project_flutter/lib/services/messaging/message_database_service.dart b/Sources/dafl_project_flutter/lib/services/messaging/message_database_service.dart
index d0f743e..60974d1 100644
--- a/Sources/dafl_project_flutter/lib/services/messaging/message_database_service.dart
+++ b/Sources/dafl_project_flutter/lib/services/messaging/message_database_service.dart
@@ -54,6 +54,7 @@ class MessageDatabaseService{
         .collection('messages')
         .doc(chatId)
         .collection(chatId)
+        .orderBy('timestamp', descending: true)
         .snapshots().map(_getAllMessages);
   }
 }
\ No newline at end of file
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
index 66b487e..c1020d9 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
@@ -24,7 +24,7 @@ class _ConversationPageState extends State<ConversationPage> {
   final messageTextField = TextEditingController();
 
   void sendMessage(String content, String idSender, String idReceiver) {
-    Message messageToSend = Message(idSender: idSender, idReceiver: idReceiver, content: content);
+    Message messageToSend = Message(idSender: idSender, idReceiver: idReceiver, content: content, timestamp: DateTime.now().toString());
 
     MyApp.controller.sendMessage(messageToSend, idSender, idReceiver);