From 0ebb5f0f97261d6369c6e3039f3e283326964484 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Mon, 21 Apr 2025 16:04:14 +0700 Subject: [PATCH] add new schedule api --- src/overhaul_schedule/model.py | 6 +++--- src/overhaul_schedule/router.py | 1 + src/overhaul_schedule/schema.py | 8 ++++---- src/overhaul_schedule/service.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/overhaul_schedule/model.py b/src/overhaul_schedule/model.py index 50048c2..3726f64 100644 --- a/src/overhaul_schedule/model.py +++ b/src/overhaul_schedule/model.py @@ -11,8 +11,8 @@ class OverhaulSchedule(Base, DefaultMixin): year = Column(Integer, nullable=False) plan_duration = Column(Integer, nullable=True) - planned_outage = Column(Integer, nullable=True) - actual_outage = Column(Integer, nullable=True) + # planned_outage = Column(Integer, nullable=True) + # actual_outage = Column(Integer, nullable=True) start = Column(DateTime, nullable=True) finish = Column(DateTime, nullable=True) - remark = Column(String, nullable=True) + # remark = Column(String, nullable=True) diff --git a/src/overhaul_schedule/router.py b/src/overhaul_schedule/router.py index 21dddbe..308c23a 100644 --- a/src/overhaul_schedule/router.py +++ b/src/overhaul_schedule/router.py @@ -21,6 +21,7 @@ async def get_schedules(common: CommonParameters): # return results = await get_all(common=common) + return StandardResponse( data=results, message="Data retrieved successfully", diff --git a/src/overhaul_schedule/schema.py b/src/overhaul_schedule/schema.py index 0582fcc..e2aa7f7 100644 --- a/src/overhaul_schedule/schema.py +++ b/src/overhaul_schedule/schema.py @@ -30,12 +30,12 @@ class OverhaulScheduleUpdate(OverhaulScheduleBase): class OverhaulScheduleRead(OverhaulScheduleBase): id: UUID year: int - plan_duration: Optional[int] = None - planned_outage: Optional[int] = None - actual_outage: Optional[int] = None + # plan_duration: Optional[int] = None + # planned_outage: Optional[int] = None + # actual_outage: Optional[int] = None start: datetime finish: datetime - remark: Optional[str] + # remark: Optional[str] diff --git a/src/overhaul_schedule/service.py b/src/overhaul_schedule/service.py index b838dfc..17dcc95 100644 --- a/src/overhaul_schedule/service.py +++ b/src/overhaul_schedule/service.py @@ -16,7 +16,7 @@ from .schema import OverhaulScheduleCreate async def get_all(*, common): """Returns all documents.""" - query = Select(OverhaulSchedule).order_by(OverhaulSchedule.start) + query = Select(OverhaulSchedule) results = await search_filter_sort_paginate(model=query, **common) return results