leadguru-jobs 0.706.0__tar.gz → 0.707.0__tar.gz

{leadguru_jobs-0.706.0 → leadguru_jobs-0.707.0}/PKG-INFO

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

{leadguru_jobs-0.706.0 → leadguru_jobs-0.707.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.706.0 → leadguru_jobs-0.707.0}/lgt_jobs/jobs/workspace_connect.py

@@ -42,78 +42,84 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
             current_user.slack_users.append(slack_user)
         slack_user.status = StatusConnection.IN_PROGRESS
 
-        client = SlackWebClient('')
-        code_confirmed_response = client.confirm_code(data.slack_email, data.code, data.user_agent)
-        if code_confirmed_response.status_code != 200:
-            log.warning(f'Unable to confirm code due to error: {code_confirmed_response.content}')
-            slack_user.status = StatusConnection.FAILED
-            UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
-            return
-
-        code_confirmed = code_confirmed_response.json().get('ok', False)
-        if not code_confirmed:
-            slack_user.status = StatusConnection.FAILED
-            UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
-            log.warning(f'Invalid code')
-            return
-
-        slack_user.cookies = client.client.cookies = code_confirmed_response.cookies.get_dict()
-
-        workspaces_response = None
-        attempt = 1
-        while attempt <= 5:
-            workspaces_response = client.find_workspaces(data.user_agent)
-            if workspaces_response.status_code != 200:
+        try:
+            client = SlackWebClient('')
+            code_confirmed_response = client.confirm_code(data.slack_email, data.code, data.user_agent)
+            if code_confirmed_response.status_code != 200:
+                log.warning(f'Unable to confirm code due to error: {code_confirmed_response.content}')
                 slack_user.status = StatusConnection.FAILED
-                log.warning(f'Attempt: {attempt}. Unable to get workspaces due to error: {workspaces_response.content}')
-                attempt += 1
-                time.sleep(60)
-            if not workspaces_response.json().get('ok', False):
+                UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
+                return
+
+            code_confirmed = code_confirmed_response.json().get('ok', False)
+            if not code_confirmed:
                 slack_user.status = StatusConnection.FAILED
-                log.warning(f'Attempt: {attempt}. Unable to get workspaces due to error: {workspaces_response.json()}')
-                attempt += 1
-                time.sleep(60)
-            else:
-                slack_user.status = StatusConnection.IN_PROGRESS
-                break
+                UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
+                log.warning(f'Invalid code')
+                return
+
+            slack_user.cookies = client.client.cookies = code_confirmed_response.cookies.get_dict()
+
+            workspaces_response = None
+            attempt = 1
+            while attempt <= 5:
+                workspaces_response = client.find_workspaces(data.user_agent)
+                if workspaces_response.status_code != 200:
+                    slack_user.status = StatusConnection.FAILED
+                    log.warning(f'Attempt: {attempt}. Unable to get workspaces due to error: {workspaces_response.content}')
+                    attempt += 1
+                    time.sleep(60)
+                if not workspaces_response.json().get('ok', False):
+                    slack_user.status = StatusConnection.FAILED
+                    log.warning(f'Attempt: {attempt}. Unable to get workspaces due to error: {workspaces_response.json()}')
+                    attempt += 1
+                    time.sleep(60)
+                else:
+                    slack_user.status = StatusConnection.IN_PROGRESS
+                    break
 
-        UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
+            UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
 
-        if attempt > 5:
+            if attempt > 5:
+                return
+
+            log.info(f'{slack_user.email}: got workspaces data {workspaces_response.json()}')
+            user_workspaces = next((user for user in workspaces_response.json()['current_teams']
+                                    if user['email'] == data.slack_email), {}).get('teams', [])
+            user_workspaces = [UserWorkspace.from_dic(ws) for ws in user_workspaces]
+            user_workspaces = sorted(user_workspaces, key=lambda ws: ws.domain)
+
+            session = requests.Session()
+            session.cookies = code_confirmed_response.cookies
+            session.headers.update({'User-Agent': data.user_agent})
+            log.info(f'{slack_user.email}: started getting of tokens for {len(user_workspaces)} workspaces')
+            for workspace in user_workspaces:
+                if not workspace.magic_login_code:
+                    continue
+                login_url = f"https://app.slack.com/t/{workspace.domain}/login/{workspace.magic_login_code}"
+                magic_response = session.post(login_url, cookies=session.cookies, headers=session.headers)
+                content = magic_response.content.decode('utf-8')
+                start_token_index = content.find("xox")
+                sliced_content = content[start_token_index:]
+                end_token_index = sliced_content.find('"')
+                token = sliced_content[:end_token_index]
+                workspace.magic_login_url = login_url
+                workspace.token = token
+                workspace.domain = workspace.domain
+                time.sleep(random.uniform(0.2, 0.5))
+
+            slack_user.cookies = session.cookies.get_dict()
+            slack_user.workspaces = user_workspaces
+            slack_user.status = StatusConnection.COMPLETE
+
+            slack_users_dict = [user.to_dic() for user in current_user.slack_users]
+            UserMongoRepository().set(current_user.id, slack_users=slack_users_dict)
+
+        except:
+            slack_user.status = StatusConnection.FAILED
+            UserMongoRepository().set(current_user.id, slack_users=[user.to_dic() for user in current_user.slack_users])
             return
 
