leadguru-jobs 0.621.0__py3-none-any.whl → 0.623.0__py3-none-any.whl

{leadguru_jobs-0.621.0.dist-info → leadguru_jobs-0.623.0.dist-info}/METADATA

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

{leadguru_jobs-0.621.0.dist-info → leadguru_jobs-0.623.0.dist-info}/RECORD

@@ -13,15 +13,15 @@ lgt_jobs/assets/images/mail.png,sha256=eORzQcAMkFr7DjgtABVhJ_zFuXgO7OXv78lLF4b39
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=IIsWt4A1qUw3w-S-8W16uKY1FRVWfXXA41_mu4uCNiM,979
 lgt_jobs/jobs/bot_stats_update.py,sha256=JRPPyqFvGHWuH_NQJNzIDy3DC0Joz14goNExqp-YUrw,8683
-lgt_jobs/jobs/chat_history.py,sha256=uHJhZ9euY49k7iai56PqGSOuWBSV6buKpwtSqHxbV8I,5134
+lgt_jobs/jobs/chat_history.py,sha256=pwLGZyPS8N3h2eeoIIWGMwnzskPGFkPO3YVIY0KjQro,5245
 lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
-lgt_jobs/jobs/inbox_leads.py,sha256=OSX-FNx27gWEKNBBc-hyq2odCxXytz7WHtQJajtz274,5670
+lgt_jobs/jobs/inbox_leads.py,sha256=SZGWtSYuWdruXl9m2dkk4XzSpVvVxjspi1X6RygR87I,4603
 lgt_jobs/jobs/load_slack_people.py,sha256=az3Pl8_0nUXizShpCksH6XMHFALLkta4QpMr_MkM9Io,3199
 lgt_jobs/jobs/mass_message.py,sha256=1mFcBlL2MhzLbj5yrd_NyJc7TXDWCcROAzGDnr0miMU,2035
 lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,824
-lgt_jobs/jobs/send_slack_message.py,sha256=_fuzqgspl7KRO6h4IRJya6sMT5JTqq_czodKB87GYqM,2451
+lgt_jobs/jobs/send_slack_message.py,sha256=nNtuSsAIK5dzvP3B1G-BHNyk_LuZkHfsGmpXHHIqBb0,2329
 lgt_jobs/jobs/update_slack_profile.py,sha256=_ed0OhrVc1U-nE6dLckdmTmzZaxlK-y7h4S7SIpfEiA,3582
-lgt_jobs/jobs/user_balance_update.py,sha256=HxeEmDdloK9EcoEj1ybYTgxIkB0IQNLnss_kk3rLI1Q,2404
+lgt_jobs/jobs/user_balance_update.py,sha256=1262PdJhsQ2oly2vJFT6IQWLKoPnBXmMkGBgu1U7sSs,2441
 lgt_jobs/jobs/workspace_connect.py,sha256=y48LGLtH7KxB-XAja9JOW4VFq4rzJh8cSf6heNBLSx0,7067
 lgt_jobs/lgt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/helpers.py,sha256=3T47_Abw7datSIxVqIHTCB-sh-rnahWrmrFG8sSY9ZE,178
@@ -37,18 +37,20 @@ lgt_jobs/lgt_common/pubsub/pubsubfactory.py,sha256=rfUDooYuhBQ2pE9FdDxZOpXjbrvlp
 lgt_jobs/lgt_common/slack_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/slack_client/methods.py,sha256=ctKF_1UHEmSWaRsoGEgMZicVabV7eEufZ7pjxdMAx8g,1455
 lgt_jobs/lgt_common/slack_client/slack_client.py,sha256=SR3YjJCJ-_8BPu29sFtF0ULijNL3QkBrvp_JXkm4DDk,13806
