leadguru-jobs 0.683.0__py3-none-any.whl → 0.684.0__py3-none-any.whl

{leadguru_jobs-0.683.0.dist-info → leadguru_jobs-0.684.0.dist-info}/METADATA

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

{leadguru_jobs-0.683.0.dist-info → leadguru_jobs-0.684.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-lgt_jobs/__init__.py,sha256=efDX0VsSwC2we92quUu8E62MqC-4audo0Rv37Y6USnk,2144
+lgt_jobs/__init__.py,sha256=VepHCuCW4uUqx6Nj5gKdZeJ9IYDSyhlD70FvpnKNmPk,2316
 lgt_jobs/basejobs.py,sha256=LPEclvY6fIG17YMGy9pRK0Q58n62gkI5W1BTK6R2p-c,1234
 lgt_jobs/env.py,sha256=cRO03GGvstUjBsv3uYO-iakrOvAk_ZWUP_fnmf21iZQ,789
 lgt_jobs/main.py,sha256=cK_nkBtJHnUNDbba1WZotqPtI_6OWxiYQkAgco9OAmE,1539
@@ -17,7 +17,8 @@ lgt_jobs/jobs/bot_stats_update.py,sha256=3gq1Ilj_RHddYeSny_238ITs7YIfCf7d4BmfYU8
 lgt_jobs/jobs/chat_history.py,sha256=rj337uHT2XmyDu3oMPbnCBxSsRn4roxDNS0hsbvoI7I,5040
 lgt_jobs/jobs/connect_sources.py,sha256=vOKu2Q9cmQsj4VMVzOoEJkD1wzE9XurbIChx35rES8I,4957
 lgt_jobs/jobs/inbox_leads.py,sha256=6UhPp9AfSAGb3elFDT6jm7j2HZ9jPOPngsUj-hUKAYw,4867
-lgt_jobs/jobs/load_slack_people.py,sha256=4bcVLzaIqKfmZ0kpjkce1XwegFvz3z1KY7X432mScy0,4555
+lgt_jobs/jobs/load_slack_people.py,sha256=iMCQbFghbA7lS3yrW6hDZbUDesaRcWdkKV40nPdIVR0,4241
+lgt_jobs/jobs/load_slack_users.py,sha256=d_Hy-MM86OqWdsaLX06n-ovNL6whY1xQz6sv_Ls3C4I,1404
 lgt_jobs/jobs/mass_message.py,sha256=1mFcBlL2MhzLbj5yrd_NyJc7TXDWCcROAzGDnr0miMU,2035
 lgt_jobs/jobs/send_code.py,sha256=dIlLPkG3GgGKIEqGiElyzrtdrnJNTL1Ak2V0xnE-WIQ,824
 lgt_jobs/jobs/send_slack_message.py,sha256=eiSN-yZ7XJ2WLUTQOkViSYOCYwaEwLry0ldGAcONNsM,1708
@@ -43,7 +44,7 @@ lgt_jobs/lgt_data/engine.py,sha256=GY8FOl3dl7euKjQRML_H3ophaSTgfQ8ICMRv1NpE2oE,7
 lgt_jobs/lgt_data/enums.py,sha256=SN2eLoB2m-bVswgLVuY46v0DhPj8IurgHY6R-KRsd6s,2621
 lgt_jobs/lgt_data/helpers.py,sha256=S_1P7pnx14dllmen-TzjA9pkKWQr39x8-v6iv7FUYnQ,423
 lgt_jobs/lgt_data/model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lgt_jobs/lgt_data/mongo_repository.py,sha256=nlGeaBIHHFh9hscoNFx-78GpxB0kDQoefD2biNp5DnY,56525
+lgt_jobs/lgt_data/mongo_repository.py,sha256=1NPqXThp3gS0O4QNZlSVrdjGfzH38YMLwUOZ1A9NZxk,56525
 lgt_jobs/lgt_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/lgt_data/models/base.py,sha256=YaiceCaaF45snOLx-bQoYJ1aTWrfgMQeHWjAaRnzGKE,592
 lgt_jobs/lgt_data/models/boards/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,7 +106,7 @@ lgt_jobs/lgt_data/repositories/post/posts.py,sha256=ZA19L-CYdxLhlapyMQtSJzP3QMUl
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=oMyWJxwGeIe3f40fPT7xcisjDg3BhA3Ipf8dr1jVT-Y,1549
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.683.0.dist-info/METADATA,sha256=Qrgk_hFu-lC8k_nDKZkwLhQE2Bjix2T3qEkvPEFFXMw,1319
-leadguru_jobs-0.683.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-leadguru_jobs-0.683.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.683.0.dist-info/RECORD,,
+leadguru_jobs-0.684.0.dist-info/METADATA,sha256=UB-zOMeTP8-GpPZGtC0Vfdcf6O-CV_RDS8Dt1NvVArk,1319
+leadguru_jobs-0.684.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+leadguru_jobs-0.684.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.684.0.dist-info/RECORD,,

lgt_jobs/__init__.py

@@ -1,3 +1,5 @@
+
+
 name = "lgt_jobs"
 
 from .jobs.send_slack_message import SendSlackMessageJob, SendSlackMessageJobData
@@ -12,6 +14,7 @@ from .smtp import (SendMailJob, SendMailJobData)
 from .runner import (BackgroundJobRunner)
 from .simple_job import (SimpleTestJob, SimpleTestJobData)
 from .jobs.load_slack_people import (LoadSlackPeopleJob, LoadSlackPeopleJobData)
+from .jobs.load_slack_users import LoadSlackUsersJob, LoadSlackUsersJobData
 
 jobs_map = {
     "SimpleTestJob": SimpleTestJob,
@@ -23,7 +26,8 @@ jobs_map = {
     "SendSlackMessageJob": SendSlackMessageJob,
     "SendMassMessageSlackChannelJob": SendMassMessageSlackChannelJob,
     "ConnectSourceJob": ConnectSourceJob,
-    "LoadSlackPeopleJob": LoadSlackPeopleJob
+    "LoadSlackPeopleJob": LoadSlackPeopleJob,
+    "LoadSlackUsersJob": LoadSlackUsersJob
 }
 __all__ = [
     # Jobs
@@ -38,6 +42,7 @@ __all__ = [
     SendMassMessageSlackChannelJob,
     ConnectSourceJob,
     LoadSlackPeopleJob,
+    LoadSlackUsersJob,
 
     # module classes
     BackgroundJobRunner,
@@ -54,6 +59,7 @@ __all__ = [
     SendMassMessageSlackChannelJobData,
     ConnectSourceJobData,
     LoadSlackPeopleJobData,
+    LoadSlackUsersJobData,
     # mapping
     jobs_map
 ]

lgt_jobs/jobs/load_slack_people.py

@@ -60,11 +60,7 @@ class LoadSlackPeopleJob(BaseBackgroundJob, ABC):
                 if member.get("deleted", True) or member.get("id") == 'USLACKBOT':
                     continue
 
-                source = Source()
-                source.source_id = bot.source.source_id
-                source.source_name = bot.source.source_name
-                source.source_type = bot.source.source_type
-                member_info: SlackMemberInformation = SlackMemberInformation.from_slack_response(member, source)
+                member_info: SlackMemberInformation = SlackMemberInformation.from_slack_response(member, bot.source)
                 members_count += 1
                 presence_response = client.get_presence(member_info.sender_id)
                 last_activity = None
@@ -88,8 +84,7 @@ class LoadSlackPeopleJob(BaseBackgroundJob, ABC):
                 if last_activity:
                     member_info_dic['last_activity'] = last_activity
                     UserContactsRepository().update_many(member_info.sender_id, last_activity=last_activity)
-                SlackContactUserRepository().collection().update_one({"sender_id": member_info.sender_id,
-                                                                      "source.source_id": source.source_id},
+                SlackContactUserRepository().collection().update_one({"sender_id": member_info.sender_id},
                                                                      {"$set": member_info_dic}, upsert=True)
 
             next_cursor = list_users_response["response_metadata"].get("next_cursor", "")

lgt_jobs/jobs/load_slack_users.py

@@ -0,0 +1,33 @@
+from abc import ABC
+from lgt_jobs.lgt_common.slack_client.slack_client import SlackClient
+from lgt_jobs.lgt_data.models.people.people import SlackMemberInformation
+from lgt_jobs.lgt_data.mongo_repository import DedicatedBotRepository, SlackContactUserRepository
+from pydantic import BaseModel
+from lgt_jobs.basejobs import BaseBackgroundJobData, BaseBackgroundJob
+
+"""
+Load required Slack users by required bot
+"""
+
+
+class LoadSlackUsersJobData(BaseBackgroundJobData, BaseModel):
+    bot_id: str
+    users: list[str]
+
+
+class LoadSlackUsersJob(BaseBackgroundJob, ABC):
+    @property
+    def job_data_type(self) -> type:
+        return LoadSlackUsersJobData
+
+    def exec(self, data: LoadSlackUsersJobData):
+        dedicated_bots_repo = DedicatedBotRepository()
+        bot = dedicated_bots_repo.get_one(id=data.bot_id, include_deleted=True, include_paused=True)
+        for user in data.users:
+            client = SlackClient(bot.token, bot.cookies)
+            profile = client.get_profile(user)
+            if profile['ok']:
+                profile['id'] = user
+                member_info: SlackMemberInformation = SlackMemberInformation.from_slack_response(profile, bot.source)
+                SlackContactUserRepository().collection().update_one({"sender_id": member_info.sender_id},
+                                                                     {"$set": member_info.to_dic()}, upsert=True)

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:27017/'))
+client = MongoClient(os.environ.get('MONGO_CONNECTION_STRING', 'mongodb://127.0.0.1:27019/'))
 
 
 def to_object_id(oid):