leadguru-jobs 0.627.0__tar.gz → 0.629.0__tar.gz

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/PKG-INFO

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

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/lgt_jobs/jobs/inbox_leads.py

@@ -7,7 +7,6 @@ from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBot
     SlackContactUserRepository, UserContactsRepository, MessageRequestsRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
-from lgt_jobs.services.web_client import V3ServerClient
 from requests import exceptions
 
 """
@@ -20,14 +19,12 @@ class InboxLeadsJobData(BaseBackgroundJobData, BaseModel):
 
 
 class InboxLeadsJob(BaseBackgroundJob, ABC):
-    v3_client: V3ServerClient
 
     @property
     def job_data_type(self) -> type:
         return InboxLeadsJobData
 
     def exec(self, _: InboxLeadsJobData):
-        self.v3_client = V3ServerClient()
         users = UserMongoRepository().get_users()
         for user in users:
             log.info(f'[InboxLeadsJob]: Loading chat for the: {user.email}')
@@ -83,7 +80,7 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
 
                     log.info(f"[InboxLeadsJob]: New message request from {sender_id} for user: {user.email}")
                     message_request = MessageRequest.from_slack_response(dedicated_bot, messages[0], sender_id)
-                    MessageRequestsRepository().insert(message_request)
+                    MessageRequestsRepository().upsert(user.id, sender_id, message_request)
 
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/lgt_jobs/lgt_data/model.py

@@ -705,7 +705,7 @@ class ChatMessage:
         return model
 
     @classmethod
-    def from_slack_response(cls, bot: DedicatedBotModel, message_data: dict, sender_id: str) -> ChatMessage:
+    def from_slack_response(cls, bot: DedicatedBotModel, message_data: dict, sender_id: str):
         model = cls()
         model.sender_id = sender_id
         model.bot_id = bot.id

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/lgt_jobs/lgt_data/models/message_request.py

@@ -1,10 +1,14 @@
+from lgt_jobs.lgt_data.enums import SourceType
 from lgt_jobs.lgt_data.model import ChatMessage, DedicatedBotModel
 
 
 class MessageRequest(ChatMessage):
     hidden: bool = False
+    source_type: SourceType
 
     @classmethod
     def from_slack_response(cls, bot: DedicatedBotModel, message_data: dict, sender_id: str):
         message = super().from_slack_response(bot, message_data, sender_id)
-        return message.from_dic(message.to_dic())
+        message_request = MessageRequest.from_dic(message.to_dic())
+        message_request.source_type = bot.source.source_type
+        return message_request

{leadguru_jobs-0.627.0 → leadguru_jobs-0.629.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -10,9 +10,10 @@ from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetP
                                      DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
                                      ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
                                      GroupedMessagesModel, UserVerificationModel, UsersPage, Subscription,
-                                     ScheduledMessage, DictionaryModel)
+                                     ScheduledMessage)
 from datetime import datetime, UTC, timedelta
 from collections import OrderedDict
+from lgt_jobs.lgt_data.models.message_request import MessageRequest
 
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
@@ -1197,6 +1198,10 @@ class ChatRepository(BaseMongoRepository):
 class MessageRequestsRepository(BaseMongoRepository):
     collection_name = 'message_requests'
 
+    def upsert(self, user_id: str, sender_id: str, message_request: MessageRequest):
+        self.collection().update_one({'user_id': to_object_id(user_id), 'sender_id': sender_id},
+                                     {'$set': message_request.to_dic()}, upsert=True)
+
 
 class UserVerificationMongoRepository(BaseMongoRepository):
     pass