-lgt_jobs/lgt_common/slack_client/web_client.py,sha256=6ybC5v-oK-Kuat8qM2fskS6nCnA9cJ5U0yIKhp_Y4kM,4939
+lgt_jobs/lgt_common/slack_client/web_client.py,sha256=WCu8mqYhauuxp9iDAMsjocchKD78iWdcnbu7Ozdyzq8,3448
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/analytics.py,sha256=fiN88zcIxs_bRMmXL7ftp4FvBeJ5I7QBPE4tbwKJ39E,21689
-lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7728
-lgt_jobs/lgt_data/enums.py,sha256=jXrOcpy4awVuiZ51nSncfFospg0KsBZ4UwL650_VZVg,2259
-lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
-lgt_jobs/lgt_data/model.py,sha256=rbIrpXmubryaX79E5bPKVWTUgJVmeLDThtVUDP5tTOA,33350
-lgt_jobs/lgt_data/mongo_repository.py,sha256=SKIVxqc1u4I_uXTa3gSJRomRLt_6zKbQtLreC4EZZ8w,47111
+lgt_jobs/lgt_data/analytics.py,sha256=vPKX-dXJzwg3T7w8Sx3a0mMi8HAlEwp8rcm1umE62mg,21681
+lgt_jobs/lgt_data/engine.py,sha256=I9kz7Z6xzdrxN40S_9aYJMnoB54LpTA1Hk_yJYogohQ,7736
+lgt_jobs/lgt_data/enums.py,sha256=3IV06umcBLXMCWnXUO66fyPM8IVwfCVbiSCjcwYMqCY,2238
+lgt_jobs/lgt_data/helpers.py,sha256=Lg5aPM-EQiEcb4jFS9LoGbSwkB5-SYRnOutOHrOJKPA,611
+lgt_jobs/lgt_data/model.py,sha256=PGAY24Uh7HnnEbaWTZe7nPkMaGy6Vb688q9Of8d2Yto,34592
+lgt_jobs/lgt_data/mongo_repository.py,sha256=JdeWnmWI9SN-Z3mHW5B3-3gn6e0MUhKGRPTVxaT5Yow,46917
+lgt_jobs/lgt_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lgt_jobs/lgt_data/models/message_request.py,sha256=3m_2uSqnLUHrQbhTEKednoC0KuxAC5o2-LwONUAHCC8,367
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/services/web_client.py,sha256=GLWsJkIC8rv6xLFaLwcMm4EwBlVDu0njORwkZqBJaE4,2086
+lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.621.0.dist-info/METADATA,sha256=ZgcCzckuAsnczf-2lEYpikDmv5DVmfaiWRLSLmBRfbw,1319
-leadguru_jobs-0.621.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-leadguru_jobs-0.621.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.621.0.dist-info/RECORD,,
+leadguru_jobs-0.623.0.dist-info/METADATA,sha256=HdXF8KzVG6SU0BV1YIgW-WhQzIRncF-ScnchOHXwLCo,1319
+leadguru_jobs-0.623.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+leadguru_jobs-0.623.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.623.0.dist-info/RECORD,,

lgt_jobs/jobs/chat_history.py

@@ -2,10 +2,10 @@ from datetime import datetime, UTC
 from abc import ABC
 from typing import Optional, List
 import logging as log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient, SlackMessageConvertService
+from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.model import ChatMessage, UserContact, DedicatedBotModel
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, UserContactsRepository, \
-    ChatRepository
+    ChatRepository, UserLeadMongoRepository
 from pydantic import BaseModel
 from lgt_jobs.lgt_data.enums import SourceType
 from lgt_jobs.runner import BaseBackgroundJob, BaseBackgroundJobData
@@ -23,6 +23,7 @@ class LoadChatHistoryJobData(BaseBackgroundJobData, BaseModel):
 class LoadChatHistoryJob(BaseBackgroundJob, ABC):
     chat_repo = ChatRepository()
     contacts_repo = UserContactsRepository()
+    user_leads_repo = UserLeadMongoRepository()
 
     @property
     def job_data_type(self) -> type:
@@ -97,14 +98,15 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         if not messages:
             return None
 
-        messages = [SlackMessageConvertService.from_slack_response(bot, m, contact.sender_id) for m in messages]
+        messages = [ChatMessage.from_slack_response(bot, m, contact.sender_id) for m in messages]
         new_messages = self._get_new_messages(contact, bot, messages)
         chat_history = [message.to_dic() for message in new_messages]
         self.chat_repo.upsert_messages(chat_history)
         if bot.associated_user != contact.sender_id and new_messages:
             log.info(f'[LoadChatHistoryJob]: New message. Sender id: {contact.sender_id}, bot id: {bot.id}')
