leadguru-jobs 0.623.0__tar.gz → 0.625.0__tar.gz

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/PKG-INFO

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

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/leadguru_jobs.egg-info/SOURCES.txt

@@ -31,7 +31,6 @@ lgt_jobs/jobs/mass_message.py
 lgt_jobs/jobs/send_code.py
 lgt_jobs/jobs/send_slack_message.py
 lgt_jobs/jobs/update_slack_profile.py
-lgt_jobs/jobs/user_balance_update.py
 lgt_jobs/jobs/workspace_connect.py
 lgt_jobs/lgt_common/__init__.py
 lgt_jobs/lgt_common/helpers.py

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/lgt_jobs/__init__.py

@@ -1,6 +1,5 @@
 name = "lgt_jobs"
 
-from .jobs.user_balance_update import UpdateUserBalanceJob, UpdateUserBalanceJobData
 from .jobs.send_slack_message import SendSlackMessageJob, SendSlackMessageJobData
 from .jobs.analytics import (TrackAnalyticsJob, TrackAnalyticsJobData)
 from .jobs.connect_sources import (ConnectSourceJobData, ConnectSourceJob)
@@ -22,7 +21,6 @@ jobs_map = {
     "LoadChatHistoryJob": LoadChatHistoryJob,
     "UpdateExternalUserProfileJob": UpdateExternalUserProfileJob,
     "SendSlackMessageJob": SendSlackMessageJob,
-    "UpdateUserBalanceJob": UpdateUserBalanceJob,
     "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
     "ConnectSourceJob": ConnectSourceJob,
     "LoadSlackPeopleJob": LoadSlackPeopleJob
@@ -37,7 +35,6 @@ __all__ = [
     UpdateExternalUserProfileJob,
     TrackAnalyticsJob,
     SendSlackMessageJob,
-    UpdateUserBalanceJob,
     SendMassMessageSlackChannelJob,
     ConnectSourceJob,
     LoadSlackPeopleJob,
@@ -54,7 +51,6 @@ __all__ = [
     UpdateExternalUserProfileJobData,
     TrackAnalyticsJobData,
     SendSlackMessageJobData,
-    UpdateUserBalanceJobData,
     SendMassMessageSlackChannelJobData,
     ConnectSourceJobData,
     LoadSlackPeopleJobData,

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/lgt_jobs/lgt_data/analytics.py

@@ -4,7 +4,7 @@ from collections import OrderedDict
 from datetime import timedelta, datetime
 from bson import ObjectId
 from dateutil import tz
-from lgt_jobs.lgt_data.helpers import to_object_id
+from lgt_jobs.lgt_data.mongo_repository import to_object_id
 from pymongo import MongoClient
 
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/lgt_jobs/lgt_data/helpers.py

@@ -1,6 +1,3 @@
-from bson import ObjectId
-
-from lgt_jobs.lgt_data.model import UserModel
 from lgt_jobs.lgt_data.mongo_repository import SubscriptionsRepository
 
 
@@ -8,13 +5,6 @@ def get_linkedin_search_contact(name: str):
     return f"https://www.linkedin.com/search/results/all/?keywords={name}&origin=GLOBAL_SEARCH_HEADER&sid=u%40F"
 
 
-def get_help_text(user: UserModel):
+def get_help_text(user):
     subscription = SubscriptionsRepository().find_one(id=user.subscription_id)
     return 'the onboarding call with us!' if subscription.trial else 'a call with us.'
-
-
-def to_object_id(oid):
-    if isinstance(oid, ObjectId):
-        return oid
-    return ObjectId(oid)
-

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/lgt_jobs/lgt_data/model.py

@@ -6,7 +6,6 @@ from datetime import datetime, UTC, timedelta
 from typing import Optional, List
 from lgt_jobs.lgt_data.enums import UserRole, SourceType, FeaturesEnum, FeatureOptions, NotificationType
 from bson import ObjectId
-from lgt_jobs.lgt_data.helpers import to_object_id
 
 
 class DictionaryModel(ABC):
@@ -709,13 +708,13 @@ class ChatMessage:
     def from_slack_response(cls, bot: DedicatedBotModel, message_data: dict, sender_id: str) -> ChatMessage:
         model = cls()
         model.sender_id = sender_id
-        model.bot_id = to_object_id(bot.id)
+        model.bot_id = bot.id
         model.text = message_data.get('text', '')
         model.user = message_data.get('user', '')
         model.id = message_data.get('ts', '')
         model.attachments = message_data.get('attachments', [])
         model.files = []
-        model.user_id = to_object_id(bot.user_id)
+        model.user_id = bot.user_id
         model.source_id = bot.source.source_id
         if 'files' in message_data:
             for file in message_data.get('files'):

{leadguru_jobs-0.623.0 → leadguru_jobs-0.625.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -6,7 +6,6 @@ from dateutil import tz
 from pymongo import MongoClient, UpdateOne
 from bson.objectid import ObjectId
 from lgt_jobs.lgt_data.enums import SourceType
-from lgt_jobs.lgt_data.helpers import to_object_id
 from lgt_jobs.lgt_data.model import (LeadModel, BaseModel, UserModel, UserResetPasswordModel, BoardModel, BoardedStatus,
                                      DedicatedBotModel, SlackMemberInformation, UserTemplateModel,
                                      ExtendedUserLeadModel, UserLeadModel, ExtendedLeadModel, UserContact, ChatMessage,
@@ -18,6 +17,12 @@ from collections import OrderedDict
 client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'))
 
 
+def to_object_id(oid):
+    if isinstance(oid, ObjectId):
+        return oid
+    return ObjectId(oid)
+
+
 class BaseMongoRepository:
     collection_name = ''
     database_name = 'lgt_admin'

leadguru_jobs-0.623.0/lgt_jobs/jobs/user_balance_update.py

@@ -1,71 +0,0 @@
-import datetime
-from abc import ABC
-from typing import Optional
-from lgt_jobs.lgt_data.engine import UserCreditStatementDocument
-from lgt_jobs.lgt_data.enums import UserAccountState, UserAction
-from lgt_jobs.lgt_data.model import UserModel
-from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository
-from lgt_jobs.lgt_data.helpers import to_object_id
-from pydantic import BaseModel
-from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
-
-"""
-User balance handling
-"""
-
-
-class UpdateUserBalanceJobData(BaseBackgroundJobData, BaseModel):
-    user_id: Optional[str]
-
-
-class UpdateUserBalanceJob(BaseBackgroundJob, ABC):
-    @property
-    def job_data_type(self) -> type:
-        return UpdateUserBalanceJobData
-
-    @staticmethod
-    def __update_processed(user: UserModel):
-        pipeline = [
-            {
-                "$match": {
-                    "user_id": to_object_id(user.id),
-                    "balance": {"$lte": 0},
-                    "action": {"$nin": [UserAction.ADMIN_CREDITS_ADDED, UserAction.ADMIN_CREDITS_SET]}
-                }
-            },
-            {
-                '$group': {
-                    '_id': "$user_id",
-                    'count': {'$sum': {"$multiply": [-1, "$balance"]}}
-                }
-            }
-        ]
-
-        results = list(UserCreditStatementDocument.objects.aggregate(*pipeline))
-        if not results:
-            return
-
-        count = results[0]["count"]
-        if count >= user.leads_limit:
-            # suspend account
-            if user.state != UserAccountState.Suspended.value:
-                UserMongoRepository().set(user.id, leads_proceeded=count,
-                                          credits_exceeded_at=datetime.datetime.now(datetime.UTC),
-                                          state=UserAccountState.Suspended.value)
-                return
-
-        if user.state == UserAccountState.Suspended.value:
-            # unsuspend account
-            UserMongoRepository().set(user.id, leads_proceeded=count,
-                                      credits_exceeded_at=None,
-                                      state=UserAccountState.Operational.value)
-            return
-
-        UserMongoRepository().set(user.id, leads_proceeded=count)
-
-    def exec(self, data: UpdateUserBalanceJobData):
-        user = UserMongoRepository().get(data.user_id)
-        if not user:
-            return
-
-        self.__update_processed(user=user)