diff --git a/src/overhaul_schedule/model.py b/src/overhaul_schedule/model.py index 3726f64..afee5bb 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_shutdown = 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/schema.py b/src/overhaul_schedule/schema.py index e2aa7f7..c4da65e 100644 --- a/src/overhaul_schedule/schema.py +++ b/src/overhaul_schedule/schema.py @@ -15,12 +15,12 @@ class OverhaulScheduleBase(DefultBase): class OverhaulScheduleCreate(OverhaulScheduleBase): year: int - plan_duration: Optional[int] = None - planned_outage: Optional[int] = None - actual_outage: Optional[int] = None + plan_duration: Optional[int] = Field(None) + planned_outage: Optional[int] = Field(None) + actual_shutdown: Optional[int] = Field(None) start: datetime finish: datetime - remark: Optional[str] + remark: Optional[str] = Field(None) class OverhaulScheduleUpdate(OverhaulScheduleBase): @@ -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] + planned_outage: Optional[int] + actual_shutdown: Optional[int] 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 23d0cc7..74ca67b 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.created_at.desc()) + query = Select(OverhaulSchedule).order_by(OverhaulSchedule.start.desc()) results = await search_filter_sort_paginate(model=query, **common) return results