leadguru-jobs 0.609.0__tar.gz → 0.610.0__tar.gz

{leadguru_jobs-0.609.0 → leadguru_jobs-0.610.0}/PKG-INFO

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

{leadguru_jobs-0.609.0 → leadguru_jobs-0.610.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.609.0 → leadguru_jobs-0.610.0}/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:

{leadguru_jobs-0.609.0 → leadguru_jobs-0.610.0}/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

leadguru_jobs-0.610.0/lgt_jobs/lgt_common/helpers.py

@@ -0,0 +1,5 @@
+def update_credentials(credentials, token, cookies):
+    credentials.token = token
+    credentials.cookies = cookies
+    credentials.invalid_creds = False
+    return credentials

{leadguru_jobs-0.609.0 → leadguru_jobs-0.610.0}/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"

leadguru_jobs-0.609.0/lgt_jobs/lgt_common/helpers.py

@@ -1,18 +0,0 @@
-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()