From 4ddac54ab797e2454099dd95c16d3b82414bc762 Mon Sep 17 00:00:00 2001
From: shahzeydyfah <shahzeydyfah>
Date: Mon, 17 Aug 2026 21:38:03 +0330
Subject: [PATCH] fix(report):order progress_month_report

---
 app/repositories/report.py | 42 ++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/repositories/report.py b/app/repositories/report.py
index dc83684..0a3b486 100644
--- a/app/repositories/report.py
+++ b/app/repositories/report.py
@@ -412,15 +412,45 @@ class ReportRepository():
         to_date = datetime.combine(_inp.to_date.date(), time.max)
         from_date = _inp.from_date.combine(_inp.from_date.date(), time.min)
         result = await use_collection(TaskEnv.CLN_MONITOR_PYSICAL).aggregate([
-            {"$match":{"date_at":{"$lte":to_date,"$gte":from_date}}},
             {
-                "$sort": {'date_at': -1}
+                "$match": {
+                    "date_at": {
+                        "$lte": to_date,
+                        "$gte": from_date
+                    }
+                }
             },
-            {"$group":
-                {'_id': {"year": "$year", "month": "$month"},
-                'avg': {'$avg': "$real"}},
-             }
+            {
+                "$group": {
+                    "_id": {
+                        "year": "$year",
+                        "month": "$month"
+                    },
+                    "avg": {
+                        "$avg": "$real"
+                    },
+                    "sort_date": {
+                        "$max": "$date_at"
+                    }
+                }
+            },
+            {
+                "$sort": {
+                    "sort_date": -1
+                }
+            }
         ]).to_list(None)
+
+        # result = await use_collection(TaskEnv.CLN_MONITOR_PYSICAL).aggregate([
+        #     {"$match":{"date_at":{"$lte":to_date,"$gte":from_date}}},
+        #     {
+        #         "$sort": {'date_at': -1}
+        #     },
+        #     {"$group":
+        #         {'_id': {"year": "$year", "month": "$month"},
+        #         'avg': {'$avg': "$real"}},
+        #      }
+        # ]).to_list(None)
         return result
 
     async def design_progress_status(self):