-            self.contacts_repo.update(contact.user_id, contact.sender_id, contact.source_id,
-                                      last_message_at=datetime.now(UTC))
+            now = datetime.now(UTC)
+            self.contacts_repo.update(contact.user_id, contact.sender_id, contact.source_id, last_message_at=now)
+            self.user_leads_repo.update_many_by_sender_id(contact.sender_id, last_action_at=now)
             return new_messages[-1]
 
         return None

lgt_jobs/jobs/inbox_leads.py

@@ -1,10 +1,10 @@
 from abc import ABC
 import logging as log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
-from lgt_jobs.lgt_data.enums import DefaultBoards
-from lgt_jobs.lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation, UserLeadModel
+from lgt_jobs.lgt_data.model import UserModel, DedicatedBotModel, SlackMemberInformation
+from lgt_jobs.lgt_data.models.message_request import MessageRequest
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, \
-    SlackContactUserRepository, BoardsMongoRepository, UserContactsRepository
+    SlackContactUserRepository, UserContactsRepository, MessageRequestsRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJob, BaseBackgroundJobData
 from lgt_jobs.services.web_client import V3ServerClient
@@ -35,12 +35,9 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
             for dedicated_bot in dedicated_bots:
                 self.create_inbox_leads(user, dedicated_bot)
 
-    def create_inbox_leads(self, user: UserModel, dedicated_bot: DedicatedBotModel):
-        inbox_board = BoardsMongoRepository().get(user.id, is_primary=True, name=DefaultBoards.Inbox.value)
-        if not inbox_board:
-            return
+    @staticmethod
+    def create_inbox_leads(user: UserModel, dedicated_bot: DedicatedBotModel):
         slack_client = SlackWebClient(dedicated_bot.token, dedicated_bot.cookies)
-
         attempt = 0
         conversations_list = []
         while attempt < 3:
@@ -85,21 +82,9 @@ class InboxLeadsJob(BaseBackgroundJob, ABC):
                         slack_profile = slack_client.get_profile(sender_id).get('user')
                         InboxLeadsJob.create_people(slack_profile, dedicated_bot)
 
-                    save_lead_response = self.v3_client.save_lead_from_contact(sender_id=sender_id,
-                                                                               source_id=dedicated_bot.source.source_id,
-                                                                               email=user.email,
-                                                                               message=messages[0].get("text"))
-                    log.info(f"[InboxLeadsJob]: Save lead for user: {user.email}")
-                    if save_lead_response.status_code == 200:
-                        lead = UserLeadModel.from_dic(save_lead_response.json())
-                        self.v3_client.update_user_lead(lead.message.message_id, user.email,
-                                                        im_id, str(inbox_board[0].id), "Received")
-                        log.info(f"[InboxLeadsJob]: Added inbox lead {lead.id} for user: {user.email}")
-
-                    else:
-                        log.warning(f"[InboxLeadsJob]: Error to save lead from contact. "
-                                    f"Details {save_lead_response.content}, "
-                                    f"status code: {save_lead_response.status_code}")
+                    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())
 
     @staticmethod
     def create_people(slack_profile: dict, dedicated_bot: DedicatedBotModel):

lgt_jobs/jobs/send_slack_message.py

@@ -2,10 +2,9 @@ from datetime import datetime, UTC
 from abc import ABC
 from typing import Optional
 import logging as log
-from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient, SlackMessageConvertService
+from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.model import ChatMessage
-from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserContactsRepository, UserMongoRepository, \
-    ChatRepository
+from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserContactsRepository, ChatRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
 
@@ -31,7 +30,6 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
         if not bot:
             return
 
-        user = UserMongoRepository().get(bot.user_id)
         user_contacts_repository = UserContactsRepository()
         uc = user_contacts_repository.find_one(bot.user_id, sender_id=data.sender_id,
                                                source_id=bot.source.source_id)
@@ -54,6 +52,6 @@ class SendSlackMessageJob(BaseBackgroundJob, ABC):
         message = resp.get('message') if 'message' in resp \
             else slack_client.conversation_replies(channel_id, resp['file_msg_ts'])['messages'][0]
 
