leadguru-jobs 0.408.0__tar.gz → 0.409.0__tar.gz

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/PKG-INFO

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

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/lgt_jobs/jobs/bot_stats_update.py

@@ -56,7 +56,8 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                     discord_server.deleted = server.deleted
                 else:
                     discord_server.deleted = True
-                discord_channels = [Channel.from_dic(channel) for channel in client.get_channels(discord_server.id)]
+                discord_channels = [Channel.from_dic(channel) for channel in client.get_channels(discord_server.id)
+                                    if channel.get('type', 0) == 0]
                 for discord_channel in discord_channels:
                     if server:
                         channel = next(filter(lambda x: x.id == discord_channel.id, server.channels), None)

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/lgt_jobs/jobs/chat_history.py

@@ -93,7 +93,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
 
             messages = [SlackMessageConvertService.from_slack_response(user.email, "slack_files",
                                                                        bot.token, m, contact.sender_id, bot.id,
-                                                                       user.id, bot.cookies) for m in messages]
+                                                                       bot.cookies) for m in messages]
             new_messages = LoadChatHistoryJob._get_new_messages(contact, bot, messages)
             chat_history = [message.to_dic() for message in new_messages]
             ChatRepository().upsert_messages(chat_history)

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/lgt_jobs/lgt_common/slack_client/web_client.py

@@ -3,7 +3,6 @@ from google.cloud import storage
 from datetime import datetime, timedelta
 from lgt_jobs.lgt_data.model import ChatMessage
 from .slack_client import SlackClient
-from ...lgt_data.mongo_repository import to_object_id
 
 
 def get_file_url(blob_path):
@@ -18,7 +17,7 @@ def get_file_url(blob_path):
 
 class SlackMessageConvertService:
     @staticmethod
-    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, user_id, cookies=None):
+    def from_slack_response(user_email, bot_name, bot_token, dic, sender_id, bot_id, cookies=None):
 
         """
         :rtype: SlackHistoryMessageModel
@@ -31,7 +30,6 @@ class SlackMessageConvertService:
         result.ts = dic.get('ts', '')
         result.attachments = dic.get('attachments', [])
         result.files = []
-        result.user_id = to_object_id(user_id)
 
         if 'files' in dic:
             for file in dic.get('files'):

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/lgt_jobs/lgt_data/model.py

@@ -571,7 +571,6 @@ class SlackReplyModel(BaseModel):
 
 class ChatMessage:
     bot_id: ObjectId
-    user_id: ObjectId
     sender_id: str
     text: str
     user: str

{leadguru_jobs-0.408.0 → leadguru_jobs-0.409.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -806,6 +806,7 @@ class DedicatedBotRepository(BaseMongoRepository):
         user_id = kwargs.get('user_id')
         source_id = kwargs.get('source_id')
         server_id = kwargs.get('server_id')
+        active_server_id = kwargs.get('active_server_id')
 
         if bot_id:
             pipeline["_id"] = to_object_id(bot_id)
@@ -828,6 +829,9 @@ class DedicatedBotRepository(BaseMongoRepository):
         if server_id:
             pipeline["servers"] = {'$elemMatch': {'id': server_id, 'active': True}}
 
+        if active_server_id:
+            pipeline["servers"] = {'$elemMatch': {'id': active_server_id, 'deleted': False}}
+
         if only_valid:
             pipeline['invalid_creds'] = False