fix message is not being parsed

src/controllers/_bot_controller.py

@@ -1,4 +1,5 @@
 import os
+import traceback
 
 from fastapi import APIRouter, BackgroundTasks, HTTPException, Request
 from fastapi.responses import JSONResponse, RedirectResponse
@@ -28,7 +29,7 @@ class BotController:
                         event["team_id"]
                     )
                     if not team:
-                        return {"message": "team not found"}
+                        return {"response_type": "ephemeral", "text": "Team not found"}
 
                     async with UserService() as user_service:
                         # Get slack_user_id with fallback
@@ -59,13 +60,16 @@ class BotController:
                                     )
                                     await user_service.send_message(
                                         updated_user.id,
-                                        "Welcome to MandalaBot",
+                                        "Welcome to MandalaForUs",
                                         team.token,
                                     )
 
                         if not user:
                             logger.error("User not found or created")
-                            return {"message": "User not found"}
+                            return {
+                                "response_type": "ephemeral",
+                                "text": "User not found",
+                            }
 
                         async with FileService() as file_service:
                             if "files" in actual_event:
@@ -119,7 +123,7 @@ class BotController:
             return {"challenge": event["challenge"]}
         logger.info(f"Received event: {event}")
         background_tasks.add_task(self.process_event_background, event)
-        return {"message": "Processing started"}
+        return {"response_type": "ephemeral", "text": "Processing started"}
 
     async def authenticate(self, code: str, state: str):
         try:
@@ -164,11 +168,11 @@ class BotController:
                                     )
                                     await user_service.send_message(
                                         updated_user.id,
-                                        "Welcome to MandalaBot",
+                                        "Welcome to MandalaForUs",
                                         team.token,
                                     )
 
-            return {"message": "installed successfully"}
+            return JSONResponse(content="Installed successfully")
         except HTTPException as e:
             logger.warning(e)
             raise e
@@ -179,8 +183,13 @@ class BotController:
     async def updateFrequency(
         self, request: Request, background_tasks: BackgroundTasks
     ):
-        background_tasks.add_task(self.updateUserFrequency, request)
-        return JSONResponse(content={})
+        form_data = await request.form()
+        payload = dict(form_data)
+        background_tasks.add_task(self.updateUserFrequency, payload)
+        return {
+            "response_type": "ephemeral",
+            "text": "Your content delivery frequency is being updated",
+        }
 
     async def install(self):
         try:
@@ -194,10 +203,8 @@ class BotController:
             logger.error(e)
             raise HTTPException(status_code=500, detail=str(e))
 
-    async def updateUserFrequency(self, request: Request):
+    async def updateUserFrequency(self, payload: dict):
         try:
-            form_data = await request.form()
-            payload = dict(form_data)
             logger.info(f"Received command: {payload}")
 
             if payload.get("command") != "/frequency":
@@ -234,16 +241,13 @@ class BotController:
                         "text": "Failed to update frequency. Please try again.",
                     }
                 next_delivery = updated_user.next_content_delivery_date.strftime(
-                    "%Y-%m-%d %H:%M:%S"
+                    "%Y-%m-%d"
+                )
+                await user_service.send_message(
+                    user_id=user.id,
+                    message=f"Your content delivery frequency has been updated to {frequency}. Next delivery scheduled for {next_delivery}",
                 )
-                return {
-                    "response_type": "in_channel",
-                    "text": (
-                        f"Your content delivery frequency has been updated to {frequency}. "
-                        f"Next delivery scheduled for {next_delivery}"
-                    ),
-                }
 
         except Exception as e:
-            logger.error(f"Error updating frequency: {str(e)}")
-            raise HTTPException(status_code=500, detail=str(e))
+            logger.error(f"Error updating frequency: {e}")
+            traceback.print_exc()

src/services/_content_delivery_service.py

@@ -133,6 +133,7 @@ You’re here to create personalized quotes for participants in the Resilient Le
                     "next_content_delivery_date": (start_of_day, end_of_day),
                 },
                 populate=["slack_team"],
+                page_size=100,
             )
 
             if not users:

src/services/_file_service.py

@@ -137,7 +137,7 @@ class FileService:
             logger.error(f"Error in process_file: {str(e)}")
             async with UserService() as user_service:
                 await user_service.send_message(
-                    user.slack_id, "Error processing your document. Please try again."
+                    user.id, "Error processing your document. Please try again."
                 )
 
     async def get_file_info(self, token, file_id):

src/services/_user_service.py

@@ -1,11 +1,13 @@
+from sqlalchemy import select
 from src.repositories import UserRepository
 
 from src.models import ContentDeliveryFrequency, User
 import datetime
 from typing import Optional
-from datetime import datetime, timedelta
+from datetime import datetime
 from src.services._slack_bot_service import SlackBotService
 from src.utils import logger, Helper
+from sqlalchemy.orm import joinedload
 
 
 class UserService:
@@ -25,12 +27,8 @@ class UserService:
         return await self.user_repository.get_user_by_email(email=email)
 
     async def update_user_info(self, user_id, info):
-        async with Helper() as helper:
-            next_delivery_date = helper.calculate_next_delivery_date(
-                datetime.now(), ContentDeliveryFrequency.DAILY
-            )
 
-        info["next_content_delivery_date"] = next_delivery_date
+        info["next_content_delivery_date"] = datetime.now()
         return await self.user_repository.patch(user_id, info)
 
     async def get_users_list(self):
@@ -78,13 +76,20 @@ class UserService:
 
             return await self.user_repository.patch(user_id, update_data)
 
-    async def send_message(self, user_id: int, message: str, token: str):
+    async def send_message(self, user_id: int, message: str):
         """Send message to user"""
-        user = await self.user_repository.get(user_id)
+        query = (
+            select(User).options(joinedload(User.slack_team)).filter(User.id == user_id)
+        )
+        user = await self.user_repository.execute(query=query)
+        user = user.scalar()
+        logger.info(f"User: {user}")
 
-        if user and user.slack_id:
+        if user and hasattr(user, "slack_id"):
             async with SlackBotService() as slack_bot_service:
-                await slack_bot_service.send_im_message(user.slack_id, message, token)
+                await slack_bot_service.send_im_message(
+                    user.slack_id, message, user.slack_team.token
+                )
         else:
             logger.error(f"User not found for user_id: {user_id}")
             return {"message": "User not found"}