leadguru-jobs 0.506.0__tar.gz → 0.507.0__tar.gz

{leadguru_jobs-0.506.0 → leadguru_jobs-0.507.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.506.0
+Version: 0.507.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.506.0 → leadguru_jobs-0.507.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.506.0
+Version: 0.507.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.506.0 → leadguru_jobs-0.507.0}/lgt_jobs/lgt_data/analytics.py

@@ -337,7 +337,6 @@ def get_date_aggregated_analytics(source_id=None, started_at: datetime = None,
 
 
 def get_leads_aggregated_analytics(from_date: datetime = None, to_date: datetime = None, user_id: str = None):
-    match_pipeline: dict = {}
     pipeline = [
         {
             '$project': {'_id': 0, 'user_ids': 1}
@@ -349,19 +348,17 @@ def get_leads_aggregated_analytics(from_date: datetime = None, to_date: datetime
             '$group': {'_id': '$user_ids', 'count': {'$sum': 1}}
         }
     ]
+    if user_id:
+        pipeline.insert(0, {"$match": {"user_ids": {"$in": [str(user_id)]}}})
 
     if from_date:
         beginning_of_the_day = datetime(from_date.year, from_date.month, from_date.day)
-        match_pipeline["created_at"] = {"$gte": beginning_of_the_day}
+        pipeline.insert(0, {"$match": {"created_at": {"$gte": beginning_of_the_day}}})
 
     if to_date:
         end_of_the_day = datetime(to_date.year, to_date.month, to_date.day, 23, 59, 59, 999)
-        match_pipeline["created_at"] = {"$lte": end_of_the_day}
-
-    if user_id:
-        match_pipeline["user_ids"] = {"$in": [str(user_id)]}
+        pipeline.insert(0, {"$match": {"created_at": {"$lte": end_of_the_day}}})
 
-    pipeline.insert(0, {'$match': match_pipeline})
     filtered_messages = list(client.lgt_admin.filtered_messages.aggregate(pipeline))
     filtered_messages_dic = OrderedDict()
 

{leadguru_jobs-0.506.0 → leadguru_jobs-0.507.0}/lgt_jobs/lgt_data/engine.py

@@ -41,7 +41,8 @@ class UserTrackAction(Document):
     meta = {"indexes": ["user_id"], "db_alias": "lgt_admin"}
 
     @staticmethod
-    def get_aggregated() -> Dict[str, Tuple[datetime, datetime]]:
+    def get_aggregated(from_date: datetime = None, to_date: datetime = None) \
+            -> Dict[str, Tuple[datetime, datetime]]:
         pipeline = [
             {
                 "$group": {
@@ -51,6 +52,14 @@ class UserTrackAction(Document):
                 }
             }]
 
+        if from_date:
+            beginning_of_the_day = datetime(from_date.year, from_date.month, from_date.day, 0, 0, 0, 0)
+            pipeline.insert(0, {"$match": {"created_at": {"$gte": beginning_of_the_day}}})
+
+        if to_date:
+            end_of_the_day = datetime(to_date.year, to_date.month, to_date.day, 23, 59, 59, 999)
+            pipeline.insert(0, {"$match": {"created_at": {"$lte": end_of_the_day}}})
+
         result = list(UserTrackAction.objects.aggregate(*pipeline))
 
         return {str(item.get("_id")): (item["first_action_at"], item["last_action_at"]) for item in result}