leadguru-jobs 0.646.0__tar.gz → 0.648.0__tar.gz

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/PKG-INFO

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

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/lgt_jobs/jobs/workspace_connect.py

@@ -1,3 +1,5 @@
+import random
+import time
 from abc import ABC
 from typing import Dict
 import requests
@@ -45,35 +47,41 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
         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])
+            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])
+            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 = client.find_workspaces(data.user_agent)
-        if workspaces_response.status_code != 200:
-            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'Unable to get workspaces due to error: {workspaces_response.content}')
-            return
-        if not workspaces_response.json().get('ok', False):
-            slack_user.status = StatusConnection.FAILED
-            log.warning(f'Unable to get workspaces due to error: {workspaces_response.content}')
+        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])
+
+        if attempt > 5:
             return
 
-        UserMongoRepository().set(current_user.id,
-                                  slack_users=[user.to_dic() for user in current_user.slack_users])
-
         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', [])
@@ -97,14 +105,14 @@ class ConnectSlackAccountJob(BaseBackgroundJob, ABC):
             workspace.magic_login_url = login_url
             workspace.token = token
             workspace.domain = workspace.domain
+            time.sleep(random.uniform(0.5, 2))
 
         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)
+        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,

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/lgt_jobs/lgt_data/enums.py

@@ -97,3 +97,4 @@ class NotificationType(str, Enum):
     ONCE_A_WEEK = 'once_a_week'
     WEEK_BEFORE = 'week_before'
     UNREAD_FOR_FEW_MINUTES = 'unread_for_few_minutes'
+    FEW_MINUTES_BEFORE = 'few_minutes_before'

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/lgt_jobs/lgt_data/models/notifications/notification.py

@@ -198,6 +198,35 @@ class BulkReactionsNotification(Notification):
 
 class FollowUpNotification(Notification):
 
+    @property
+    def need_to_notify_now(self) -> bool:
+        allowed_types = [NotificationType.ONCE_A_DAY, NotificationType.ONCE_A_DAY, NotificationType.FEW_MINUTES_BEFORE]
+        if not self.enabled or self.type not in allowed_types:
+            return False
+
+        now = datetime.now(UTC)
+        if self.last_notification:
+            self.last_notification = self.last_notification.replace(tzinfo=UTC)
+
+        if (self.type == NotificationType.ONCE_A_DAY and self.last_notification
+                and (self.last_notification.day == now.day or self.hour != now.hour)):
+            return False
+
+        if (self.type == NotificationType.ONCE_A_WEEK and self.last_notification
+                and (self.last_notification.day == now.day or (now.hour != self.hour or now.day != self.day))):
+            return False
+
+        return True
+
+    def has_not_notified_leads(self, actual: list[UserLeadModel]) -> bool:
+        if self.type == NotificationType.FEW_MINUTES_BEFORE and self.last_notification:
+            self.last_notification = self.last_notification.replace(tzinfo=UTC)
+            not_notified_leads = [lead for lead in actual if lead.followup_date.replace(tzinfo=UTC) >
+                                  (self.last_notification + timedelta(minutes=self.minute))]
+            return bool(not_notified_leads)
+
+        return True
+
     @staticmethod
     def get_button_name(actual: list[UserLeadModel]) -> str:
         if len(actual) > 1:
@@ -206,7 +235,7 @@ class FollowUpNotification(Notification):
 
     def get_button_url(self, actual: list[UserLeadModel]) -> str:
         if len(actual) > 1:
-            if self.type == NotificationType.ONCE_A_DAY:
+            if self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.FEW_MINUTES_BEFORE:
                 return f'{portal_url}/dashboard/calendar?view=day'
             return f'{portal_url}/dashboard/calendar?view=week'
         return f'{portal_url}/feed?senderId={actual[0].message.sender_id}&sourceId={actual[0].message.source.source_id}'
@@ -218,6 +247,10 @@ class FollowUpNotification(Notification):
             return f'{subject_text} for today'
         elif self.type == NotificationType.ONCE_A_WEEK:
             return f'{subject_text} for this week'
+        elif self.type == NotificationType.FEW_MINUTES_BEFORE:
+            return f'{subject_text} for today in {self.minute} minutes'
+
+        return subject_text
 
     def get_notification_text(self, actual: list[ExtendedUserLeadModel], overdue: list[ExtendedUserLeadModel]) -> str:
         notification_text = ''
@@ -240,6 +273,18 @@ class FollowUpNotification(Notification):
                 case _:
                     notification_text = (f'You have planned to send follow-up to {", ".join(names[:3])} '
                                          f'and {len(names) - 3} other leads this week.')
+        elif self.type == NotificationType.FEW_MINUTES_BEFORE:
+            match len(actual):
+                case 1:
+                    notification_text = (f'You have planned to send follow-up today in '
+                                         f'{self.minute} minutes to {names[0]}.')
+                case 2 | 3:
+                    notification_text = (f'You have planned to send follow-up today in '
+                                         f'{self.minute} minutes to {", ".join(names)}.')
+                case _:
+                    notification_text = (f'You have planned to send follow-up today in '
+                                         f'{self.minute} minutes to {", ".join(names[:3])} '
+                                         f'and {len(names) - 3} other leads.')
 
         return f'{notification_text} Plus you have {len(overdue)} overdue follow-ups.' if overdue else notification_text
 

{leadguru_jobs-0.646.0 → leadguru_jobs-0.648.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -242,10 +242,29 @@ class UserLeadMongoRepository(BaseMongoRepository):
                     'notification_settings': '$user.notification_settings',
                     'subscription_id': "$user.subscription_id",
                     'followup_to': {
-                        '$cond': {
-                            'if': {'$eq': ['$user.notification_settings.follow_ups.type', 'once_a_day']},
-                            'then': this_day,
-                            'else': after_week
+                        '$switch': {
+                            'branches': [
+                                {
+                                    'case': {'$eq': ['$user.notification_settings.follow_ups.type', 'once_a_day']},
+                                    'then': this_day
+                                },
+                                {
+                                    'case': {'$eq': ['$user.notification_settings.follow_ups.type', 'once_a_week']},
+                                    'then': after_week
+                                },
+                                {
+                                    'case': {'$eq': ['$user.notification_settings.follow_ups.type',
+                                                     'few_minutes_before']},
+                                    'then': {
+                                        '$dateSubtract': {
+                                            'startDate': now,
+                                            'unit': 'minute',
+                                            'amount': '$user.notification_settings.follow_ups.minute'
+                                        }
+                                    }
+                                }
+                            ],
+                            'default': this_day
                         }
                     },
                     'followup_date': 1,
@@ -811,12 +830,12 @@ class BoardsMongoRepository(BaseMongoRepository):
         if not board:
             return None
 
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Lead', 'order': 0}))
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Prospect', 'order': 1}))
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Opportunity', 'order': 2}))
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Call', 'order': 3}))
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Contract', 'order': 4}))
-        board.statuses.append(BoardedStatus().from_dic({'name': 'Refused', 'order': 5}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Lead', 'name': 'Lead', 'order': 0}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Prospect', 'name': 'Prospect', 'order': 1}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Opportunity', 'name': 'Opportunity', 'order': 2}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Call', 'name': 'Call', 'order': 3}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Contract', 'name': 'Contract', 'order': 4}))
+        board.statuses.append(BoardedStatus().from_dic({'id': 'Refused', 'name': 'Refused', 'order': 5}))
 
         return self.update_board(user_id, board_id, statuses=board.statuses)