leadguru-jobs 0.424.0__py3-none-any.whl → 0.425.0__py3-none-any.whl

{leadguru_jobs-0.424.0.dist-info → leadguru_jobs-0.425.0.dist-info}/METADATA

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

{leadguru_jobs-0.424.0.dist-info → leadguru_jobs-0.425.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=iN1Z9ZtRHrpjzmSN4cbqwL6XzGWQYFmDBnBG-NvmlMc,974
 lgt_jobs/jobs/archive_leads.py,sha256=Rc9MTWvVUCMEXi7mTrHWKZVyaRiseCFpHqUZcXekmIk,849
 lgt_jobs/jobs/bot_stats_update.py,sha256=026bu-87lQLJkdVaLMwJH66g7Fo0-Hcxb2Pv0MFX3l0,7187
-lgt_jobs/jobs/chat_history.py,sha256=_8ZcpO2s8EFxuL7n_R3shnNsjHz815d1DxB9x7PPAaY,5338
+lgt_jobs/jobs/chat_history.py,sha256=QkB49zyGad1WMA-CKmdWgN6T8upRfDfyAAFmEyrtXqs,5338
 lgt_jobs/jobs/inbox_leads.py,sha256=HGnhZEzMZw_Yzf40tQIRQc3E3QmcmEUyc1c5KTmJHFI,4646
 lgt_jobs/jobs/mass_message.py,sha256=jLO-yykQzf-V7JY7a6PFwVoT4z91SJWN5UPrHj_xAP8,2039
 lgt_jobs/jobs/send_code.py,sha256=ei5WHVpI2w2gv0JGU8wjg0HJYUO_OZqNJPm-W6yO1dA,828
@@ -31,19 +31,19 @@ lgt_jobs/lgt_common/pubsub/messages.py,sha256=rm7uKbxwDTWJqsVA8Kee-4YT58bThjCEV2
 lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=7HAg_P2sZ6DDJkDyxzc4yI-i38bDSMxySulEGlHUhxc,2441
 lgt_jobs/lgt_common/slack_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/slack_client/methods.py,sha256=-PxK8StkJ-dyACHdRRiQlRL2qaG9KEyWB7wo4eh7ifU,1506
-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_common/slack_client/slack_client.py,sha256=fpfkk8uBMiTknMwgSNFGiGegN3qoJADJhjbpkpLKO8Y,15896
+lgt_jobs/lgt_common/slack_client/web_client.py,sha256=d3fY_DxuJEr74_QWEitF_U-KAG3aRRyXZb6oH9Qxg80,6259
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/analytics.py,sha256=qo5nNFQxOTTk8i3tmCq0d3F9iaV9MTIR84SSi6uNrJ8,23427
 lgt_jobs/lgt_data/engine.py,sha256=iTcLvU7QZvB14hcERQrxSql9cVEcMEzu_tUcWD2Z24A,8076
 lgt_jobs/lgt_data/enums.py,sha256=A5nWwBgTVW7XaqL30NHNmO0SG_yeDk1dI-U5xrgU2zg,1552
 lgt_jobs/lgt_data/helpers.py,sha256=58ycqKF1z5nAw0vs6yVCg-SQet107YHyKYXaQUc7M68,157
-lgt_jobs/lgt_data/model.py,sha256=4J3WpmnIJ6pNWnSnZFQUnnyeZutDRGP2B3j0JzHdXww,28044
-lgt_jobs/lgt_data/mongo_repository.py,sha256=fOBWpJTeYGfiSa-T2k8VwjMIf1qhei83lsRvLndAC78,39840
+lgt_jobs/lgt_data/model.py,sha256=yiDPa2kgOARGMzbRc_heLpu1pRtt4xtf3VcYW7xsjBs,27999
+lgt_jobs/lgt_data/mongo_repository.py,sha256=IbWRDpa6ouwlUA19cLQZCCxMZuiw9nMZakJpUgxVuWk,37670
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=NdVK1Xl8IDqUDZKqYNq219WOO7DtLj3b4VFjP69_MQY,2047
 lgt_jobs/templates/new_message_mail_template.html,sha256=82XdDPtmkJVUWUcZtgd8bv_9-viAG2WWOnf3AhR6PeY,3635
-leadguru_jobs-0.424.0.dist-info/METADATA,sha256=QDOk9D5WVxEcneDvg5z4npd0t_MLBSPSJx281uCt5Uw,1296
-leadguru_jobs-0.424.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-leadguru_jobs-0.424.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.424.0.dist-info/RECORD,,
+leadguru_jobs-0.425.0.dist-info/METADATA,sha256=tp22IHMl6KNvWrlyfukj7uUejmHDNYeixLbEygXEac4,1296
+leadguru_jobs-0.425.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+leadguru_jobs-0.425.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.425.0.dist-info/RECORD,,

lgt_jobs/jobs/chat_history.py

@@ -67,7 +67,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         messages = chat_repo.get_list(sender_id=contact.sender_id, bot_id=bot.id)
         new_messages = []
         for message in slack_chat:
-            same_messages = [msg for msg in messages if msg.id == message.id]
+            same_messages = [msg for msg in messages if msg.ts == message.ts]
             if not same_messages:
                 new_messages.append(message)
         return new_messages

lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -145,24 +145,24 @@ class SlackClient:
         url = f'{self.base_url}{SlackMethods.conversations_open}?{self.__im_open_payload(user)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def delete_message(self, channel: str, id: str):
-        url = f'{self.base_url}{SlackMethods.chat_delete}?{self.__delete_message_payload(channel, id)}'
+    def delete_message(self, channel: str, ts: str):
+        url = f'{self.base_url}{SlackMethods.chat_delete}?{self.__delete_message_payload(channel, ts)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
     def conversations_info(self, channel: str):
         url = f'{self.base_url}{SlackMethods.conversations_info}?{self.__conversation_info_payload(channel)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def update_message(self, channel: str, id: str, text: str, file_ids: str):
-        url = f'{self.base_url}{SlackMethods.chat_update}?{self.__update_message_payload(channel, id, text, file_ids)}'
+    def update_message(self, channel: str, ts: str, text: str, file_ids: str):
+        url = f'{self.base_url}{SlackMethods.chat_update}?{self.__update_message_payload(channel, ts, text, file_ids)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def conversations_history(self, channel: str, id: str = None):
-        url = f'{self.base_url}{SlackMethods.conversations_history}?{self.__channel_payload(channel, id)}'
+    def conversations_history(self, channel: str, ts: str = None):
+        url = f'{self.base_url}{SlackMethods.conversations_history}?{self.__channel_payload(channel, ts)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
-    def conversations_replies(self, channel: str, id: str):
-        url = f'{self.base_url}{SlackMethods.conversations_replies}?{self.__ts_payload(channel, id)}'
+    def conversations_replies(self, channel: str, ts: str):
+        url = f'{self.base_url}{SlackMethods.conversations_replies}?{self.__ts_payload(channel, ts)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
     def get_presense(self, user: str = None):
@@ -198,8 +198,8 @@ class SlackClient:
         url = f'{self.base_url}{SlackMethods.users_info}?{self.__user_info_payload(user)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
-    def get_reactions(self, channel: str, id: str):
-        url = f'{self.base_url}{SlackMethods.reactions_get}?{self.__get_reactions_payload(channel, id)}'
+    def get_reactions(self, channel: str, ts: str):
+        url = f'{self.base_url}{SlackMethods.reactions_get}?{self.__get_reactions_payload(channel, ts)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
     def get_attachments(self, channel: str, msg_id: str, url: str):
@@ -303,12 +303,12 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __update_message_payload(self, channel, id, text, file_ids):
+    def __update_message_payload(self, channel, ts, text, file_ids):
         payload = {
             'parse': 'none',
             'token': self.token,
             'channel': channel,
-            'ts': id,
+            'ts': ts,
             'text': text,
             'file_ids': file_ids
         }
@@ -322,11 +322,11 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __delete_message_payload(self, channel, id):
+    def __delete_message_payload(self, channel, ts):
         payload = {
             'token': self.token,
             'channel': channel,
-            'ts': id
+            'ts': ts
         }
         return parse.urlencode(payload)
 
@@ -352,14 +352,14 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __channel_payload(self, channel, id=None):
+    def __channel_payload(self, channel, ts=None):
         payload = {
             'token': self.token,
             'channel': channel
         }
 
-        if id:
-            payload["ts"] = id
+        if ts:
+            payload["ts"] = ts
             payload["limit"] = 1
             payload["inclusive"] = True
 
@@ -374,19 +374,19 @@ class SlackClient:
             payload["user"] = user
         return parse.urlencode(payload)
 
-    def __ts_payload(self, channel: str, id: str):
+    def __ts_payload(self, channel: str, ts: str):
         payload = {
             'token': self.token,
             'channel': channel,
-            'ts': id
+            'ts': ts
         }
         return parse.urlencode(payload)
 
-    def __get_reactions_payload(self, channel, id):
+    def __get_reactions_payload(self, channel, ts):
         payload = {
             'token': self.token,
             'full': True,
             'channel': channel,
-            'timestamp': id
+            'timestamp': ts
         }
         return parse.urlencode(payload)

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -28,7 +28,7 @@ class SlackMessageConvertService:
         result.bot_id = bot_id
         result.text = dic.get('text', '')
         result.user = dic.get('user', '')
-        result.id = dic.get('ts', '')
+        result.ts = dic.get('ts', '')
         result.attachments = dic.get('attachments', [])
         result.files = []
         result.user_id = to_object_id(user_id)
@@ -51,7 +51,7 @@ class SlackMessageConvertService:
                                                                       new_file.mimetype, cookies)
                 result.files.append(new_file)
 
