leadguru-jobs 0.626.0__tar.gz → 0.628.0__tar.gz

{leadguru_jobs-0.626.0 → leadguru_jobs-0.628.0}/PKG-INFO

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

{leadguru_jobs-0.626.0 → leadguru_jobs-0.628.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.626.0 → leadguru_jobs-0.628.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}')
@@ -75,7 +72,6 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
             log.info(f'[InboxLeadsJob]: Count of messages: {len(messages)} with {sender_id}')
             if messages:
                 user_contact = UserContactsRepository().find_one(user.id, sender_id=sender_id)
-                log.info(f"[InboxLeadsJob]: user contact exists: {str(user.id)}:{sender_id}")
                 if not user_contact:
                     people = SlackContactUserRepository().find_one(sender_id)
                     if not people:
@@ -84,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.to_dic())
+                    MessageRequestsRepository().insert(message_request)
 
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):

{leadguru_jobs-0.626.0 → leadguru_jobs-0.628.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.626.0 → leadguru_jobs-0.628.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -10,7 +10,7 @@ from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetP
                                      DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
                                      ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
                                      GroupedMessagesModel, UserVerificationModel, UsersPage, Subscription,
-                                     ScheduledMessage)
+                                     ScheduledMessage, DictionaryModel)
 from datetime import datetime, UTC, timedelta
 from collections import OrderedDict
 
@@ -38,10 +38,10 @@ class BaseMongoRepository:
         insert_items = [item.to_dic() for item in items]
         self.collection().insert_many(insert_items)
 
-    def insert(self, item: BaseModel):
+    def insert(self, item):
         return self.collection().insert_one(item.to_dic())
 
-    def add(self, item: BaseModel):
+    def add(self, item):
         return self.insert(item)
 
     def delete(self, id):