leadguru-jobs 0.574.0__tar.gz → 0.575.0__tar.gz

{leadguru_jobs-0.574.0 → leadguru_jobs-0.575.0}/PKG-INFO

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

{leadguru_jobs-0.574.0 → leadguru_jobs-0.575.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.574.0 → leadguru_jobs-0.575.0}/lgt_jobs/lgt_data/model.py

@@ -327,13 +327,13 @@ class UserModel(BaseModel):
         return self.subscription_expired_at.replace(tzinfo=UTC) < datetime.now(UTC)
 
     def get_slack_user(self, slack_email: str):
-        return next(filter(lambda x: slack_email == x.email, self.slack_users), None)
+        return next(filter(lambda x: slack_email == x.email and not x.deleted, self.slack_users), None)
 
     def get_discord_user(self, login: str):
-        return next(filter(lambda x: login == x.login, self.discord_users), None)
+        return next(filter(lambda x: login == x.login and not x.deleted, self.discord_users), None)
 
 
-class DiscordUser(BaseModel):
+class DiscordUser(DictionaryModel):
     pass
 
     def __init__(self):
@@ -343,6 +343,7 @@ class DiscordUser(BaseModel):
         self.captcha_key = ''
         self.status = None
         self.workspaces: List[UserWorkspace] = []
+        self.deleted = False
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)
@@ -374,6 +375,7 @@ class SlackUser:
         self.email = ''
         self.status = None
         self.workspaces: List[UserWorkspace] = []
+        self.deleted = False
 
     def to_dic(self):
         result = copy.deepcopy(self.__dict__)

{leadguru_jobs-0.574.0 → leadguru_jobs-0.575.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -69,6 +69,7 @@ class UserMongoRepository(BaseMongoRepository):
         pipeline = {}
 
         subscription_expired = kwargs.get('subscription_expired')
+        connected_slack_email = kwargs.get('connected_slack_email')
         soon_subscription_expiration = kwargs.get('soon_subscription_expiration')
         min_days = kwargs.get('min_days_soon_subscription_expiration', 3)
 
@@ -80,6 +81,9 @@ class UserMongoRepository(BaseMongoRepository):
             pipeline['subscription_expired_at'] = {'$lte': datetime.now(UTC) + timedelta(min_days)}
             pipeline['subscription_expiration_warning_notified'] = False
 
+        if connected_slack_email:
+            pipeline['slack_users.email'] = connected_slack_email
+
         if users_ids is not None:
             pipeline['_id'] = {'$in': [to_object_id(_id) for _id in users_ids]}