-        js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])
+        js_ticks = int(result.ts.split('.')[0] + result.ts.split('.')[1][3:])
         result.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
         return result
 
@@ -88,11 +88,11 @@ class SlackWebClient:
 
         self.client = SlackClient(token, cookies)
 
-    def delete_message(self, channel: str, id: str):
-        return self.client.delete_message(channel, id)
+    def delete_message(self, channel: str, ts: str):
+        return self.client.delete_message(channel, ts)
 
-    def update_message(self, channel: str, id: str, text: str, file_ids=''):
-        return self.client.update_message(channel, id, text, file_ids)
+    def update_message(self, channel: str, ts: str, text: str, file_ids=''):
+        return self.client.update_message(channel, ts, text, file_ids)
 
     def get_profile(self, user_id):
         return self.client.user_info(user_id)
@@ -124,8 +124,8 @@ class SlackWebClient:
     def channel_leave(self, channels):
         return self.client.leave_channels(channels)
 
-    def get_reactions(self, channel, id):
-        return self.client.get_reactions(channel, id)
+    def get_reactions(self, channel, ts):
+        return self.client.get_reactions(channel, ts)
 
     def upload_file(self, file, file_name):
         return self.client.upload_file(file, file_name)
@@ -151,8 +151,8 @@ class SlackWebClient:
     def find_workspaces(self, user_agent: str, ) -> requests.Response:
         return self.client.find_workspaces(user_agent)
 
