leadguru-jobs 0.419.0__tar.gz → 0.420.0__tar.gz

{leadguru_jobs-0.419.0 → leadguru_jobs-0.420.0}/PKG-INFO

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

{leadguru_jobs-0.419.0 → leadguru_jobs-0.420.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.419.0 → leadguru_jobs-0.420.0}/lgt_jobs/lgt_data/model.py

@@ -712,7 +712,7 @@ class BoardModel(BaseModel):
         super().__init__()
         self.name = None
         self.user_id = None
-        self.statuses = list()
+        self.statuses: List[BoardedStatus] = []
         self.is_primary = None
         self.default = False
 
@@ -748,6 +748,7 @@ class BoardedStatus:
         self.order = 0
         self.is_primary = False
         self.default = False
+        self.user_leads = 0
 
     def to_dic(self):
         self.id = self.name

{leadguru_jobs-0.419.0 → leadguru_jobs-0.420.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -708,6 +708,64 @@ class BoardsMongoRepository(BaseMongoRepository):
         docs = self.collection().find(pipeline).sort('created_at', 1)
         return [BoardModel.from_dic(doc) for doc in docs]
 
+    def get_with_stats(self, user_id: str, **kwargs):
+        is_primary = kwargs.get('is_primary')
+        default = kwargs.get('default')
+        name = kwargs.get('name')
+        match = {'user_id': to_object_id(user_id)}
+
+        if is_primary is not None:
+            match['is_primary'] = is_primary
+
+        if default is not None:
+            match['default'] = default
+
+        if name:
+            match['name'] = name
+
+        pipeline = [
+            {
+                '$match': match
+            },
+            {
+                '$unwind': {'path': '$statuses', 'preserveNullAndEmptyArrays': False}
+            },
+            {
+                '$lookup': {
+                    'from': 'user_leads',
+                    'as': 'statuses.user_leads',
+                    'let': {'id': '$_id', 'status': '$statuses.name'},
+                    'pipeline': [
+                        {
+                            '$match': {
+                                '$expr': {
+                                    '$and': [
+                                        {'$eq': ['$board_id', '$$id']},
+                                        {'$eq': ['$status', '$$status']}
+                                    ]
+                                }
+                            }
+                        }
+                    ]
+                }
+            },
+            {
+                '$addFields': {'statuses.user_leads': {'$size': '$statuses.user_leads'}}
+            },
+            {
+                '$group': {
+                    '_id': '$_id',
+                    'statuses': {'$push': '$statuses'},
+                    'name': {'$first': '$name'},
+                    'created_at': {'$first': '$created_at'},
+                    'user_id': {'$first': '$user_id'},
+                    'is_primary': {'$first': '$is_primary'},
+                    'default': {'$first': '$default'}}
+            },
+            {'$sort': {'created_at': 1}}]
+
+        return [BoardModel.from_dic(doc) for doc in self.collection().aggregate(pipeline)]
+
     def get_primary(self, user_id: str):
         return BoardModel.from_dic(self.collection().find_one({'user_id': to_object_id(user_id), 'is_primary': True}))
 
@@ -767,17 +825,6 @@ 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_one(self, **kwargs):
         pipeline = self.__create_bots_filter(**kwargs)
         return DedicatedBotModel.from_dic(self.collection().find_one(pipeline))
@@ -838,7 +885,7 @@ class DedicatedBotRepository(BaseMongoRepository):
             pipeline["source.source_id"] = source_id
 
         if server_id:
-            pipeline["servers"] = {'$elemMatch': {'id': server_id}}
+            pipeline["servers"] = {'$elemMatch': {'id': server_id, 'active': True}}
 
         if active_server_id:
             pipeline["servers"] = {'$elemMatch': {'id': active_server_id, 'deleted': False}}

{leadguru_jobs-0.419.0 → leadguru_jobs-0.420.0}/lgt_jobs/services/web_client.py

@@ -18,7 +18,7 @@ class V3ServerClient(BaseHttpClient):
         self.token = BillingServerClient.login(service_account_email, service_account_password)
 
     def update_user_lead(self, message_id: str, email: str, slack_channel: str,
-                         board_id: str = None, status: str = None, followup_date=None) -> dict:
+                         board_id: str = None, status: str = None) -> dict:
         payload = {
             'message_id': message_id,
             'user_email': email
@@ -27,8 +27,7 @@ class V3ServerClient(BaseHttpClient):
         update_lead_payload = {
             'slack_channel': slack_channel,
             'board_id': board_id,
-            'status': status,
-            'followup_date': followup_date
+            'status': status
         }
         headers = self._create_default_headers()
         return requests.post(f'{portal_url}/{self.api_version}/user_leads/update',