leadguru-jobs 0.687.0__py3-none-any.whl → 0.688.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. {leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/METADATA +1 -1
  2. {leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/RECORD +6 -6
  3. lgt_jobs/jobs/load_slack_people.py +0 -1
  4. lgt_jobs/lgt_data/mongo_repository.py +23 -10
  5. {leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/WHEEL +0 -0
  6. {leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/top_level.txt +0 -0
{leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: leadguru_jobs
3
- Version: 0.687.0
3
+ Version: 0.688.0
4
4
  Summary: LGT jobs builds
5
5
  Author-email: developer@leadguru.co
6
6
  Classifier: Development Status :: 5 - Production/Stable
{leadguru_jobs-0.687.0.dist-info → leadguru_jobs-0.688.0.dist-info}/RECORD RENAMED
@@ -17,7 +17,7 @@ lgt_jobs/jobs/bot_stats_update.py,sha256=3gq1Ilj_RHddYeSny_238ITs7YIfCf7d4BmfYU8
17
17
  lgt_jobs/jobs/chat_history.py,sha256=rj337uHT2XmyDu3oMPbnCBxSsRn4roxDNS0hsbvoI7I,5040
18
18
  lgt_jobs/jobs/connect_sources.py,sha256=vOKu2Q9cmQsj4VMVzOoEJkD1wzE9XurbIChx35rES8I,4957
19
19
  lgt_jobs/jobs/inbox_leads.py,sha256=6UhPp9AfSAGb3elFDT6jm7j2HZ9jPOPngsUj-hUKAYw,4867
20
- lgt_jobs/jobs/load_slack_people.py,sha256=iMCQbFghbA7lS3yrW6hDZbUDesaRcWdkKV40nPdIVR0,4241
20
+ lgt_jobs/jobs/load_slack_people.py,sha256=SaDpp3JCNVKcyZ2WSJ9TyP5lUUZJnGlPUyWdRNzfMkU,4183
21
21
  lgt_jobs/jobs/load_slack_users.py,sha256=d_Hy-MM86OqWdsaLX06n-ovNL6whY1xQz6sv_Ls3C4I,1404
22
22
  lgt_jobs/jobs/mass_message.py,sha256=1mFcBlL2MhzLbj5yrd_NyJc7TXDWCcROAzGDnr0miMU,2035
23
23
  lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,824
@@ -44,7 +44,7 @@ lgt_jobs/lgt_data/engine.py,sha256=GY8FOl3dl7euKjQRML_H3ophaSTgfQ8ICMRv1NpE2oE,7
44
44
  lgt_jobs/lgt_data/enums.py,sha256=SN2eLoB2m-bVswgLVuY46v0DhPj8IurgHY6R-KRsd6s,2621
45
45
  lgt_jobs/lgt_data/helpers.py,sha256=S_1P7pnx14dllmen-TzjA9pkKWQr39x8-v6iv7FUYnQ,423
46
46
  lgt_jobs/lgt_data/model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
47
- lgt_jobs/lgt_data/mongo_repository.py,sha256=1NPqXThp3gS0O4QNZlSVrdjGfzH38YMLwUOZ1A9NZxk,56525
47
+ lgt_jobs/lgt_data/mongo_repository.py,sha256=J2NGS99ugYVCIZHkKPHWVfKzPiisXDV7_2kDmnEvzWs,57432
48
48
  lgt_jobs/lgt_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
49
49
  lgt_jobs/lgt_data/models/base.py,sha256=YaiceCaaF45snOLx-bQoYJ1aTWrfgMQeHWjAaRnzGKE,592
50
50
  lgt_jobs/lgt_data/models/boards/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,7 +106,7 @@ lgt_jobs/lgt_data/repositories/post/posts.py,sha256=ZA19L-CYdxLhlapyMQtSJzP3QMUl
106
106
  lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
107
107
  lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
108
108
  lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
109
- leadguru_jobs-0.687.0.dist-info/METADATA,sha256=1ptaBC1JjBxFnosMgkqnIPDU0AFEyvDMeDcaGsBxPOE,1319
110
- leadguru_jobs-0.687.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
111
- leadguru_jobs-0.687.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
112
- leadguru_jobs-0.687.0.dist-info/RECORD,,
109
+ leadguru_jobs-0.688.0.dist-info/METADATA,sha256=vQ29gK6qb6TMvdR-ZKC7XgePobKM6sNKWrw9pnnwRl0,1319
110
+ leadguru_jobs-0.688.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
111
+ leadguru_jobs-0.688.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
112
+ leadguru_jobs-0.688.0.dist-info/RECORD,,
lgt_jobs/jobs/load_slack_people.py CHANGED
@@ -5,7 +5,6 @@ from time import sleep
5
5
 
6
6
  from lgt_jobs.lgt_common.enums.slack_errors import SlackErrors
7
7
  from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
8
- from lgt_jobs.lgt_data.models.bots.base_bot import Source
9
8
  from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
10
9
  from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, SlackContactUserRepository, \
11
10
  UserContactsRepository
lgt_jobs/lgt_data/mongo_repository.py CHANGED
@@ -31,7 +31,7 @@ from lgt_jobs.lgt_data.models.user.verification import UserVerificationModel
31
31
  from lgt_jobs.lgt_data.models.user_leads.extended_user_lead import ExtendedUserLeadModel
32
32
  from lgt_jobs.lgt_data.models.user_leads.user_lead import UserLeadModel
33
33
 
34
- client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27019/'))
34
+ client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
35
35
 
36
36
 
37
37
  def to_object_id(oid):
@@ -222,6 +222,7 @@ class UserLeadMongoRepository(BaseMongoRepository):
222
222
  now = datetime.now(UTC)
223
223
  this_day = datetime(now.year, now.month, now.day, 21, 00, 00, tzinfo=UTC)
224
224
  after_week = this_day + timedelta(7)
225
+ previous_day = this_day - timedelta(1)
225
226
  pipeline = [
226
227
  {'$match': {'archived': False, 'followup_date': {'$ne': None}}},
227
228
  {
@@ -288,20 +289,32 @@ class UserLeadMongoRepository(BaseMongoRepository):
288
289
  'as': 'lead',
289
290
  'cond': {
290
291
  '$and': [
291
- {'$gte': ['$$lead.followup_date', now]},
292
- {'$lte': ['$$lead.followup_date', '$$lead.followup_to']}
293
- ]
294
- }
295
- }
292
+ {
293
+ '$gte': [
294
+ '$$lead.followup_date',
295
+ {'$cond': [
296
+ {
297
+ '$eq': ['$$lead.notification_settings.follow_ups.type',
298
+ 'unread_for_few_minutes']
299
+ },
300
+ now,
301
+ previous_day]}]},
302
+ {
303
+ '$lte': ['$$lead.followup_date', '$$lead.followup_to']}]}}
296
304
  },
297
305
  'overdue_follow_ups': {
298
306
  '$filter': {
299
307
  'input': '$leads',
300
308
  'as': 'lead',
301
- 'cond': {'$lt': ['$$lead.followup_date', now]}
302
- }
303
- }
304
- }
309
+ 'cond': {
310
+ '$lt': [
311
+ '$$lead.followup_date',
312
+ {'$cond': [
313
+ {
314
+ '$eq': ['$notification_settings.follow_ups.type', 'unread_for_few_minutes']
315
+ },
316
+ now,
317
+ previous_day]}]}}}}
305
318
  },
306
319
  {
307
320
  '$addFields': {