-    def conversation_replies(self, channel: str, id: str) -> dict:
-        return self.client.conversations_replies(channel, id)
+    def conversation_replies(self, channel: str, ts: str) -> dict:
+        return self.client.conversations_replies(channel, ts)
 
     def create_shared_invite(self):
         return self.client.create_shared_invite()

lgt_jobs/lgt_data/model.py

@@ -576,7 +576,7 @@ class ChatMessage:
     sender_id: str
     text: str
     user: str
-    id: str
+    ts: str
     viewed: bool
     files: list
     attachments: list[dict] | None
@@ -601,7 +601,7 @@ class ChatMessage:
         self.text: str = ''
         self.created_at: datetime
         self.user = ''
-        self.id = ''
+        self.ts = ''
         self.files = []
         self.attachments = []
 
@@ -712,7 +712,7 @@ class BoardModel(BaseModel):
         super().__init__()
         self.name = None
         self.user_id = None
-        self.statuses: List[BoardedStatus] = []
+        self.statuses = list()
         self.is_primary = None
         self.default = False
 
@@ -748,7 +748,6 @@ class BoardedStatus:
         self.order = 0
         self.is_primary = False
         self.default = False
-        self.user_leads = 0
 
     def to_dic(self):
         self.id = self.name

lgt_jobs/lgt_data/mongo_repository.py

@@ -708,64 +708,6 @@ 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}))
 
@@ -1077,11 +1019,8 @@ class ChatRepository(BaseMongoRepository):
             pipeline['sender_id'] = sender_id
 
         return [ChatMessage.from_dic(msg)
-                for msg in self.collection().find(pipeline).sort("id", pymongo.ASCENDING)]
+                for msg in self.collection().find(pipeline).sort("ts", pymongo.ASCENDING)]
 
     def upsert_messages(self, messages: list[dict]):
-        operations = [UpdateOne({"id": msg['id']}, {'$set': msg}, upsert=True) for msg in messages]
+        operations = [UpdateOne({"ts": msg['ts']}, {'$set': msg}, upsert=True) for msg in messages]
         self.collection().bulk_write(operations)
-
-    def delete_message(self, user_id: str, _id: str):
-        self.collection().delete_one({"id": _id, 'user_id': to_object_id(user_id)})