-        log.info(f'{slack_user.email}: got workspaces data {workspaces_response.json()}')
-        user_workspaces = next((user for user in workspaces_response.json()['current_teams']
-                                if user['email'] == data.slack_email), {}).get('teams', [])
-        user_workspaces = [UserWorkspace.from_dic(ws) for ws in user_workspaces]
-        user_workspaces = sorted(user_workspaces, key=lambda ws: ws.domain)
-
-        session = requests.Session()
-        session.cookies = code_confirmed_response.cookies
-        session.headers.update({'User-Agent': data.user_agent})
-        log.info(f'{slack_user.email}: started getting of tokens for {len(user_workspaces)} workspaces')
-        for workspace in user_workspaces:
-            if not workspace.magic_login_code:
-                continue
-            login_url = f"https://app.slack.com/t/{workspace.domain}/login/{workspace.magic_login_code}"
-            magic_response = session.post(login_url, cookies=session.cookies, headers=session.headers)
-            content = magic_response.content.decode('utf-8')
-            start_token_index = content.find("xox")
-            sliced_content = content[start_token_index:]
-            end_token_index = sliced_content.find('"')
-            token = sliced_content[:end_token_index]
-            workspace.magic_login_url = login_url
-            workspace.token = token
-            workspace.domain = workspace.domain
-            time.sleep(random.uniform(0.2, 0.5))
-
-        slack_user.cookies = session.cookies.get_dict()
-        slack_user.workspaces = user_workspaces
-        slack_user.status = StatusConnection.COMPLETE
-
-        slack_users_dict = [user.to_dic() for user in current_user.slack_users]
-        UserMongoRepository().set(current_user.id, slack_users=slack_users_dict)
-
         dedicated_bots_repository = DedicatedBotRepository()
         dedicated_bots = dedicated_bots_repository.get_all(user_id=current_user.id, user_name=data.slack_email,
                                                            source_type=SourceType.SLACK, include_deleted=True)
@@ -141,4 +147,4 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
                 dedicated_bot.invalid_creds = True
                 for server in dedicated_bot.servers:
                     server.deleted = True
-                dedicated_bots_repository.add_or_update(dedicated_bot)
+                dedicated_bots_repository.add_or_update(dedicated_bot)

{leadguru_jobs-0.706.0 → leadguru_jobs-0.707.0}/lgt_jobs/lgt_data/models/notifications/notification.py

@@ -54,7 +54,6 @@ class Notification(DictionaryModel):
 class IncomingMessageNotification(Notification):
 
     other_leads_text = ' and other leads.'
-
     name_html_item = '''
         <div style="display: inline-block; padding-left: 2px" class="lead_names">
             <img alt="Lead Photo" src="$$USER_IMAGE$$" width="24" height="24"
@@ -177,94 +176,33 @@ class IncomingMessageNotification(Notification):
 
 
 class InboxNotification(Notification):
-    name_html_item = '''
-            <div style="display: inline-block; padding-left: 2px" class="lead_names">
-                <img alt="Lead Photo" src="$$USER_IMAGE$$" width="24" height="24"
-                        style="background-color: #FFFFFE !important; display: inline-block; vertical-align: top; width: 24px; 
-                        max-width: 24px; min-width: 24px; font-family: 'Outfit', Helvetica, Arial, sans-serif; color: #FFFFFE; 
-                        border-radius: 50% !important; font-size: 16px;" border="0">
-                        <span style="font-weight: 600;">$$USER_NAME$$</span>
-            </div>
-            '''
-    new_request_html_item = '''
-        <tr>
-                                                <td bgcolor="#FFFFFE" align="left" style="padding-top: 16px;"
-                                                    class="pr-bg-dark pr-text-dark">
-                                                    <table role="presentation" width="100%" border="0" cellspacing="0" cellpadding="0">
-                                                        <tr>
-                                                            <td bgcolor="#FFFFFE" align="left"
-                                                                class="pr-bg-dark pr-text-dark"
-                                                                style="font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;">
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0"
-                                                                       style="border-collapse: separate !important;">
-                                                                    <tr>
-                                                                        <td align="center" bgcolor="#FFFFFE" style="border-radius: 50% !important;">
-                                                                            <img alt="Lead Photo" src="$$USER_IMAGE$$" width="24"
-                                                                                 height="24"
-                                                                                 style="display: inline-block; vertical-align: middle; width: 24px; max-width: 24px; min-width: 24px; font-family: 'Outfit', Helvetica, Arial, sans-serif; color: #FFFFFE; border-radius: 50% !important; font-size: 16px;"
-                                                                                 border="0">
-                                                                        </td>
-                                                                        <td align="center"
-                                                                            class="pr-text-dark"
-                                                                            style="white-space: nowrap; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 600; line-height: 20px; padding-left: 4px">
-                                                                            $$USER_NAME$$
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
 
