From f893edcc02f9b830a5d51a26e2d77166f863ad48 Mon Sep 17 00:00:00 2001
From: Atish Amte <atishamte@gmail.com>
Date: Sat, 15 Jul 2023 00:49:31 +0530
Subject: [PATCH 1/2] ChatMessage Order Fixed

---
 packages/server/src/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 74c4d07e4..ff7d375d0 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -306,8 +306,13 @@ export class App {
 
         // Get all chatmessages from chatflowid
         this.app.get('/api/v1/chatmessage/:id', async (req: Request, res: Response) => {
-            const chatmessages = await this.AppDataSource.getRepository(ChatMessage).findBy({
-                chatflowid: req.params.id
+            const chatmessages = await this.AppDataSource.getRepository(ChatMessage).find({
+                where: {
+                    chatflowid: req.params.id
+                },
+                order: {
+                    createdDate: 'ASC'
+                },
             })
             return res.json(chatmessages)
         })

From 78ee45565f2395f25e68aefe2769e2d0ee9eb5b2 Mon Sep 17 00:00:00 2001
From: Atish Amte <atishamte@gmail.com>
Date: Sun, 16 Jul 2023 01:06:38 +0530
Subject: [PATCH 2/2] Update index.ts

---
 packages/server/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index ff7d375d0..1c2d4ebc4 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -312,7 +312,7 @@ export class App {
                 },
                 order: {
                     createdDate: 'ASC'
-                },
+                }
             })
             return res.json(chatmessages)
         })