leadguru-jobs 0.455.0__tar.gz → 0.457.0__tar.gz

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/PKG-INFO

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

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/lgt_jobs/jobs/send_slack_message.py

@@ -1,8 +1,9 @@
+import datetime
 from abc import ABC
 from typing import Optional
 from lgt_jobs.lgt_common.lgt_logging import log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.mongo_repository import UserLeadMongoRepository, DedicatedBotRepository
+from lgt_jobs.lgt_data.mongo_repository import UserLeadMongoRepository, DedicatedBotRepository, UserContactsRepository
 from pydantic import BaseModel
 from ..basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -14,6 +15,7 @@ Send Slack Message
 class SendSlackMessageJobData(BaseBackgroundJobData, BaseModel):
     lead_id: str
     user_id: str
+    bot_id: str
     text: Optional[str]
     files_ids: Optional[list]
 
@@ -29,10 +31,17 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
         if not lead:
             return
 
-        bot = DedicatedBotRepository().get_one(user_id=data.user_id, source_id=data.source_id, only_valid=True)
+        bot = DedicatedBotRepository().get_one(id=data.bot_id)
         if not bot:
             return
 
+        user_contacts_repository = UserContactsRepository()
+        uc = user_contacts_repository.find_one(data.user_id, sender_id=lead.message.sender_id,
+                                               source_id=bot.source.source_id)
+        uc.scheduled_messages = [message.to_dic() for message in uc.scheduled_messages
+                                 if message.post_at < datetime.datetime.now(datetime.UTC)]
+        user_contacts_repository.update(data.user_id, uc.sender_id, bot.source.source_id,
+                                        scheduled_messages=uc.scheduled_messages)
         slack_client = SlackWebClient(bot.token, bot.cookies)
         resp = slack_client.im_open(lead.message.sender_id)
         if not resp['ok']:

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/lgt_jobs/lgt_data/model.py

@@ -521,6 +521,8 @@ class BotInfo:
         self.banned: bool | None = False
         self.user_name: str = ''
         self.associated_user: str | None = ''
+        self.deleted: bool = False
+        self.two_factor_required = False
 
     @classmethod
     def from_dic(cls, dic: dict):

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -1037,14 +1037,17 @@ class UserContactsRepository(BaseMongoRepository):
         pipeline = {'user_id': to_object_id(user_id)}
 
         sender_id = kwargs.get('sender_id')
+        source_id = kwargs.get('source_id')
         if sender_id:
             pipeline['sender_id'] = sender_id
+        if source_id:
+            pipeline['source_id'] = source_id
 
         if contact_instance := self.collection().find_one(pipeline):
             return UserContact.from_dic(contact_instance)
 
-    def update(self, user_id: str, sender_id: str, **kwargs):
-        pipeline = {'user_id': to_object_id(user_id), 'sender_id': sender_id}
+    def update(self, user_id: str, sender_id: str, source_id: str, **kwargs):
+        pipeline = {'user_id': to_object_id(user_id), 'sender_id': sender_id, 'source_id': source_id}
         update_dict = {k: v for k, v in kwargs.items() if v is not None}
         self.collection().update_one(pipeline, {'$set': update_dict}, upsert=False)
 

{leadguru_jobs-0.455.0 → leadguru_jobs-0.457.0}/lgt_jobs/templates/new_message.html

@@ -12,7 +12,7 @@
     <tr>
         <td style="padding: 0; margin: 0;">
             <table border="0" cellpadding="0" cellspacing="0"
-                   style="margin: 0 auto; border: 0; width: 100%; max-width: 420px; padding: 16px 0;">
+                   style="margin: 16px auto; border: 0; width: 100%; max-width: 420px; padding: 0;">
                 <tr>
                     <td>
                         <table border="0" cellpadding="0" cellspacing="0"