leadguru-jobs 0.608.0__py3-none-any.whl → 0.610.0__py3-none-any.whl

{leadguru_jobs-0.608.0.dist-info → leadguru_jobs-0.610.0.dist-info}/METADATA

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

{leadguru_jobs-0.608.0.dist-info → leadguru_jobs-0.610.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ lgt_jobs/assets/images/logo.png,sha256=nt377FGkBalBF9Z9TYQRv9loHolTXwU8_VRYvCXXz
 lgt_jobs/assets/images/mail.png,sha256=eORzQcAMkFr7DjgtABVhJ_zFuXgO7OXv78lLF4b39B0,7168
 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=KYO0QbtM6oHFNTtoVyCBHpbIF8Yr_YOvWUWn-UzYoLA,8115
+lgt_jobs/jobs/bot_stats_update.py,sha256=JRPPyqFvGHWuH_NQJNzIDy3DC0Joz14goNExqp-YUrw,8683
 lgt_jobs/jobs/chat_history.py,sha256=KiwiPl8FuI7FphfZT5VgKSTiO_W9j7tNyiSbnSe5GAs,6106
 lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
 lgt_jobs/jobs/inbox_leads.py,sha256=OSX-FNx27gWEKNBBc-hyq2odCxXytz7WHtQJajtz274,5670
@@ -22,9 +22,9 @@ lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,82
 lgt_jobs/jobs/send_slack_message.py,sha256=_fuzqgspl7KRO6h4IRJya6sMT5JTqq_czodKB87GYqM,2451
 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/workspace_connect.py,sha256=LSZkkuPuHTqxvaTgqz_Y_kGIkF3Mmn_xwKf2h0uDWVg,7115
+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=tJNrKJYPa_MBmfRVrpHryoOWe4gnv7xOlmHuTh-bMBw,428
+lgt_jobs/lgt_common/helpers.py,sha256=3T47_Abw7datSIxVqIHTCB-sh-rnahWrmrFG8sSY9ZE,178
 lgt_jobs/lgt_common/lgt_logging.py,sha256=Zxr2sPpY-qU_YbL_47OM6dE_JA1ejG_Vr1PNnjF_jwo,576
 lgt_jobs/lgt_common/discord_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_common/discord_client/discord_client.py,sha256=IA5JgoZq-oowkEGLRReZbW4Wa7cTtdSTPfGKF6ymNm8,4067
@@ -44,11 +44,11 @@ lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7
 lgt_jobs/lgt_data/enums.py,sha256=jBH5WGBtDAvFrh4iiPIzlQ-XrImMpuwqstuasG55mJ0,2209
 lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
 lgt_jobs/lgt_data/model.py,sha256=7a10N7WAqX2ZdstHTQrvp87rtYB9UPhWLidOYQJnKXM,29040
-lgt_jobs/lgt_data/mongo_repository.py,sha256=i45iPEUA9ggS5hALXtRlCIywC-bW6TO7G-Ud0fM_G3o,46228
+lgt_jobs/lgt_data/mongo_repository.py,sha256=m1UHtBwiZ8JGIMZ6ud2PZadm8sgq4InG0glR7-sBLwE,46849
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=GLWsJkIC8rv6xLFaLwcMm4EwBlVDu0njORwkZqBJaE4,2086
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.608.0.dist-info/METADATA,sha256=t44AqrsdQH9j8Sxtci8GI2rK1x6BQsoYsD5tHZFj-3g,1319
-leadguru_jobs-0.608.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-leadguru_jobs-0.608.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.608.0.dist-info/RECORD,,
+leadguru_jobs-0.610.0.dist-info/METADATA,sha256=DReiHwWbCG8Q0dsTyv_hU-LsnNjkvjmws7MRwHiIcRQ,1319
+leadguru_jobs-0.610.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+leadguru_jobs-0.610.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.610.0.dist-info/RECORD,,

{leadguru_jobs-0.608.0.dist-info → leadguru_jobs-0.610.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

lgt_jobs/jobs/bot_stats_update.py

@@ -4,11 +4,11 @@ from abc import ABC
 from datetime import datetime, UTC, timedelta
 from typing import Optional
 from lgt_jobs.lgt_common.discord_client.discord_client import DiscordClient
-from lgt_jobs.lgt_common.helpers import get_formatted_bot_name
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.enums import SourceType
 from lgt_jobs.lgt_data.model import DedicatedBotModel, Server, Channel, DiscordUser
-from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, UserMongoRepository
+from lgt_jobs.lgt_data.mongo_repository import (DedicatedBotRepository, UserMongoRepository, SlackContactUserRepository,
+                                                LeadMongoRepository, UserLeadMongoRepository)
 from pydantic import BaseModel
 from lgt_jobs.lgt_data.analytics import get_bots_aggregated_analytics
 import logging as log
@@ -113,12 +113,19 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
             log.warning(f"[BotStatsUpdateJob]: Error to get  team info of {data.bot_id}. {test_auth_response.content}")
 
         if team_info.get('ok'):
-            bot_name = get_formatted_bot_name(team_info['team']['domain'])
-            if bot.servers:
-                bot.servers[0].name = bot_name
-            bot.source.source_name = bot_name
-            bot.slack_url = bot.registration_link = team_info['team']['url']
-            bots_rep.add_or_update(bot)
+            bot_name = team_info['team']['domain']
+            if bot.source.source_name != bot_name:
+                log.info(f"[BotStatsUpdateJob]: Updated source {bot.source.source_id}. "
+                         f"Was {bot.source.source_name}, now {bot_name}")
+                if bot.servers:
+                    bot.servers[0].name = bot_name
+                bot.source.source_name = bot_name
+                bot.slack_url = bot.registration_link = team_info['team']['url']
+                bots_rep.add_or_update(bot)
+                SlackContactUserRepository().update_source(bot.source.source_id, bot.source.__dict__)
+                UserLeadMongoRepository().update_source(bot.source.source_id, bot.source.__dict__)
+                LeadMongoRepository().update_source(bot.source.source_id, bot.source.__dict__)
+
         try:
             channels_response = client.channels_list()
         except:

lgt_jobs/jobs/workspace_connect.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Dict
 import requests
-from lgt_jobs.lgt_common.helpers import update_credentials, get_formatted_bot_name
+from lgt_jobs.lgt_common.helpers import update_credentials
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient
 from lgt_jobs.lgt_data.enums import StatusConnection, SourceType
 from lgt_jobs.lgt_data.model import UserWorkspace, SlackUser, DedicatedBotModel
@@ -94,7 +94,7 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
             token = sliced_content[:end_token_index]
             workspace.magic_login_url = login_url
             workspace.token = token
-            workspace.domain = get_formatted_bot_name(workspace.domain)
+            workspace.domain = workspace.domain
 
         slack_user.cookies = session.cookies.get_dict()
         slack_user.workspaces = user_workspaces

lgt_jobs/lgt_common/helpers.py

@@ -1,18 +1,5 @@
-import re
-
-
 def update_credentials(credentials, token, cookies):
     credentials.token = token
     credentials.cookies = cookies
     credentials.invalid_creds = False
     return credentials
-
-
-def get_formatted_bot_name(name):
-    bot_name = name
-    bot_name.replace(" ", "_") \
-        .replace(".", "dot_") \
-        .replace("#", "") \
-        .replace("+", "_plus")
-
-    return re.sub(r'[^A-Za-z0-9]', "", bot_name).lower()

lgt_jobs/lgt_data/mongo_repository.py

@@ -170,6 +170,10 @@ class UserLeadMongoRepository(BaseMongoRepository):
     collection_name = 'user_leads'
     model = ExtendedUserLeadModel
 
+    def update_source(self, source_id: str, source_data: dict):
+        self.collection().update_many({'message.source.source_id': source_id},
+                                      {'$set': {'message.source': source_data}})
+
     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]
@@ -461,6 +465,10 @@ class LeadMongoRepository(BaseMongoRepository):
     collection_name = 'general_leads'
     model = LeadModel
 
+    def update_source(self, source_id: str, source_data: dict):
+        self.collection().update_many({'message.source.source_id': source_id},
+                                      {'$set': {'message.source': source_data}})
+
     def delete(self, _id):
         res = self.collection().delete_one({'id': _id})
         return res
@@ -944,6 +952,9 @@ class SlackContactUserRepository(BaseMongoRepository):
         pipeline = {"sender_id": user_id}
         return SlackMemberInformation.from_dic(self.collection().find_one(pipeline))
 
+    def update_source(self, source_id: str, source_data: dict):
+        self.collection().update_many({'source.source_id': source_id}, {'$set': {'source': source_data}})
+
 
 class UserTemplatesRepository(BaseMongoRepository):
     collection_name = "user_templates"