Use scope and rename method

models/dashboard.py

@@ -15,17 +15,15 @@ def json():
                         "stat": TicketModel.new().count(),
                     },
                     "unseen24Hrs": {
-                        "stat": TicketModel.find_count_by_update_status(TicketModel.NEW, 1440),
+                        "stat": TicketModel.new().updated_within(days=1).count(),
                     },
                 },
                 "inProgress": {
                     "allInProgress": {
                         "stat": TicketModel.in_progress().count(),
                     },
                     "inProgress1Week": {
-                        "stat": TicketModel.find_count_by_update_status(
-                            TicketModel.IN_PROGRESS, 10080
-                        ),
+                        "stat": TicketModel.in_progress().updated_within(days=7).count(),
                     },
                 },
             },

models/tickets.py

@@ -57,15 +57,3 @@ def json(self):
             "created_at": Time.format_date(self.created_at),
             "updated_at": Time.format_date(self.updated_at),
         }
-
-    # Get tickets updated with the given time and with the given status
-    @classmethod
-    def find_count_by_update_status(cls, status, minutes):
-        # calculated in minutes: 1 day = 1440, 1 week = 10080
-        dateTime = datetime.utcnow() - timedelta(minutes=minutes)
-        return (
-            db.session.query(TicketModel)
-            .filter(TicketModel.updated_at >= dateTime)
-            .filter(TicketModel.status == status)
-            .count()
-        )

nobiru/nobiru_query.py

@@ -1,7 +1,13 @@
 from nobiru.nobiru import Nobiru
 from flask_sqlalchemy import BaseQuery
+from sqlalchemy import column
+
+from utils.time import TimeStamp
 
 
 class NobiruQuery(BaseQuery):
     def json(self):
         return Nobiru.json(self)
+
+    def updated_within(self, days=None):
+        return self.filter(column("updated_at") >= TimeStamp.days_ago(days))