leadguru-jobs 0.658.0__tar.gz → 0.659.0__tar.gz

{leadguru_jobs-0.658.0 → leadguru_jobs-0.659.0}/PKG-INFO

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

{leadguru_jobs-0.658.0 → leadguru_jobs-0.659.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.658.0 → leadguru_jobs-0.659.0}/lgt_jobs/lgt_data/enums.py

@@ -97,4 +97,3 @@ 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.658.0 → leadguru_jobs-0.659.0}/lgt_jobs/lgt_data/models/notifications/notification.py

@@ -37,7 +37,7 @@ class Notification(DictionaryModel):
             return False
 
         if ((self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.ONCE_A_WEEK)
-                and now.hour != self.hour and now.minute < self.minute):
+                and (now.hour != self.hour or now.minute < self.minute)):
             return False
 
         if ((self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.ONCE_A_WEEK)
@@ -126,9 +126,9 @@ class SourceDeactivationNotification(Notification):
         return 'Inactivation of Community on Leadguru'
 
     def get_notification_text(self, bots: list[DedicatedBotModel]):
-        names = [server.name.capitalize() for bot in bots for server in bot.servers]
+        names = [bot.source.source_name.capitalize() for bot in bots]
         if self.type == NotificationType.INSTANTLY:
-            return f'{names[-1]} became inactive on Leadguru.'
+            return f'{bots[-1].source.source_name.capitalize()} became inactive on Leadguru.'
         elif (self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.ONCE_A_WEEK) and bots:
             match len(bots):
                 case 1:
@@ -200,7 +200,8 @@ 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]
+        allowed_types = [NotificationType.ONCE_A_DAY, NotificationType.ONCE_A_DAY,
+                         NotificationType.UNREAD_FOR_FEW_MINUTES]
         if not self.enabled or self.type not in allowed_types:
             return False
 
@@ -219,7 +220,7 @@ class FollowUpNotification(Notification):
         return True
 
     def has_not_notified_leads(self, actual: list[UserLeadModel]) -> bool:
-        if self.type == NotificationType.FEW_MINUTES_BEFORE and self.last_notification:
+        if self.type == NotificationType.UNREAD_FOR_FEW_MINUTES 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))]
@@ -235,7 +236,7 @@ class FollowUpNotification(Notification):
 
     def get_button_url(self, actual: list[UserLeadModel]) -> str:
         if len(actual) > 1:
-            if self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.FEW_MINUTES_BEFORE:
+            if self.type == NotificationType.ONCE_A_DAY or self.type == NotificationType.UNREAD_FOR_FEW_MINUTES:
                 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}'
@@ -247,7 +248,7 @@ 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:
+        elif self.type == NotificationType.UNREAD_FOR_FEW_MINUTES:
             return f'{subject_text} for today in {self.minute} minutes'
 
         return subject_text
@@ -273,7 +274,7 @@ 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:
+        elif self.type == NotificationType.UNREAD_FOR_FEW_MINUTES:
             match len(actual):
                 case 1:
                     notification_text = (f'You have planned to send follow-up today in '

{leadguru_jobs-0.658.0 → leadguru_jobs-0.659.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -254,7 +254,7 @@ class UserLeadMongoRepository(BaseMongoRepository):
                                 },
                                 {
                                     'case': {'$eq': ['$user.notification_settings.follow_ups.type',
-                                                     'few_minutes_before']},
+                                                     'unread_for_few_minutes']},
                                     'then': {
                                         '$dateSubtract': {
                                             'startDate': now,