leadguru-jobs 0.544.0__tar.gz → 0.546.0__tar.gz

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/PKG-INFO

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

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/lgt_jobs/lgt_data/analytics.py

@@ -81,6 +81,51 @@ def _prepare_date_analytics_doc(doc, ordered_result_dict: Dict[str, int]):
         ordered_result_dict[str_date] = item["count"]
     return ordered_result_dict
 
+def get_channel_aggregated_analytics(from_date: datetime = None, to_date: datetime = None,
+                                     bot_id: Optional[str | ObjectId] = None):
+    pipeline = [
+        {
+            '$match': {
+                'extra_ids': {"$in": [str(bot_id)]}
+            }
+        },
+        {
+            "$group": {
+                '_id': {
+                    '$arrayElemAt': [
+                        '$attributes', 0
+                    ]
+                },
+                'count': {"$sum": 1}
+            }
+        },
+        {
+            '$limit': 1000
+        }
+    ]
+
+    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}}})
+
+    received_messages = list(db[f'received_messages'].aggregate(pipeline))
+    filtered_messages = list(db[f'filtered_messages'].aggregate(pipeline))
+
+    received_messages_dic = OrderedDict()
+    filtered_messages_dic = OrderedDict()
+
+    for item in received_messages:
+        received_messages_dic[item["_id"]] = item["count"]
+
+    for item in filtered_messages:
+        filtered_messages_dic[item["_id"]] = item["count"]
+
+    return received_messages_dic, filtered_messages_dic
+
 
 def get_aggregated_user_leads(user_id: Union[ObjectId, str],
                               from_date: datetime,

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -831,16 +831,10 @@ class DedicatedBotRepository(BaseMongoRepository):
         docs = self.collection().find(pipeline)
         return [DedicatedBotModel.from_dic(doc) for doc in docs]
 
-    def get_source_ids_for_user(self, user_id, source_type):
-        docs = self.collection().find({
-            'user_id': user_id,
-            'source.source_type': source_type
-        }, {
-            '_id': 0,
-            'source_id': '$source.source_id'
-        })
-        source_ids = [item['source_id'] for item in docs]
-        return source_ids
+    def get_source_ids_for_user(self, **kwargs):
+        pipeline = self.__create_bots_filter(**kwargs)
+        docs = self.collection().find(pipeline, projection={'_id': 0, 'source_id': '$source.source_id'})
+        return [item['source_id'] for item in docs]
 
     def get_one(self, **kwargs):
         pipeline = self.__create_bots_filter(**kwargs)

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/lgt_jobs/runner.py

@@ -32,13 +32,15 @@ class BackgroundJobRunner:
         BackgroundJobRunner.submit_data(job_data)
 
     @staticmethod
-    def submit_data(data: dict):
+    def submit_data(data: dict, topic: str = None):
         json_str = json.dumps(data, ensure_ascii=False, default=datetime_converter)
-        BackgroundJobRunner.submit_json(json_str)
+        BackgroundJobRunner.submit_json(json_str, topic)
 
     @staticmethod
-    def submit_json(json_str: str):
-        publish_message2_pubsub(background_jobs_topic, message_json=json_str)
+    def submit_json(json_str: str, topic: str = None):
+        if not topic:
+            topic = background_jobs_topic
+        publish_message2_pubsub(topic, message_json=json_str)
 
     @staticmethod
     def schedule(jib: str, job: type, data: BaseBackgroundJobData, scheduled_at: datetime):

{leadguru_jobs-0.544.0 → leadguru_jobs-0.546.0}/lgt_jobs/lgt_data/enums.py

@@ -61,12 +61,12 @@ class BotEventType(str, Enum):
 
 class ImageName(str, Enum):
     ARROW = 'arrow.png'
+    CRY = 'cry.png'
     FIREWORK = 'firework.png'
+    HANDS = 'hands.png'
     LOCK = 'lock.png'
     LOGO = 'logo.png'
     MAIL = 'mail.png'
-    CRY = 'cry.png'
-    HANDS = 'hands.png'
     SAD = 'sad.png'