leadguru-jobs 0.624.0__tar.gz → 0.626.0__tar.gz

{leadguru_jobs-0.624.0 → leadguru_jobs-0.626.0}/PKG-INFO

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

{leadguru_jobs-0.624.0 → leadguru_jobs-0.626.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.624.0 → leadguru_jobs-0.626.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.624.0 → leadguru_jobs-0.626.0}/lgt_jobs/lgt_data/engine.py

@@ -5,7 +5,7 @@ from datetime import datetime, UTC
 from bson import ObjectId
 from mongoengine import connect, Document, DateTimeField, StringField, IntField, ObjectIdField, ListField
 from typing import Dict, Tuple, Optional
-from lgt_jobs.lgt_data.helpers import to_object_id
+from lgt_jobs.lgt_data.mongo_repository import to_object_id
 
 connect(host=os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27017/'), db="lgt_admin", alias="lgt_admin")
 

{leadguru_jobs-0.624.0 → leadguru_jobs-0.626.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.624.0 → leadguru_jobs-0.626.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.624.0 → leadguru_jobs-0.626.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'