leadguru-jobs 0.582.0__py3-none-any.whl → 0.583.0__py3-none-any.whl

{leadguru_jobs-0.582.0.dist-info → leadguru_jobs-0.583.0.dist-info}/METADATA

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

{leadguru_jobs-0.582.0.dist-info → leadguru_jobs-0.583.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ lgt_jobs/assets/images/logo.png,sha256=nt377FGkBalBF9Z9TYQRv9loHolTXwU8_VRYvCXXz
 lgt_jobs/assets/images/mail.png,sha256=eORzQcAMkFr7DjgtABVhJ_zFuXgO7OXv78lLF4b39B0,7168
 lgt_jobs/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/jobs/analytics.py,sha256=IIsWt4A1qUw3w-S-8W16uKY1FRVWfXXA41_mu4uCNiM,979
-lgt_jobs/jobs/bot_stats_update.py,sha256=RmPA-7Nel2kkZmfGuDSTiSQjipr_DcsL13QgVRjrx0w,7531
+lgt_jobs/jobs/bot_stats_update.py,sha256=iOQ5IOPOXZnrFyQvAq5DkVe19CTJP7jGU_-BeGLuHGk,7721
 lgt_jobs/jobs/chat_history.py,sha256=tZ4XyOGdy1k6r4uotxSSKbXjTR_oRK6Ym0YthFYBtl8,6200
 lgt_jobs/jobs/connect_sources.py,sha256=_eA86KnS3AC6YCI1xk7VCV7lFmPRxta-wUStfdmajQU,4790
 lgt_jobs/jobs/inbox_leads.py,sha256=OSX-FNx27gWEKNBBc-hyq2odCxXytz7WHtQJajtz274,5670
@@ -43,12 +43,12 @@ lgt_jobs/lgt_data/analytics.py,sha256=fiN88zcIxs_bRMmXL7ftp4FvBeJ5I7QBPE4tbwKJ39
 lgt_jobs/lgt_data/engine.py,sha256=Rsbz-CApAo_TVDssdjBkv8v_fVOZm_Uh1S6W4fnaEWo,7728
 lgt_jobs/lgt_data/enums.py,sha256=jBH5WGBtDAvFrh4iiPIzlQ-XrImMpuwqstuasG55mJ0,2209
 lgt_jobs/lgt_data/helpers.py,sha256=NDa-V5EYaJfkGoWsmQSwSe6N_jxNxs8tHRQzW1iST6k,480
-lgt_jobs/lgt_data/model.py,sha256=Nkl28_3u3auFAylDBIpiwQfNEqx3hpQaFz2SyigoSxM,28660
+lgt_jobs/lgt_data/model.py,sha256=chkEr_KogEOtcsG2xyAouqL4P3m3pZNTd4hQ-yfChIY,28660
 lgt_jobs/lgt_data/mongo_repository.py,sha256=kLE906lfqhHF9gp1qvH_3XKCZGCZnxjLMrBLWBy7doo,46099
 lgt_jobs/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgt_jobs/services/web_client.py,sha256=GLWsJkIC8rv6xLFaLwcMm4EwBlVDu0njORwkZqBJaE4,2086
 lgt_jobs/templates/new_message.html,sha256=dZl8UmdAOOMq4nidvAgMFroSrTV7Pw0RWt2yLp_2idg,6989
-leadguru_jobs-0.582.0.dist-info/METADATA,sha256=WlY_NPvMquclGJsoqhQvjfaZQCwIogWExP8LKU_H8Eo,1319
-leadguru_jobs-0.582.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-leadguru_jobs-0.582.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
-leadguru_jobs-0.582.0.dist-info/RECORD,,
+leadguru_jobs-0.583.0.dist-info/METADATA,sha256=8m3ugonnuByYW6bwTAltUg6pkFXv7l2fWJI73lwnIzc,1319
+leadguru_jobs-0.583.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+leadguru_jobs-0.583.0.dist-info/top_level.txt,sha256=rIuw1DqwbnZyeoarBSC-bYeGOhv9mZBs7_afl9q4_JI,9
+leadguru_jobs-0.583.0.dist-info/RECORD,,

lgt_jobs/jobs/bot_stats_update.py

@@ -33,8 +33,6 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
         users_rep = UserMongoRepository()
         bot = bots_rep.get_one(id=data.bot_id, include_deleted=True)
         received_messages, filtered_messages = get_bots_aggregated_analytics(bot_ids=[str(bot.id)])
-        bot.messages_received = sum([received_messages[doc] for doc in received_messages])
-        bot.messages_filtered = sum([filtered_messages[doc] for doc in filtered_messages])
 
         if bot.source.source_type == SourceType.DISCORD:
             client = DiscordClient(bot.token)
@@ -74,6 +72,8 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                 if discord_server.icon:
                     discord_server.icon = (f'https://cdn.discordapp.com/icons/{discord_server.id}/'
                                            f'{discord_server.icon}.png')
+                discord_server.messages_received = received_messages.get(discord_server.id)
+                discord_server.messages_filtered = filtered_messages.get(discord_server.id)
                 time.sleep(random.randint(1, 2))
 
             bot.servers = discord_servers
@@ -152,6 +152,8 @@ class BotStatsUpdateJob(BaseBackgroundJob, ABC):
                     channel.active = channel.is_member
             bot.servers[0].channels = channels
             bot.servers[0].subscribers = users_count
+            bot.servers[0].messages_received = received_messages.get(bot.source.source_id, 0)
+            bot.servers[0].messages_filtered = filtered_messages.get(bot.source.source_id, 0)
 
         # save only last 50 messages
         bot.recent_messages = bot.recent_messages[-50:]

lgt_jobs/lgt_data/model.py

@@ -102,8 +102,6 @@ class BaseBotModel(Credentials):
         self.connected_channels = None
         self.channels_users = None
         self.users_count = None
-        self.messages_received: int = 0
-        self.messages_filtered: int = 0
         self.recent_messages: List[str] = []
         self.icon = None
         self.active_channels = {}
@@ -163,6 +161,8 @@ class Server:
         self.deleted = False
         self.subscribers = 0
         self.approximate_member_count = 0
+        self.messages_received: int = 0
+        self.messages_filtered: int = 0
 
     @classmethod
     def from_dic(cls, dic: dict):