message issues resolved

App/Users/Model.py

@@ -162,9 +162,10 @@ class User(models.Model):
             for promo_plan in promo_plans:
                 plan_valid = await promo_plan.is_promo_valid()
                 if plan_valid:
-                    Subscription.create()
+                    await new_user.create_subscription(
+                        plan=promo_plan, send_message=True
+                    )
                     await new_user.activate_user()
-                    await new_user.send_plan_subscription_message(promo_plan)
 
             # Create the user in the database
 
@@ -179,13 +180,13 @@ class User(models.Model):
             logger.error(f"Error creating user: {e}")
             raise e
 
-    async def send_plan_subscription_message(self, plan: Plan):
+    async def send_plan_subscription_message(self, plan: Plan, expiration_time):
         message = self.message_templates.subscription_created_message(
-            user_name=self.name, plan_name=plan.name
+            expiration_time=expiration_time, plan_name=plan.name
         )
         await self.send_message(message=message)
 
-    async def create_subscription(self, plan: Plan):
+    async def create_subscription(self, plan: Plan, send_message=False):
         expiration_time = datetime.datetime.now() + datetime.timedelta(
             hours=plan.duration
         )
@@ -200,6 +201,10 @@ class User(models.Model):
             active=True,
         )
         await self.activate_user()
+        if send_message:
+            self.send_plan_subscription_message(
+                plan=plan, expiration_time=expiration_time
+            )
 
     async def send_welcome_message(self):
         """Sends a welcome message to the user."""