leadguru-jobs 0.510.0__tar.gz → 0.512.0__tar.gz

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/PKG-INFO

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

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/leadguru_jobs.egg-info/PKG-INFO

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

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/lgt_jobs/jobs/analytics.py

@@ -29,4 +29,4 @@ class TrackAnalyticsJob(BaseBackgroundJob, ABC):
     def exec(self, data: TrackAnalyticsJobData):
         with MongoClient(mongo_connection_string) as client:
             analytics_id = client.lgt_admin[data.event].insert_one(data.model_dump()).inserted_id
-            log.info(f'Entry with id {analytics_id} has been recorded into {data.event}')
+            log.info(f'[TrackAnalyticsJob]: Entry with id {analytics_id} has been recorded into {data.event}')

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/lgt_jobs/jobs/chat_history.py

@@ -3,6 +3,7 @@ from abc import ABC
 from typing import Optional, List
 import logging as log
 from lgt_jobs.lgt_common.slack_client.web_client import SlackWebClient, SlackMessageConvertService
+from lgt_jobs.lgt_data.helpers import get_help_text
 from lgt_jobs.lgt_data.model import ChatMessage, UserModel, UserContact, DedicatedBotModel
 from lgt_jobs.lgt_data.mongo_repository import UserMongoRepository, DedicatedBotRepository, UserContactsRepository, \
     ChatRepository
@@ -37,6 +38,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
             return
         last_message = None
         last_message_contact = None
+        last_message_bot = None
         contacts_groups = self.contacts_repo.find_grouped_actual_contacts(user.id, spam=False, with_chat_only=True)
         for bot in bots:
             contacts = contacts_groups.get(bot.source.source_id)
@@ -51,10 +53,12 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
                     continue
 
                 if not last_message:
+                    last_message_bot = bot
                     last_message = message
                     last_message_contact = contact
 
                 if message.created_at > last_message.created_at and message.user == contact.sender_id:
+                    last_message_bot = bot
                     last_message = message
                     last_message_contact = contact
 
@@ -62,7 +66,8 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
                               (last_message and last_message.created_at > user.new_message_notified_at))
 
         if last_message and has_to_be_notified and last_message.user == last_message_contact.sender_id:
-            LoadChatHistoryJob._notify_about_new_messages(user, last_message_contact, data.template_path)
+            LoadChatHistoryJob._notify_about_new_messages(user, last_message_contact, last_message_bot,
+                                                          data.template_path)
             UserMongoRepository().set(data.user_id, new_message_notified_at=datetime.now(UTC))
 
     def _get_new_messages(self, contact: UserContact, bot: DedicatedBotModel, slack_chat: List[ChatMessage]):
@@ -107,12 +112,13 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         return None
 
     @staticmethod
-    def _notify_about_new_messages(user: UserModel, contact: UserContact, template_path: str):
+    def _notify_about_new_messages(user: UserModel, contact: UserContact, bot: DedicatedBotModel, template_path: str):
         with open(template_path, mode='r') as template_file:
             html = template_file.read()
+            chat_url = f'{portal_url}/feed?senderId={contact.sender_id}&sourceId={bot.source.source_id}'
             html = html.replace("$$USER_NAME$$", contact.name if hasattr(contact, 'name') else contact.real_name)
-            html = html.replace("$$PORTAL_LINK$$", portal_url)
-
+            html = html.replace("$$PORTAL_LINK$$", chat_url)
+            html = html.replace("$$HELP_TEXT$$", get_help_text(user))
             message_data = {
                 "html": html,
                 "subject": 'New message(s) on Leadguru',

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/lgt_jobs/lgt_data/enums.py

@@ -80,6 +80,9 @@ class ImageName(str, Enum):
     LOCK = 'lock.png'
     LOGO = 'logo.png'
     MAIL = 'mail.png'
+    CRY = 'cry.png'
+    HANDS = 'hands.png'
+    SAD = 'sad.png'
 
 
 class FeaturesEnum(str, Enum):

leadguru_jobs-0.512.0/lgt_jobs/lgt_data/helpers.py

@@ -0,0 +1,11 @@
+from lgt_jobs.lgt_data.model import UserModel
+from lgt_jobs.lgt_data.mongo_repository import SubscriptionsRepository
+
+
+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):
+    subscription = SubscriptionsRepository().find_one(id=user.subscription_id)
+    return 'the onboarding call with us!' if subscription.trial else 'a call with us.'

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/lgt_jobs/smtp.py

@@ -31,7 +31,7 @@ class SendMailJob(BaseBackgroundJob, ABC):
             body_image[f'IMAGE_{ImageName(image.value).name}'] = f'lgt_jobs/assets/images/{image.value}'
 
         email.send(
-            sender=data.sender,
+            sender=f"Leadguru <{data.sender}>",
             receivers=[data.recipient],
             subject=data.subject,
             html=data.html,

{leadguru_jobs-0.510.0 → leadguru_jobs-0.512.0}/lgt_jobs/templates/new_message.html

@@ -96,11 +96,11 @@
                                style="border: 0; margin: 0 40px; padding-bottom: 40px">
                             <tr>
                                 <td style="padding: 20px 0 0; border-top: 1px solid #E9EBF0; margin: 0; font-size: 14px; line-height: 20px; color: #778198; text-align: left; font-weight: 400">
-                                    Check out our
+                                    Need help? Check out our
                                     <a style="color: #3579F6; text-decoration: none;"
                                        href="https://leadguru.co/features/"
                                        target="_blank" >Knowledge Base</a>
-                                    or book a call with us.
+                                    or book $$HELP_TEXT$$
                                 </td>
                             </tr>
                         </table>

leadguru_jobs-0.510.0/lgt_jobs/lgt_data/helpers.py

@@ -1,2 +0,0 @@
-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"