leadguru-jobs 0.687.0__tar.gz → 0.688.0__tar.gz

{leadguru_jobs-0.687.0 → leadguru_jobs-0.688.0}/PKG-INFO

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

{leadguru_jobs-0.687.0 → leadguru_jobs-0.688.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.687.0 → leadguru_jobs-0.688.0}/lgt_jobs/jobs/load_slack_people.py

@@ -5,7 +5,6 @@ from time import sleep
 
 from lgt_jobs.lgt_common.enums.slack_errors import SlackErrors
 from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
-from lgt_jobs.lgt_data.models.bots.base_bot import Source
 from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
 from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, SlackContactUserRepository, \
     UserContactsRepository

{leadguru_jobs-0.687.0 → leadguru_jobs-0.688.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:27019/'))
+client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
 
 def to_object_id(oid):
@@ -222,6 +222,7 @@ class UserLeadMongoRepository(BaseMongoRepository):
         now = datetime.now(UTC)
         this_day = datetime(now.year, now.month, now.day, 21, 00, 00, tzinfo=UTC)
         after_week = this_day + timedelta(7)
+        previous_day = this_day - timedelta(1)
         pipeline = [
             {'$match': {'archived': False, 'followup_date': {'$ne': None}}},
             {
@@ -288,20 +289,32 @@ class UserLeadMongoRepository(BaseMongoRepository):
                             'as': 'lead',
                             'cond': {
                                 '$and': [
-                                    {'$gte': ['$$lead.followup_date', now]},
-                                    {'$lte': ['$$lead.followup_date', '$$lead.followup_to']}
-                                ]
-                            }
-                        }
+                                    {
+                                        '$gte': [
+                                            '$$lead.followup_date',
+                                            {'$cond': [
+                                                {
+                                                    '$eq': ['$$lead.notification_settings.follow_ups.type',
+                                                            'unread_for_few_minutes']
+                                                 },
+                                                now,
+                                                previous_day]}]},
+                                    {
+                                        '$lte': ['$$lead.followup_date', '$$lead.followup_to']}]}}
                     },
                     'overdue_follow_ups': {
                         '$filter': {
                             'input': '$leads',
                             'as': 'lead',
-                            'cond': {'$lt': ['$$lead.followup_date', now]}
-                        }
-                    }
-                }
+                            'cond': {
+                                '$lt': [
+                                    '$$lead.followup_date',
+                                    {'$cond': [
+                                        {
+                                            '$eq': ['$notification_settings.follow_ups.type', 'unread_for_few_minutes']
+                                        },
+                                        now,
+                                        previous_day]}]}}}}
             },
             {
                 '$addFields': {