-        message_model: ChatMessage = SlackMessageConvertService.from_slack_response(bot, message, data.sender_id)
+        message_model: ChatMessage = ChatMessage().from_slack_response(bot, message, data.sender_id)
         message_model.viewed = True
         ChatRepository().upsert_messages([message_model.to_dic()])

lgt_jobs/jobs/user_balance_update.py

@@ -4,7 +4,8 @@ from typing import Optional
 from lgt_jobs.lgt_data.engine import UserCreditStatementDocument
 from lgt_jobs.lgt_data.enums import UserAccountState, UserAction
 from lgt_jobs.lgt_data.model import UserModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, to_object_id
+from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository
+from lgt_jobs.lgt_data.helpers import to_object_id
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
 

lgt_jobs/lgt_common/slack_client/web_client.py

@@ -1,36 +1,6 @@
 from google.cloud import storage
-from datetime import datetime, timedelta
-from lgt_jobs.lgt_data.model import ChatMessage, LeadGuruFile, DedicatedBotModel
+from datetime import timedelta
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
-from lgt_jobs.lgt_data.mongo_repository import to_object_id
-
-
-class SlackMessageConvertService:
-    @staticmethod
-    def from_slack_response(bot: DedicatedBotModel, message_data: dict, sender_id: str) -> ChatMessage:
-        result = ChatMessage()
-        result.sender_id = sender_id
-        result.bot_id = to_object_id(bot.id)
-        result.text = message_data.get('text', '')
-        result.user = message_data.get('user', '')
-        result.id = message_data.get('ts', '')
-        result.attachments = message_data.get('attachments', [])
-        result.files = []
-        result.user_id = to_object_id(bot.user_id)
-        result.source_id = bot.source.source_id
-        if 'files' in message_data:
-            for file in message_data.get('files'):
-                if file.get('mode') != "tombstone" and file.get('url_private_download'):
-                    leadguru_file = LeadGuruFile()
-                    leadguru_file.id = file['id']
-                    leadguru_file.content_type = file['mimetype']
-                    leadguru_file.file_name = file['name']
-                    leadguru_file.blob_path = f'slack_files/{bot.user_name}/slack_files/{file["id"]}'
-                    result.files.append(leadguru_file)
-
-        js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])
-        result.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
-        return result
 
 
 class SlackFilesClient:

lgt_jobs/lgt_data/analytics.py

@@ -4,7 +4,7 @@ from collections import OrderedDict
 from datetime import timedelta, datetime
 from bson import ObjectId
 from dateutil import tz
-from lgt_jobs.lgt_data.mongo_repository import to_object_id
+from lgt_jobs.lgt_data.helpers import to_object_id
 from pymongo import MongoClient
 
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
@@ -81,6 +81,7 @@ def _prepare_date_analytics_doc(doc, ordered_result_dict: Dict[str, int]):
         ordered_result_dict[str_date] = item["count"]
     return ordered_result_dict
 
