leadguru-jobs 0.658.0__py3-none-any.whl → 0.660.0__py3-none-any.whl

{leadguru_jobs-0.658.0.dist-info → leadguru_jobs-0.660.0.dist-info}/METADATA

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

{leadguru_jobs-0.658.0.dist-info → leadguru_jobs-0.660.0.dist-info}/RECORD

@@ -39,10 +39,10 @@ lgt_jobs/lgt_common/slack_client/web_client.py,sha256=WCu8mqYhauuxp9iDAMsjocchKD
 lgt_jobs/lgt_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/analytics.py,sha256=yfrFPXrBofzZqUNn479JkrbZXDa2ljgk-Le0YrQ9rew,21690
 lgt_jobs/lgt_data/engine.py,sha256=GY8FOl3dl7euKjQRML_H3ophaSTgfQ8ICMRv1NpE2oE,7745
-lgt_jobs/lgt_data/enums.py,sha256=si1DwMf4pOJYRYjz_c_SxmWxU5fBr8nN0kH4zFzNQ5Y,2338
+lgt_jobs/lgt_data/enums.py,sha256=27Gd_o5QVCrSUMIfL0DJ72xV77T9fK0kYrOaC78O0SU,2292
 lgt_jobs/lgt_data/helpers.py,sha256=S_1P7pnx14dllmen-TzjA9pkKWQr39x8-v6iv7FUYnQ,423
 lgt_jobs/lgt_data/model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/mongo_repository.py,sha256=K5IHnd_w1Dsuhcrb2jL9F6YwnJ1Kr_W5_mAtDch8r2Y,55682
+lgt_jobs/lgt_data/mongo_repository.py,sha256=ACUh3-pak2MHxwzBEa3kpDapJreJH2vwzZxxznAcwoU,55797
 lgt_jobs/lgt_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/models/base.py,sha256=YaiceCaaF45snOLx-bQoYJ1aTWrfgMQeHWjAaRnzGKE,592
 lgt_jobs/lgt_data/models/boards/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +75,7 @@ lgt_jobs/lgt_data/models/leads/extended_lead.py,sha256=ezFrKv-f5GBXr3QAM-V_qJQ-i
 lgt_jobs/lgt_data/models/leads/lead.py,sha256=mTZh8YV06nX9OWYvv_X7rDdIperB-RPChrEuheeYMU0,1300
 lgt_jobs/lgt_data/models/leads/message.py,sha256=7mXwYfSpmhY_zC8TfUdAZzxsPP-02bOqVjdkN4Vid5s,1533
 lgt_jobs/lgt_data/models/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/models/notifications/notification.py,sha256=t923jbffz7l5lnVhoS5P2T8CRlfN0Q7xpo-fXG1uVUY,12787
+lgt_jobs/lgt_data/models/notifications/notification.py,sha256=9g-Nz3a9MOo7q4cd6tHOeynRbSavsdn_CKCIDsfHZTU,12849
 lgt_jobs/lgt_data/models/notifications/notification_settings.py,sha256=VFddLvk2ROz4n50wYuZmqBDn7MssFwj-e9DbWweIVA4,2780
 lgt_jobs/lgt_data/models/people/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/models/people/people.py,sha256=pm60uMVmNIxOGCBAtZWhmXSJOe0SJ4C1y_HurUq00oY,3420
@@ -103,7 +103,7 @@ lgt_jobs/lgt_data/repositories/post/posts.py,sha256=ZA19L-CYdxLhlapyMQtSJzP3QMUl
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.658.0.dist-info/METADATA,sha256=a6aDoc-uEPzPdIp_pXgqXjgc3yAw-2IVNgP5dpHFFkw,1319
-leadguru_jobs-0.658.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-leadguru_jobs-0.658.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.658.0.dist-info/RECORD,,
+leadguru_jobs-0.660.0.dist-info/METADATA,sha256=E9aiya-du0zHCarlXP2C1bmorgbAkke2wP2OtLn50_s,1319
+leadguru_jobs-0.660.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+leadguru_jobs-0.660.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.660.0.dist-info/RECORD,,

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'

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 '

lgt_jobs/lgt_data/mongo_repository.py

@@ -82,7 +82,7 @@ class UserMongoRepository(BaseMongoRepository):
         update_dict = {k: v for k, v in kwargs.items() if v is not None}
         self.collection().update_one({'_id': to_object_id(_id)}, {'$set': update_dict})
 
-    def get_users(self, users_ids=None, include_inactive=False, **kwargs):
+    def get_users(self, users_ids=None, include_inactive=False, name=None, **kwargs):
         pipeline = {}
 
         subscription_expired = kwargs.get('subscription_expired')
@@ -129,6 +129,9 @@ class UserMongoRepository(BaseMongoRepository):
         if users_ids is not None:
             pipeline['_id'] = {'$in': [to_object_id(_id) for _id in users_ids]}
 
+        if name is not None:
+            pipeline['user_name'] = {"$regex": name, "$options": 'i'}
+
         if not include_inactive:
             pipeline['inactive'] = False
 
@@ -254,7 +257,7 @@ class UserLeadMongoRepository(BaseMongoRepository):
                                 },
                                 {
                                     'case': {'$eq': ['$user.notification_settings.follow_ups.type',
-                                                     'few_minutes_before']},
+                                                     'unread_for_few_minutes']},
                                     'then': {
                                         '$dateSubtract': {
                                             'startDate': now,