fix: add log data to single routine get API

app/api/controllers/routines.py

@@ -1,5 +1,7 @@
 from contextlib import contextmanager
+from datetime import datetime
 from fastapi import APIRouter, Depends, status
+from pytz import timezone
 
 from app.core.auth import get_current_user
 
@@ -50,11 +52,11 @@ def create_routine(
     operation_id="getRoutine",
 )
 def get_routine(routine_id: int, dao: RoutineDAO = Depends(get_routine_dao)):
-    routine = dao.get_routine_with_elements_by_id(routine_id)
+    routine = dao.get_routine_with_elements_by_id(
+        routine_id, datetime.now(timezone("Asia/Seoul")).date()
+    )
 
-    response = RoutinePublic.from_routine(routine, routine.routine_elements)
-
-    return response
+    return routine
 
 
 @router.delete(

app/api/dao/routine_dao.py

@@ -1,8 +1,11 @@
+from datetime import date
 from typing import List
 from fastapi import HTTPException, status
+from sqlalchemy import asc, func
 from app.api.errors import DATA_DOES_NOT_EXIST
+from app.schemas.routine import RoutineItem, RoutinePublic
 from .base import ProtectedBaseDAO
-from app.models.models import Routine
+from app.models.models import Routine, RoutineLog
 
 
 class RoutineDAO(ProtectedBaseDAO):
@@ -34,7 +37,9 @@ def get_routines_by_weekday(self, weekday: int) -> List[Routine]:
 
         return routines
 
-    def get_routine_with_elements_by_id(self, routine_id: int) -> Routine:
+    def get_routine_with_elements_by_id(
+        self, routine_id: int, date: date
+    ) -> RoutinePublic:
         routine = (
             self.db.query(Routine)
             .filter(
@@ -50,7 +55,38 @@ def get_routine_with_elements_by_id(self, routine_id: int) -> Routine:
                 detail=DATA_DOES_NOT_EXIST,
             )
 
-        return routine
+        routine_logs = (
+            self.db.query(RoutineLog)
+            .filter(
+                RoutineLog.routine_id == routine_id,
+                func.date(RoutineLog.completed_at) == date,
+            )
+            .order_by(
+                asc(RoutineLog.routine_element_id),
+                asc(RoutineLog.completed_at),
+            )
+            .all()
+        )
+
+        routine_with_logs: RoutinePublic = RoutinePublic.from_routine_with_log(
+            routine=routine, routine_items=[]
+        )
+        routine_log_map = dict()
+        for log in routine_logs:
+            routine_log_map[log.routine_element_id] = log
+
+        for element in routine.routine_elements:
+            routine_item = RoutineItem.from_routine_element(element, None)
+
+            if routine_log_map.get(routine_item.id) is not None:
+                log = routine_log_map[element.id]
+                routine_item.completed_at = log.completed_at
+                routine_item.completed_duration_seconds = log.duration_seconds
+                routine_item.is_skipped = log.is_skipped
+
+            routine_with_logs.routine_elements.append(routine_item)
+
+        return routine_with_logs
 
     def update_routine(
         self,