leadguru-jobs 0.258.0__tar.gz → 0.260.0__tar.gz

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/PKG-INFO

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

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/lgt_jobs/__init__.py

@@ -34,7 +34,7 @@ jobs_map = {
     "UpdateUserBalanceJob": UpdateUserBalanceJob,
     "ReIndexUserLeadsConversationHistoryJob": ReIndexUserLeadsConversationHistoryJob,
     "ClearUserAnalyticsJob": ClearUserAnalyticsJob,
-    "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob
+    "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
 }
 __all__ = [
     # Jobs

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/lgt_jobs/jobs/chat_history.py

@@ -34,7 +34,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         today = datetime.datetime.utcnow()
         delta = datetime.timedelta(days=data.days_ago)
         leads: List[UserLeadModel] = UserLeadMongoRepository().get_leads(user_id=data.user_id, skip=0, limit=100,
-                                                                         from_date=today - delta, archived=False)
+                                                                         from_date=today - delta, archived=False,
+                                                                         sort_direction="DESCENDING")
         log.info(f"[LoadChatHistoryJob]: processing {len(leads)} for user: {user.email}")
 
         if not leads:
@@ -44,7 +45,12 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         last_message_lead = None
         for lead in leads:
             if not lead.slack_channel:
-                continue
+                user_contact = UserContactsRepository().find_one(user.id, sender_id=lead.message.sender_id)
+                if user_contact.chat_id:
+                    UserLeadMongoRepository().update_lead(lead.user_id, lead.id, slack_channel=user_contact.chat_id)
+                    lead.slack_channel = user_contact.chat_id
+                else:
+                    continue
 
             message = LoadChatHistoryJob._update_history(user=user, lead=lead)
 
@@ -99,8 +105,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
 
         messages = [SlackMessageConvertService.from_slack_response(user.email, "slack_files", bot.token, m) for m in
                     history.get('messages', [])]
-        messages = sorted(messages, key=lambda x: x.created_at)
         messages = LoadChatHistoryJob._merge_chat_histories(saved_chat=list(saved_chat_history), current_chat=messages)
+        messages = sorted(messages, key=lambda x: x.created_at)
         chat_history = [message.to_dic() for message in messages]
         UserLeadMongoRepository().update_lead(lead.user_id, lead.id, chat_history=chat_history)
         LeadChat.create_or_update(sender_id=lead.message.sender_id, user_id=lead.user_id,

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/lgt_jobs/jobs/mass_message.py

@@ -46,4 +46,3 @@ class SendMassMessageSlackChannelJob(BaseBackgroundJob):
                 except:
                     log.warning(f"Failed attempt to get clist of channels. Attempt {attempts}, bot id {bot.id}")
                     time.sleep(randint(1, 3))
-

{leadguru_jobs-0.258.0 → leadguru_jobs-0.260.0}/lgt_jobs/jobs/workspace_connect.py

@@ -119,4 +119,5 @@ class ConnectSlackAccountJob(BaseBackgroundJob):
                     dedicated_bot = update_credentials(dedicated_bot, workspace.token, slack_user.cookies)
                     dedicated_bots_repository.add_or_update(dedicated_bot)
                     BackgroundJobRunner.submit(BotStatsUpdateJob,
-                                               BotStatsUpdateJobData(dedicated_bot_id=str(dedicated_bot.id)))
+                                               BotStatsUpdateJobData(dedicated_bot_id=str(dedicated_bot.id),
+                                                                     bot_name=None))