Merge pull request #3 from yuvabe-ai-labs/feat/home-screen

src/home/router.py

@@ -3,7 +3,7 @@ from sqlmodel import Session
 
 from src.core.database import engine
 
-from .schemas import EmotionLogCreate, EmotionLogResponse, HomeResponse
+from .schemas import BaseResponse, EmotionLogCreate
 from .service import add_or_update_emotion, get_emotions, get_home_data
 
 router = APIRouter(prefix="/home", tags=["Home"])
@@ -14,26 +14,31 @@ def get_session():
         yield session
 
 
-@router.get("/{user_id}", response_model=HomeResponse)
+@router.get("/{user_id}", response_model=BaseResponse)
 def fetch_home_data(user_id: str, session: Session = Depends(get_session)):
     try:
-        return get_home_data(user_id, session)
+        data = get_home_data(user_id, session)
+        return {"code": 200, "data": data}
     except ValueError as e:
         raise HTTPException(status_code=404, detail=str(e))
 
 
-@router.post("/emotion", response_model=EmotionLogResponse)
+@router.post("/emotion", response_model=BaseResponse)
 def create_or_update_emotion(
     data: EmotionLogCreate, session: Session = Depends(get_session)
 ):
     record = add_or_update_emotion(data, session)
-    return EmotionLogResponse(
-        log_date=record.log_date,
-        morning_emotion=record.morning_emotion,
-        evening_emotion=record.evening_emotion,
-    )
+    return {
+        "code": 200,
+        "data": {
+            "log_date": record.log_date,
+            "morning_emotion": record.morning_emotion,
+            "evening_emotion": record.evening_emotion,
+        },
+    }
 
 
-@router.get("/emotion/{user_id}", response_model=list[EmotionLogResponse])
+@router.get("/emotion/{user_id}", response_model=BaseResponse)
 def get_user_emotions(user_id: str, session: Session = Depends(get_session)):
-    return get_emotions(user_id, session)
+    data = get_emotions(user_id, session)
+    return {"code": 200, "data": data}

src/home/schemas.py

@@ -1,8 +1,7 @@
 # pylint: disable=no-name-in-module
 # pylint: disable=no-self-argument
-
 from datetime import date
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from pydantic import BaseModel
 
@@ -17,11 +16,16 @@ class EmotionLogCreate(BaseModel):
 class EmotionLogResponse(BaseModel):
     log_date: date
     morning_emotion: Optional[int]
-    eveing_emotion: Optional[int]
+    evening_emotion: Optional[int]
 
 
-class HomeResponse(BaseModel):
+class HomeResponseData(BaseModel):
     user_id: str
     user_name: str
     philosophy_text: str
     recent_emotions: List[EmotionLogResponse]
+
+
+class BaseResponse(BaseModel):
+    code: int
+    data: Union[dict, list, None] = None

src/home/service.py

@@ -4,18 +4,16 @@ from sqlmodel import Session, select
 
 from src.core.models import EmotionLogs, Users
 
-from .schemas import EmotionLogCreate, EmotionLogResponse, HomeResponse
+from .schemas import EmotionLogCreate, EmotionLogResponse, HomeResponseData
 
 PHILOSOPHY_TEXT = "Your mind is your greatest asset — train it daily."
 
 
-def get_home_data(user_id: str, session: Session) -> HomeResponse:
-    # Fetch user info
+def get_home_data(user_id: str, session: Session) -> HomeResponseData:
     user = session.exec(select(Users).where(Users.id == user_id)).first()
     if not user:
         raise ValueError("User not found")
 
-    # Fetch last 7 days of emotion logs
     seven_days_ago = date.today() - timedelta(days=7)
     emotion_logs = session.exec(
         select(EmotionLogs)
@@ -33,7 +31,7 @@ def get_home_data(user_id: str, session: Session) -> HomeResponse:
         for log in emotion_logs
     ]
 
-    return HomeResponse(
+    return HomeResponseData(
         user_id=str(user.id),
         user_name=user.user_name,
         philosophy_text=PHILOSOPHY_TEXT,
@@ -49,7 +47,6 @@ def add_or_update_emotion(data: EmotionLogCreate, session: Session):
     ).first()
 
     if existing_log:
-        # Update existing record
         if data.morning_emotion is not None:
             existing_log.morning_emotion = data.morning_emotion
         if data.evening_emotion is not None: