leadguru-jobs 0.506.0__py3-none-any.whl → 0.507.0__py3-none-any.whl

{leadguru_jobs-0.506.0.dist-info → leadguru_jobs-0.507.0.dist-info}/METADATA

@@ -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.dist-info → leadguru_jobs-0.507.0.dist-info}/RECORD

@@ -38,8 +38,8 @@ lgt_jobs/lgt_common/slack_client/methods.py,sha256=-PxK8StkJ-dyACHdRRiQlRL2qaG9K
 lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=C1FwHQW82OS73THwPRF4_AvyDi4QbYLjbI_NDXO8Nwk,15896
 lgt_jobs/lgt_common/slack_client/web_client.py,sha256=oZV7oUcSXXngfMI6oXDedlQWePL9b2ClkocqbXNe1ns,6259
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/analytics.py,sha256=pku0MifRazlY12fEvNLupnG-U_PUJ0RgZbRfzW2P1js,22900
-lgt_jobs/lgt_data/engine.py,sha256=OkTIIsVhb4o0dcDOzolb-NNTftzhJvsCuldxg1PvLUM,8113
+lgt_jobs/lgt_data/analytics.py,sha256=Gr-7IzrnHPN9YJlIT6-NqrzVYU39vQUMKCRMsvvM5A4,22869
+lgt_jobs/lgt_data/engine.py,sha256=YJYEAj1Z4_XIhPMaoB7bp8x9ponANBzw7gZRrj6c-c4,8600
 lgt_jobs/lgt_data/enums.py,sha256=P-Jo_kQfFanbN5ztjQZIaWkZ6qOmAjHdypZ85ReOgdA,2407
 lgt_jobs/lgt_data/helpers.py,sha256=58ycqKF1z5nAw0vs6yVCg-SQet107YHyKYXaQUc7M68,157
 lgt_jobs/lgt_data/model.py,sha256=DPT2ztJG9w7O0_sxbCY1vzNwz9Y-ykJq0Tfuv7-UT0g,29448
@@ -47,7 +47,7 @@ lgt_jobs/lgt_data/mongo_repository.py,sha256=h3xA2AvqHaiQfl4vg88SdOKBczJ0P6bpkZY
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=eCgzyyXco6iPwAJziyRek_3ns1bxJZKknnLIJApKeoo,2070
 lgt_jobs/templates/new_message.html,sha256=SNVFWnq1goVrtaTJpbEru-8vYOav1wz31z8r01hAZI8,6985
-leadguru_jobs-0.506.0.dist-info/METADATA,sha256=Dl1kqyOzTr_qIfg668C93TI3qScE4KZYT4pmWmUcFrY,1319
-leadguru_jobs-0.506.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.506.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.506.0.dist-info/RECORD,,
+leadguru_jobs-0.507.0.dist-info/METADATA,sha256=VTxjoydeK5GKP4YTw0t0whhLdgyBQKytIP9FpGaf-E0,1319
+leadguru_jobs-0.507.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.507.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.507.0.dist-info/RECORD,,

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()
 

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}