Merge pull request #36 from yuvabe-ai-labs/feat/notify

src/profile/service.py

@@ -1,6 +1,5 @@
 from src.notifications.service import get_user_device_tokens
 from src.profile.utils import build_raw_message, refresh_access_token
-from src.profile.schemas import SendMailRequest
 from src.core.models import Assets, Users, UserTeamsRole, Roles
 from fastapi import HTTPException
 from passlib.context import CryptContext

src/wellbeing/service.py

@@ -1,27 +1,51 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
-from datetime import datetime
 from typing import List
 from .models import WaterLogs
 import uuid
 from .schemas import WaterLogCreate, WaterLogUpdate
+from datetime import date, datetime
 
 
-# Create a new water log
+# Create or update today's water log
 async def create_water_log(
     session: AsyncSession, water_log: WaterLogCreate, user_id: uuid.UUID
 ) -> WaterLogs:
-    db_water_log = WaterLogs(
+    
+
+    today = date.today()
+
+    # 1️⃣ Query today's existing log
+    stmt = select(WaterLogs).filter(
+        WaterLogs.user_id == user_id,
+        WaterLogs.logged_at >= datetime.combine(today, datetime.min.time()),
+        WaterLogs.logged_at <= datetime.combine(today, datetime.max.time()),
+    )
+    result = await session.execute(stmt)
+    existing_log = result.scalar_one_or_none()
+
+    # 2️⃣ If today's log exists → UPDATE it
+    if existing_log:
+        existing_log.amount_ml = water_log.amount_ml
+        existing_log.goal_ml = water_log.goal_ml
+        existing_log.recommended_ml = water_log.recommended_ml
+        await session.commit()
+        await session.refresh(existing_log)
+        return existing_log
+
+    # 3️⃣ No log for today → CREATE a new one
+    new_log = WaterLogs(
+        id=uuid.uuid4(),
         user_id=user_id,
         amount_ml=water_log.amount_ml,
-        logged_at=datetime.now(),
+        logged_at=datetime.utcnow(),
         goal_ml=water_log.goal_ml,
         recommended_ml=water_log.recommended_ml,
     )
-    session.add(db_water_log)
-    await session.commit()  # Commit asynchronously
-    await session.refresh(db_water_log)  # Refresh asynchronously
-    return db_water_log
+    session.add(new_log)
+    await session.commit()
+    await session.refresh(new_log)
+    return new_log
 
 
 # Get all water logs for a user