leadguru-jobs 0.258.0__py3-none-any.whl → 0.260.0__py3-none-any.whl

{leadguru_jobs-0.258.0.dist-info → leadguru_jobs-0.260.0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-lgt_jobs/__init__.py,sha256=SsJg6F26W1crolic-HprC6U5maKfvHO1WjX7BRSrEU4,3210
+lgt_jobs/__init__.py,sha256=-VK_Z6lanY__zvL3qgaHv_g8MG27Ow7XEdjtt17iM6A,3211
 lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
 lgt_jobs/env.py,sha256=M4nlt7SpwEYptNCopc6c3V0hpsHKc9bO60FnlGc7rTE,712
 lgt_jobs/main.py,sha256=g9cIpahGFXZZv6fsftbjrOhQMrrD04kxKOuPpxKk3rk,1545
@@ -9,11 +9,11 @@ lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=bNQpYBPz6CMN0i-wXDzQKcc1L8UYUvyiVGJbUeGdf9Q,1307
 lgt_jobs/jobs/archive_leads.py,sha256=wZ4LwbuC9G7NB16AO15YiMemEV40LoJVjd8VRqaFv9o,831
 lgt_jobs/jobs/bot_stats_update.py,sha256=o4aSm7byBpnaIRMiVeSijif99nyJXjzWHHldvEK-lCQ,3466
-lgt_jobs/jobs/chat_history.py,sha256=z9_WfmCyDc-r_qK-Eze4tnEG3ek-HUxyHa8ywSSraA4,5620
+lgt_jobs/jobs/chat_history.py,sha256=_AEnSc7EXzwL5k6B-KxnYbyrWV0WZt6aBUaazIX_5OQ,6076
 lgt_jobs/jobs/clear_user_analytics.py,sha256=sP90jhOcZqs67hJV-lJyFJH9Iciqai8IsbNs5fSc90U,2478
 lgt_jobs/jobs/conversation_replied.py,sha256=pMkalznkVt_j20VfXzZcaGIMXxkIknxDlHKvu4_yrrs,2584
 lgt_jobs/jobs/inbox_leads.py,sha256=P3Lo0PPOH7b3gp6jezVOurbpVMsSXDac1oPJ6AmFu80,4560
-lgt_jobs/jobs/mass_message.py,sha256=gT-_UWvJFvaJQ0cAGdQPg3FGsYLo_JJhlLKKdgm4Dns,1769
+lgt_jobs/jobs/mass_message.py,sha256=uv-o-c8m3JrNciN7ypZLsd7RDetdUppx9OTfGi_1DKg,1768
 lgt_jobs/jobs/reactions_added.py,sha256=1fhSWBSfj82cdXJLznjPlaCSooAsmCIs_6AaoTQG6mY,2410
 lgt_jobs/jobs/reindex_conversation_history.py,sha256=heBrXcEgsT426FZRQ0cCz57ZcN_h4_x1W8tEjhn7LI8,1064
 lgt_jobs/jobs/send_code.py,sha256=VTp7vIoL2MJbzn_FpmZZgF1jMcNdBGpcXAc2BFo2c4A,759
@@ -21,11 +21,11 @@ lgt_jobs/jobs/send_slack_message.py,sha256=ifF_X8WysS38eQKfAYde-SSQJf2fKAzDjr2fK
 lgt_jobs/jobs/update_slack_profile.py,sha256=lYOi2jn2vhB_smDypy0655SONyjHU_k17Bbxe3r57Pc,3826
 lgt_jobs/jobs/user_balance_update.py,sha256=x8mcq-S-f4-weGmuvyqram0ixJ2HcdDg5wgMI1SKQFE,2295
 lgt_jobs/jobs/user_limits_update.py,sha256=bsn2iQ2UiWXGhowTKhy-D7YIFCJAOKibhEv_2cPYBUI,2352
-lgt_jobs/jobs/workspace_connect.py,sha256=-EL6YrUhAOAR3dv1HZ12D9xvxL1JHP5208eh6sQBjwY,6044
+lgt_jobs/jobs/workspace_connect.py,sha256=Xszkqz-V-H15QgCt4OT2IFG96ioiwnbgE5x8ldpdQyk,6128
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=SZogxjM0jyACRqBOP5EJvtqwe44og8B5B6TMWLpYmKM,1878
 lgt_jobs/templates/new_message_mail_template.html,sha256=82XdDPtmkJVUWUcZtgd8bv_9-viAG2WWOnf3AhR6PeY,3635
-leadguru_jobs-0.258.0.dist-info/METADATA,sha256=ZOxN-O9RAIiXBBh5DHrQeke6drRaJ-TEBfmr0Ot_ebY,1181
-leadguru_jobs-0.258.0.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-leadguru_jobs-0.258.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.258.0.dist-info/RECORD,,
+leadguru_jobs-0.260.0.dist-info/METADATA,sha256=srVzQ8wR9gZfOKf5dp3MvAM0zR3UeNg9tlv4tAHpiBM,1181
+leadguru_jobs-0.260.0.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+leadguru_jobs-0.260.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.260.0.dist-info/RECORD,,

lgt_jobs/__init__.py

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

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,

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

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