leadguru-jobs 0.606.0__py3-none-any.whl → 0.607.0__py3-none-any.whl

{leadguru_jobs-0.606.0.dist-info → leadguru_jobs-0.607.0.dist-info}/METADATA

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

{leadguru_jobs-0.606.0.dist-info → leadguru_jobs-0.607.0.dist-info}/RECORD

@@ -20,7 +20,7 @@ lgt_jobs/jobs/load_slack_people.py,sha256=az3Pl8_0nUXizShpCksH6XMHFALLkta4QpMr_M
 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/update_slack_profile.py,sha256=kQkhdaki5JaLZC7-Eu69u6O26jqsa1AD5PYU64CX6NU,3151
+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/lgt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,12 +43,12 @@ lgt_jobs/lgt_data/analytics.py,sha256=fiN88zcIxs_bRMmXL7ftp4FvBeJ5I7QBPE4tbwKJ39
 lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7728
 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=I8_7GS1IXRML0SLT9e_PxY7To-4haVVg40YYdr_TGoM,28678
+lgt_jobs/lgt_data/model.py,sha256=7a10N7WAqX2ZdstHTQrvp87rtYB9UPhWLidOYQJnKXM,29040
 lgt_jobs/lgt_data/mongo_repository.py,sha256=i45iPEUA9ggS5hALXtRlCIywC-bW6TO7G-Ud0fM_G3o,46228
 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.606.0.dist-info/METADATA,sha256=3UvNCYxpSp5h-SKG6kbDUkpvjWF_7dGd0EMRP_Ianmg,1319
-leadguru_jobs-0.606.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-leadguru_jobs-0.606.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.606.0.dist-info/RECORD,,
+leadguru_jobs-0.607.0.dist-info/METADATA,sha256=cjiTrNHjeUn7ZNLBss1Yc8j7yWTBHrSfgiiwsaryoak,1319
+leadguru_jobs-0.607.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+leadguru_jobs-0.607.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.607.0.dist-info/RECORD,,

{leadguru_jobs-0.606.0.dist-info → leadguru_jobs-0.607.0.dist-info}/WHEEL

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

lgt_jobs/jobs/update_slack_profile.py

@@ -2,7 +2,7 @@ from abc import ABC
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
 from lgt_jobs.lgt_common.slack_client.web_client import SlackFilesClient
 from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.model import UserModel
+from lgt_jobs.lgt_data.model import Profile, SlackUser
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository
 from pydantic import BaseModel
 from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
@@ -21,31 +21,37 @@ class UpdateExternalUserProfileJob(BaseBackgroundJob, ABC):
 
     def exec(self, data: UpdateExternalUserProfileJobData):
         user = UserMongoRepository().get(data.user_id)
+        main_profile = None
+        active_users = [slack_user for slack_user in user.slack_users if not slack_user.deleted]
+        if active_users and active_users[0].profile.main:
+            main_profile = active_users[0].profile
         bots = DedicatedBotRepository().get_all(user_id=data.user_id, only_valid=True, include_deleted=False)
         for bot in bots:
+            current_user: SlackUser = next(filter(lambda x: x.email == bot.user_name, user.slack_users), None)
+            profile = main_profile if main_profile else current_user.profile
             if bot.source.source_type == SourceType.SLACK:
                 slack = SlackClient(bot.token, bot.cookies)
                 log.info(f'Updating profile in {bot.source.source_name}:{bot.source.source_id}')
-                UpdateExternalUserProfileJob.__update_slack_profile(user, slack)
+                UpdateExternalUserProfileJob.__update_slack_profile(slack, profile)
 
     @staticmethod
-    def __update_slack_profile(user: UserModel, slack: SlackClient):
-        slack.update_profile(user.slack_profile.to_dic())
-        if user.photo_url:
-            photo_url = SlackFilesClient().get_file_url(user.photo_url)
+    def __update_slack_profile(slack: SlackClient, profile: Profile = None):
+        slack.update_profile(profile.to_dic())
+        if profile.photo_url:
+            photo_url = SlackFilesClient().get_file_url(profile.photo_url)
             slack.update_profile_photo(photo_url)
 
-        profile = slack.get_team_profile()
+        team_profile = slack.get_team_profile()
         title_section_id = None
         title_field_id = None
         skype_section_id = None
-        for field_data in profile.get('profile', {}).get('fields', []):
+        for field_data in team_profile.get('profile', {}).get('fields', []):
             if field_data.get('field_name') == 'title':
                 title_section_id = field_data.get('section_id')
                 title_field_id = field_data.get('id')
                 break
         if title_field_id and title_section_id:
-            for section_data in profile.get('profile', {}).get('sections', []):
+            for section_data in team_profile.get('profile', {}).get('sections', []):
                 if section_data.get('section_type') == 'additional_info':
                     skype_section_id = section_data.get('id')
                     break
@@ -53,7 +59,7 @@ class UpdateExternalUserProfileJob(BaseBackgroundJob, ABC):
             auth = slack.test_auth().json()
             user_id = auth.get('user_id')
             title_element_id = title_field_id.replace(title_field_id[:2], 'Pe')
-            response = slack.update_section(user_id, title_section_id, title_element_id, user.slack_profile.title)
+            response = slack.update_section(user_id, title_section_id, title_element_id, profile.title)
             sections = response['result']['data']['setProfileSection']['profileSections']
             elements = []
             for section in sections:
@@ -65,4 +71,4 @@ class UpdateExternalUserProfileJob(BaseBackgroundJob, ABC):
                 if element['label'] == 'Skype':
                     skype_element_id = element['elementId']
                     break
-            slack.update_section(user_id, skype_section_id, skype_element_id, user.slack_profile.skype)
+            slack.update_section(user_id, skype_section_id, skype_element_id, profile.skype)

lgt_jobs/lgt_data/model.py

@@ -272,8 +272,6 @@ class UserModel(BaseModel):
         self.company_description: str = ''
         self.position: str = ''
         self.new_message_notified_at: Optional[datetime] = None
-        self.photo_url: str = ''
-        self.slack_profile = SlackProfile()
         self.leads_limit: Optional[int] = None
         self.leads_proceeded: Optional[int] = None
         self.leads_filtered: Optional[int] = None
@@ -307,7 +305,7 @@ class UserModel(BaseModel):
         if '_id' in dic:
             setattr(model, 'id', dic['_id'])
 
-        model.slack_profile = SlackProfile.from_dic(dic.get('slack_profile'))
+        model.slack_profile = Profile.from_dic(dic.get('slack_profile'))
         model.slack_users = [SlackUser.from_dic(user) for user in dic.get('slack_users', [])]
         model.discord_users = [DiscordUser.from_dic(user) for user in dic.get('discord_users', [])]
         return model
@@ -346,13 +344,17 @@ class DiscordUser(DictionaryModel):
         self.status = None
         self.workspaces: List[UserWorkspace] = []
         self.deleted = False
+        self.profile: Profile | None = None
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)
 
-        if result.get('workspaces', None):
+        if result.get('workspaces'):
             result['workspaces'] = [ws.__dict__ for ws in result.get('workspaces')]
 
+        if result.get('profile'):
+            result['profile'] = result.get('profile').__dict__
+
         return result
 
     @classmethod
@@ -365,6 +367,7 @@ class DiscordUser(DictionaryModel):
             setattr(model, k, v)
 
         model.workspaces = [UserWorkspace.from_dic(ws) for ws in dic.get('workspaces', [])]
+        model.profile = Profile.from_dic(dic.get('profile'))
         return model
 
 
@@ -378,6 +381,7 @@ class SlackUser:
         self.status = None
         self.workspaces: List[UserWorkspace] = []
         self.deleted = False
+        self.profile: Profile | None = None
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)
@@ -385,6 +389,9 @@ class SlackUser:
         if result.get('workspaces', None):
             result['workspaces'] = [ws.__dict__ for ws in result.get('workspaces')]
 
+        if result.get('profile'):
+            result['profile'] = result.get('profile').__dict__
+
         return result
 
     @classmethod
@@ -397,6 +404,7 @@ class SlackUser:
             setattr(model, k, v)
 
         model.workspaces = [UserWorkspace.from_dic(ws) for ws in dic.get('workspaces', [])]
+        model.profile = Profile.from_dic(dic.get('profile'))
         return model
 
 
@@ -730,7 +738,7 @@ class BoardedStatus:
         return model
 
 
-class SlackProfile:
+class Profile:
     pass
 
     def __init__(self):
@@ -740,6 +748,8 @@ class SlackProfile:
         self.display_name = ''
         self.real_name = ''
         self.email = ''
+        self.photo_url = ''
+        self.main = False
 
     def to_dic(self):
         return copy.deepcopy(self.__dict__)
@@ -754,7 +764,7 @@ class SlackProfile:
         return model
 
 
-class SlackMemberInformation(BaseModel, SlackProfile):
+class SlackMemberInformation(BaseModel, Profile):
     workspace: str
     sender_id: str
     images: dict