+
 def get_channel_aggregated_analytics(from_date: datetime = None, to_date: datetime = None,
                                      bot_id: Optional[str | ObjectId] = None):
     pipeline = [

lgt_jobs/lgt_data/engine.py

@@ -5,7 +5,7 @@ from datetime import datetime, UTC
 from bson import ObjectId
 from mongoengine import connect, Document, DateTimeField, StringField, IntField, ObjectIdField, ListField
 from typing import Dict, Tuple, Optional
-from .mongo_repository import to_object_id
+from lgt_jobs.lgt_data.helpers import to_object_id
 
 connect(host=os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'), db="lgt_admin", alias="lgt_admin")
 

lgt_jobs/lgt_data/enums.py

@@ -50,7 +50,6 @@ class StatusConnection(str, Enum):
 
 
 class DefaultBoards(str, Enum):
-    Inbox = 'Inbox',
     Primary = 'Primary board'
 
 

lgt_jobs/lgt_data/helpers.py

@@ -1,3 +1,5 @@
+from bson import ObjectId
+
 from lgt_jobs.lgt_data.model import UserModel
 from lgt_jobs.lgt_data.mongo_repository import SubscriptionsRepository
 
@@ -9,3 +11,10 @@ def get_linkedin_search_contact(name: str):
 def get_help_text(user: UserModel):
     subscription = SubscriptionsRepository().find_one(id=user.subscription_id)
     return 'the onboarding call with us!' if subscription.trial else 'a call with us.'
+
+
+def to_object_id(oid):
+    if isinstance(oid, ObjectId):
+        return oid
+    return ObjectId(oid)
+

lgt_jobs/lgt_data/model.py

@@ -6,6 +6,7 @@ from datetime import datetime, UTC, timedelta
 from typing import Optional, List
 from lgt_jobs.lgt_data.enums import UserRole, SourceType, FeaturesEnum, FeatureOptions, NotificationType
 from bson import ObjectId
+from lgt_jobs.lgt_data.helpers import to_object_id
 
 
 class DictionaryModel(ABC):
@@ -361,7 +362,6 @@ class UserModel(BaseModel):
         self.company_web_site: str = ''
         self.company_description: str = ''
         self.position: str = ''
-        # self.new_message_notified_at: Optional[datetime] = None     # TODO: Move to settings
         self.leads_limit: Optional[int] = None
         self.leads_proceeded: Optional[int] = None
         self.leads_filtered: Optional[int] = None
@@ -705,6 +705,32 @@ class ChatMessage:
             setattr(model, k, v)
         return model
 
+    @classmethod
+    def from_slack_response(cls, bot: DedicatedBotModel, message_data: dict, sender_id: str) -> ChatMessage:
+        model = cls()
+        model.sender_id = sender_id
+        model.bot_id = to_object_id(bot.id)
+        model.text = message_data.get('text', '')
+        model.user = message_data.get('user', '')
+        model.id = message_data.get('ts', '')
+        model.attachments = message_data.get('attachments', [])
+        model.files = []
+        model.user_id = to_object_id(bot.user_id)
+        model.source_id = bot.source.source_id
+        if 'files' in message_data:
+            for file in message_data.get('files'):
+                if file.get('mode') != "tombstone" and file.get('url_private_download'):
+                    leadguru_file = LeadGuruFile()
+                    leadguru_file.id = file['id']
+                    leadguru_file.content_type = file['mimetype']
+                    leadguru_file.file_name = file['name']
+                    leadguru_file.blob_path = f'slack_files/{bot.user_name}/slack_files/{file["id"]}'
+                    model.files.append(leadguru_file)
+
+        js_ticks = int(model.id.split('.')[0] + model.id.split('.')[1][3:])
+        model.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
+        return model
+
 
 class ScheduledChatMessage(ChatMessage):
     post_at: Optional[datetime]

lgt_jobs/lgt_data/models/message_request.py

@@ -0,0 +1,10 @@
+from lgt_jobs.lgt_data.model import ChatMessage, DedicatedBotModel
+
+
+class MessageRequest(ChatMessage):
+    hidden: bool = False
+
+    @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())

lgt_jobs/lgt_data/mongo_repository.py

@@ -6,6 +6,7 @@ from dateutil import tz
 from pymongo import MongoClient, UpdateOne
 from bson.objectid import ObjectId
 from lgt_jobs.lgt_data.enums import SourceType
+from lgt_jobs.lgt_data.helpers import to_object_id
 from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetPasswordModel, BoardModel, BoardedStatus,
                                      DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
                                      ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
@@ -17,12 +18,6 @@ from collections import OrderedDict
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
 
-def to_object_id(oid):
-    if isinstance(oid, ObjectId):
-        return oid
-    return ObjectId(oid)
-
-
 class BaseMongoRepository:
     collection_name = ''
     database_name = 'lgt_admin'
@@ -35,7 +30,7 @@ class BaseMongoRepository:
         return client[self.database_name][collection_name]
 
     def insert_many(self, items):
-        insert_items = map(lambda x: x.to_dic(), items)
+        insert_items = [item.to_dic() for item in items]
         self.collection().insert_many(insert_items)
 
     def insert(self, item: BaseModel):
@@ -85,7 +80,7 @@ class UserMongoRepository(BaseMongoRepository):
         if has_new_message:
             pipeline['notification_settings.incoming_messages.enabled'] = True
             pipeline['notification_settings.incoming_messages.need_to_notify'] = True
-            
+
         if connected_slack_email:
             pipeline['slack_users.email'] = connected_slack_email
 
@@ -179,6 +174,10 @@ class UserLeadMongoRepository(BaseMongoRepository):
         self.collection().update_many({'message.source.source_id': source_id},
                                       {'$set': {'message.source': source_data}})
 
+    def update_many_by_sender_id(self, sender_id: str, **kwargs):
+        update_dict = {k: v for k, v in kwargs.items() if v is not None}
+        self.collection().update_many({'message.sender_id': sender_id}, {'$set': update_dict}, upsert=False)
+
     def get_many(self, ids: list, user_id):
         docs = self.collection().find({"id": {'$in': ids}, 'user_id': to_object_id(user_id)})
         leads = [ExtendedUserLeadModel.from_dic(lead) for lead in docs]
@@ -229,11 +228,11 @@ class UserLeadMongoRepository(BaseMongoRepository):
         configs = kwargs.get('config', None)
         bots_names = kwargs.get('bots_names', None)
         locations = kwargs.get('locations', None)
-        dedicated_bots_ids = kwargs.get('dedicated_bots_ids', None)
         with_chat = kwargs.get('with_chat', None)
         leads_ids = kwargs.get('leads_ids', None)
         exclude_leads = kwargs.get('exclude_leads', None)
         exclude_senders = kwargs.get('exclude_senders', None)
+        deleted = kwargs.get('deleted', False)
 
         pipeline['message.profile.display_name'] = {
             "$ne": "Slackbot"
@@ -310,8 +309,8 @@ class UserLeadMongoRepository(BaseMongoRepository):
         if bots_names is not None:
             pipeline['message.name'] = {'$in': bots_names}
 
-        if dedicated_bots_ids is not None:
-            pipeline["message.dedicated_slack_options.bot_id"] = {"$in": dedicated_bots_ids}
+        pipeline['deleted'] = deleted
+
         return pipeline
 
     def get_daily_analytics_by_workspace(self, user_configs: list,
@@ -661,22 +660,6 @@ class SpamLeadsMongoRepository(LeadMongoRepository):
         return pipeline
 
 
-class GarbageLeadsMongoRepository(SpamLeadsMongoRepository):
-    pass
-
-    def __init__(self):
-        super().__init__()
-        self.collection_name = 'garbage_leads'
-
-
-class GarbageUserLeadsMongoRepository(UserLeadMongoRepository):
-    pass
-
-    def __init__(self):
-        self.database_name = 'lgt_admin'
-        self.collection_name = 'garbage_leads'
-
-
 class SpamUserLeadsMongoRepository(UserLeadMongoRepository):
     pass
 
@@ -1206,6 +1189,10 @@ class ChatRepository(BaseMongoRepository):
         self.collection().delete_one({"id": _id, 'user_id': to_object_id(user_id)})
 
 
+class MessageRequestsRepository(BaseMongoRepository):
+    collection_name = 'message_requests'
+
+
 class UserVerificationMongoRepository(BaseMongoRepository):
     pass
 

lgt_jobs/services/web_client.py

@@ -1,5 +1,4 @@
 import requests
-from requests import Response
 from lgt_jobs.env import v3_server_host, v1_server_host, service_account_email, service_account_password
 
 
@@ -34,18 +33,6 @@ class V3ServerClient(BaseHttpClient):
         return requests.post(f'{v3_server_host}/{self.api_version}/user_leads/update',
                              headers=headers, params=payload, json=update_lead_payload).json()
 
-    def save_lead_from_contact(self, sender_id: str, source_id: str, email: str, message: str = None) -> Response:
-        payload = {
-            'sender_id': sender_id,
-            'source_id': source_id,
-            'user_email': email,
-            'message': message,
-            'inbox': True
-        }
-        headers = self._create_default_headers()
-        return requests.post(f'{v3_server_host}/{self.api_version}/user_leads/create',
-                             headers=headers, params=payload)
-
 
 class BillingServerClient:
     api_version = 'api'