-                                                        <tr>
-                                                            <td align="left" style="padding-top: 8px">
-                                                                <table role="presentation" border="0" cellspacing="0" cellpadding="0"
-                                                                       style="border-collapse: separate !important;">
-                                                                    <tr>
-                                                                        <td align="left" bgcolor="#F6F6F8"
-                                                                            class="sec-bg-dark pr-text-dark"
-                                                                            style="color: #262730; font-family: 'Outfit', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px; padding: 12px; border-radius: 0 12px 12px 12px !important; background-color: #F6F6F8">
-                                                                            $$REQUEST_TEXT$$
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-        '''
     @staticmethod
-    def get_button_name(users: list):
-        return 'View message requests' if len(users) > 1 else 'View message request'
+    def get_button_name():
+        return 'View message request'
 
     @staticmethod
-    def get_chat_url():
+    def get_button_url():
         return f'{portal_url}/feed?requests=true'
 
-    @staticmethod
-    def get_subject_text(users: list) -> str:
-        return 'New message requests on Leadguru' if len(users) > 1 else'New message request on Leadguru'
-
-    def create_title(self, user_ids: list[str], users: list):
-        title = ""
-        for user_id in user_ids[:3]:
-            user = [user for user in users if user_id == user['sender_id']][0]
-            photo = user.get('images', {}).get('image_72', '{{ IMAGE_PERSON.src }}')
-            item = self.name_html_item.replace('$$USER_NAME$$', user['real_name'])
-            item = item.replace('$$USER_IMAGE$$', photo)
-            title += item
-
-        return f"New message requests from {title}" if len(users) > 1 else f"New message request from {title}"
-
-    def create_new_requests_list(self, requests: list):
-        new_requests = ""
-        for request in requests[:3]:
-            name = request['user']['real_name']
-            photo = request['user'].get('images', {}).get('image_72', '{{ IMAGE_PERSON.src }}')
-            item = self.new_request_html_item.replace('$$USER_NAME$$', name)
-            item = item.replace('$$USER_IMAGE$$', photo)
-            item = item.replace('$$REQUEST_TEXT$$', request['text'])
-            new_requests += item
-        return new_requests
+    def get_subject_text(self, users: list) -> str:
+        if self.type == NotificationType.INSTANTLY:
+            return 'New message request on Leadguru'
+        elif len(users) > 1:
+            return 'Message requests on Leadguru'
+        return 'Message request on Leadguru'
+
+    def get_notification_text(self, users: list):
+        if self.type == NotificationType.INSTANTLY:
+            return f'{users[0]} has just sent you message request.'
+        elif (self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.ONCE_A_WEEK) and users:
+            match len(users):
+                case 1:
+                    return f'You have unread message request from {users[0]}.'
+                case 2 | 3:
+                    return f'You have unread message request from {", ".join(users)}.'
+                case _:
+                    return f'You have unread message requests from {", ".join(users[:3])} and other leads.'
 
 
 class SourceDeactivationNotification(Notification):

{leadguru_jobs-0.706.0 → leadguru_jobs-0.707.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -31,7 +31,7 @@ from lgt_jobs.lgt_data.models.user.verification import UserVerificationModel
 from lgt_jobs.lgt_data.models.user_leads.extended_user_lead import ExtendedUserLeadModel
 from lgt_jobs.lgt_data.models.user_leads.user_lead import UserLeadModel
 
-client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27018/'))
+client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
 
 def to_object_id(oid):
@@ -1418,17 +1418,10 @@ class MessageRequestsRepository(BaseMongoRepository):
         self.collection().update_one({'user_id': to_object_id(user_id), 'sender_id': sender_id},
                                      {'$set': message_request.to_dic()}, upsert=True)
 
-    def get_many(self, user_id: str, viewed: bool = False, **kwargs):
-        match_pipeline = {'user_id': to_object_id(user_id), 'viewed': viewed}
-        from_date = kwargs.get('from_date')
-
-        if from_date:
-            start = datetime(from_date.year, from_date.month, from_date.day, tzinfo=tz.tzutc())
-            match_pipeline['created_at']['$gte'] = start
-
+    def get_many(self, user_id: str, viewed: bool = False, sort_direction: int = pymongo.ASCENDING):
         pipeline = [
             {
-                '$match': match_pipeline
+                '$match': {'user_id': to_object_id(user_id), 'viewed': viewed}
             },
             {
                 '$lookup': {
@@ -1439,18 +1432,10 @@ class MessageRequestsRepository(BaseMongoRepository):
                 }
             },
             {
-                '$lookup': {
-                    'from': 'dedicated_bots',
-                    'localField': 'bot_id',
-                    'foreignField': '_id',
-                    'as': 'bot'
-                }
-            },
-            {
-                '$addFields': {'user': {'$first': '$user'}, 'bot': {'$first': '$bot'}}
+                '$addFields': {'user': {'$first': '$user'}}
             },
             {
-                '$sort': {'created_at': 1}
+                '$sort': {'created_at': sort_direction}
             }
         ]
         return self.collection().aggregate(pipeline)