Fix: history response (#118)

* history에 unit을 추가했습니다.
* key가 중복될 경우 기존의 내용을 수정합니다.

Author: MunJaeyoung

wacruit/src/admin/views.py

@@ -505,6 +505,7 @@ class HistoryAdmin(ModelView, model=History):
         History.id,
         History.history_key,
         History.history_value,
+        History.history_unit,
     ]
 
     column_searchable_list = [

wacruit/src/apps/history/exceptions.py

@@ -1 +1,6 @@
 from wacruit.src.apps.common.exceptions import WacruitException
+
+
+class HistoryNotFoundException(WacruitException):
+    def __init__(self):
+        super().__init__(status_code=404, detail="History key not found")

wacruit/src/apps/history/models.py

@@ -11,3 +11,4 @@ class History(DeclarativeBase):
     id: Mapped[intpk]
     history_key: Mapped[str50]
     history_value: Mapped[str50]
+    history_unit: Mapped[str50 | None]

wacruit/src/apps/history/repositories.py

@@ -1,6 +1,8 @@
 from datetime import datetime
+from typing import List
 
 from fastapi import Depends
+from sqlalchemy import delete
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -22,20 +24,24 @@ def get_history(self) -> list[History]:
         query = select(History)
         return list(self.session.execute(query).scalars().all())
 
-    def update_history(self, history: History) -> History:
-        history_key = history.history_key
-        history_value = history.history_value
-
-        with self.transaction:
-            query = select(History).where(History.history_key == history_key)
-            result = self.session.execute(query).scalar_one_or_none()
-            if result:
-                result.history_value = history_value
+    def update_history(self, history_list: List[History]) -> List[History]:
+        keys = [h.history_key for h in history_list]
+        existing_key = (
+            self.session.query(History).filter(History.history_key.in_(keys)).all()
+        )
+        existing_map = {r.history_key: r for r in existing_key}
+
+        for item in history_list:
+            if item.history_key in existing_map:
+                # if existed, update
+                existing = existing_map[item.history_key]
+                existing.history_value = item.history_value
+                existing.history_unit = item.history_unit
             else:
-                result = History(history_key=history_key, history_value=history_value)
-                self.session.add(result)
+                # if not existed, insert
+                self.session.add(item)
 
-        return history
+        return history_list
 
     def get_start_date(self) -> datetime | None:
         query = select(History).where(History.history_key == "start_date")
@@ -44,3 +50,10 @@ def get_start_date(self) -> datetime | None:
         if result is None:
             return None
         return datetime.strptime(result.history_value, "%Y-%m-%d")
+
+    def delete_history(self, history_key: str) -> bool:
+        history = self.session.query(History).filter_by(history_key=history_key).first()
+        if not history:
+            return False
+        self.session.delete(history)
+        return True

wacruit/src/apps/history/schemas.py

@@ -1,14 +1,26 @@
+from typing import List
+
 from pydantic import BaseModel
 
 from wacruit.src.apps.common.schemas import OrmModel
 
 
+class HistoryItemRequest(BaseModel):
+    history_key: str
+    history_value: str
+    history_unit: str | None = None
+
+
 class UpdateHistoryRequest(BaseModel):
-    class Config:
-        extra = "allow"
+    items: List[HistoryItemRequest]
+
+
+class DeleteHistoryRequest(BaseModel):
+    history_key: str
 
 
 class HistoryResponse(OrmModel):
     id: int
     history_key: str
     history_value: str
+    history_unit: str | None = None

wacruit/src/apps/history/services.py

@@ -2,8 +2,10 @@
 
 from fastapi import Depends
 
+from wacruit.src.apps.history.exceptions import HistoryNotFoundException
 from wacruit.src.apps.history.models import History
 from wacruit.src.apps.history.repositories import HistoryRepository
+from wacruit.src.apps.history.schemas import DeleteHistoryRequest
 from wacruit.src.apps.history.schemas import UpdateHistoryRequest
 
 
@@ -13,30 +15,25 @@ def __init__(self, history_repository: HistoryRepository = Depends()):
 
     def get_history(self) -> list[History]:
         history_list = self.history_repository.get_history()
-        operation_period = self.calculate_operation_period()
-
-        if operation_period is not None:
-            history_list.append(
-                History(
-                    history_key="operation_period", history_value=str(operation_period)
-                )
-            )
 
         return history_list
 
     def update_history(self, update_request: UpdateHistoryRequest):
-        req = update_request.dict()
+        to_update_list = []
 
-        for k, v in req.items():
-            to_update = History(history_key=k, history_value=v)
-            self.history_repository.update_history(to_update)
+        for item in update_request.items:
+            to_update = History(
+                history_key=item.history_key,
+                history_value=item.history_value,
+                history_unit=item.history_unit,
+            )
+            to_update_list.append(to_update)
 
-        return self.get_history()
+        self.history_repository.update_history(to_update_list)
 
-    def calculate_operation_period(self) -> int | None:
-        start_date = self.history_repository.get_start_date()
-        now = datetime.now()
+        return self.get_history()
 
-        if start_date is None:
-            return None
-        return now.year - start_date.year
+    def delete_history(self, delete_request: DeleteHistoryRequest):
+        result = self.history_repository.delete_history(delete_request.history_key)
+        if not result:
+            raise HistoryNotFoundException()

wacruit/src/apps/history/views.py

@@ -1,8 +1,10 @@
+from http import HTTPStatus
 from typing import Annotated
 
 from fastapi import APIRouter
 from fastapi import Depends
 
+from wacruit.src.apps.history.schemas import DeleteHistoryRequest
 from wacruit.src.apps.history.schemas import HistoryResponse
 from wacruit.src.apps.history.schemas import UpdateHistoryRequest
 from wacruit.src.apps.history.services import HistoryService
@@ -30,3 +32,12 @@ def get_history(history_service: Annotated[HistoryService, Depends()]):
     history_list = history_service.get_history()
 
     return [HistoryResponse.from_orm(history) for history in history_list]
+
+
+@v3_router.delete("", status_code=HTTPStatus.NO_CONTENT)
+def delete_history(
+    admin_user: AdminUser,
+    history_service: Annotated[HistoryService, Depends()],
+    delete_request: DeleteHistoryRequest,
+):
+    history_service.delete_history(delete_request)

wacruit/src/database/migrations/versions/2025_11_27_2152-60e3aaf301ce_add_history_unit.py

@@ -0,0 +1,30 @@
+"""add history_unit
+
+Revision ID: 60e3aaf301ce
+Revises: 564952e2cd49
+Create Date: 2025-11-27 21:52:29.877472
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "60e3aaf301ce"
+down_revision = "564952e2cd49"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "history", sa.Column("history_unit", sa.String(length=50), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("history", "history_unit")
+    # ### end Alembic commands ###