From 80b59a5207edb3a88f08b8ee230e54636b5044e0 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Mon, 10 Feb 2025 13:02:02 +0700 Subject: [PATCH] add tutorial to OH calculation --- src/calculation_time_constrains/router.py | 2 +- src/overhaul_job/model.py | 14 +++++++++----- src/scope_equipment_job/model.py | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/calculation_time_constrains/router.py b/src/calculation_time_constrains/router.py index 1d8becc..e587fba 100644 --- a/src/calculation_time_constrains/router.py +++ b/src/calculation_time_constrains/router.py @@ -27,7 +27,7 @@ from .service import bulk_update_equipment router = APIRouter() -@router.post("", response_model=StandardResponse[Union[str, CalculationTimeConstrainsRead]]) +@router.post("", response_model=StandardResponse[CalculationTimeConstrainsRead]) async def create_calculation_time_constrains(db_session: DbSession, current_user: CurrentUser, calculation_time_constrains_in: CalculationTimeConstrainsParametersCreate, scope_calculation_id: Optional[str] = Query(None), with_results: Optional[int] = Query(0)): """Save calculation time constrains Here""" diff --git a/src/overhaul_job/model.py b/src/overhaul_job/model.py index c2fde44..9028584 100644 --- a/src/overhaul_job/model.py +++ b/src/overhaul_job/model.py @@ -10,11 +10,15 @@ class OverhaulJob(Base, DefaultMixin): overhaul_activity_id = Column(UUID(as_uuid=True), ForeignKey( "oh_ms_overhaul_activity.id"), nullable=False) - job_id = Column(UUID(as_uuid=True), ForeignKey( - "oh_ms_job.id", ondelete="cascade")) + + scope_equipment_job_id = Column(UUID(as_uuid=True), ForeignKey( + "oh_ms_scope_equipment_job.id", ondelete="cascade"), nullable=False) + + + notes = Column(String, nullable=True) status = Column(String, nullable=True, default="pending") - job = relationship( - "MasterActivity", lazy="raise", back_populates="overhaul_jobs" - ) \ No newline at end of file + scope_equipment_job = relationship( + "ScopeEquipmentJob", lazy="raise" + ) diff --git a/src/scope_equipment_job/model.py b/src/scope_equipment_job/model.py index ea7cac7..a7fc824 100644 --- a/src/scope_equipment_job/model.py +++ b/src/scope_equipment_job/model.py @@ -16,7 +16,7 @@ class ScopeEquipmentJob(Base, DefaultMixin): master_equipments = relationship( "MasterEquipment", lazy="raise", primaryjoin="and_(ScopeEquipmentJob.assetnum == foreign(MasterEquipment.assetnum))", uselist=False) - + job = relationship( "MasterActivity", lazy="raise" )