From 8a3fa2bd13ac47048bc76843e3337ecd94e30614 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Mon, 14 Jul 2025 16:28:56 +0700 Subject: [PATCH] add requests --- src/equipment_workscope_group/router.py | 4 +- src/equipment_workscope_group/schema.py | 2 +- src/equipment_workscope_group/service.py | 7 ++- src/overhaul_activity/service.py | 1 - src/overhaul_job/model.py | 54 ++++++++++++------------ 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/equipment_workscope_group/router.py b/src/equipment_workscope_group/router.py index 90e20a2..452c452 100644 --- a/src/equipment_workscope_group/router.py +++ b/src/equipment_workscope_group/router.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from fastapi import APIRouter, HTTPException, Query, status @@ -13,7 +13,7 @@ router = APIRouter() @router.get( - "/{location_tag}", response_model=StandardResponse[OverhaulJobPagination] + "/{location_tag}", response_model=StandardResponse[ScopeEquipmentJobPagination] ) async def get_jobs(common: CommonParameters, location_tag: str, scope: Optional[str] = Query(None)): """Get all scope pagination.""" diff --git a/src/equipment_workscope_group/schema.py b/src/equipment_workscope_group/schema.py index 930a511..397fa91 100644 --- a/src/equipment_workscope_group/schema.py +++ b/src/equipment_workscope_group/schema.py @@ -4,7 +4,7 @@ from uuid import UUID from pydantic import BaseModel, Field -from src.job.schema import ActivityMasterRead +from src.workscope_group.schema import ActivityMasterRead from src.models import DefultBase, Pagination from src.overhaul_scope.schema import ScopeRead diff --git a/src/equipment_workscope_group/service.py b/src/equipment_workscope_group/service.py index 5e59ae3..42e5137 100644 --- a/src/equipment_workscope_group/service.py +++ b/src/equipment_workscope_group/service.py @@ -9,11 +9,10 @@ from src.auth.service import CurrentUser from src.database.core import DbSession from src.database.service import CommonParameters, search_filter_sort_paginate from src.overhaul_activity.model import OverhaulActivity -from src.overhaul_job.model import OverhaulJob -from src.scope_equipment.model import MasterEquipment, MasterEquipmentTree -from src.scope_equipment.service import get_equipment_level_by_no +from src.standard_scope.model import MasterEquipment +from src.standard_scope.service import get_equipment_level_by_no -from .model import ScopeEquipmentJob +from .model import EquipmentWorkscopeGroup from .schema import ScopeEquipmentJobCreate # async def get(*, db_session: DbSession, scope_equipment_activity_id: str) -> Optional[ScopeEquipmentActivity]: diff --git a/src/overhaul_activity/service.py b/src/overhaul_activity/service.py index b54226b..73ebc45 100644 --- a/src/overhaul_activity/service.py +++ b/src/overhaul_activity/service.py @@ -17,7 +17,6 @@ from src.standard_scope.model import MasterEquipment from src.standard_scope.service import get_by_oh_session_id from src.workscope_group.model import MasterActivity from src.equipment_workscope_group.model import EquipmentWorkscopeGroup -from src.overhaul_job.model import OverhaulJob from .model import OverhaulActivity from .schema import (OverhaulActivityCreate, OverhaulActivityRead, diff --git a/src/overhaul_job/model.py b/src/overhaul_job/model.py index b2d60ed..bcfb7da 100644 --- a/src/overhaul_job/model.py +++ b/src/overhaul_job/model.py @@ -6,38 +6,38 @@ from src.database.core import Base from src.models import DefaultMixin, IdentityMixin, TimeStampMixin -class EquipmentWorkscopeGroup(Base, DefaultMixin): - __tablename__ = "oh_tr_equipment_workscope_group" +# class EquipmentWorkscopeGroup(Base, DefaultMixin): +# __tablename__ = "oh_tr_equipment_workscope_group" - # overhaul_activity_id = Column( - # UUID(as_uuid=True), ForeignKey("oh_tr_overhaul_activity.id"), nullable=False - # ) +# # overhaul_activity_id = Column( +# # UUID(as_uuid=True), ForeignKey("oh_tr_overhaul_activity.id"), nullable=False +# # ) - # scope_equipment_job_id = Column( - # UUID(as_uuid=True), - # ForeignKey("oh_ms_scope_equipment_job.id", ondelete="cascade"), - # nullable=False, - # ) +# # 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") - workscope_group_id = Column( - UUID(as_uuid=True), ForeignKey("oh_ms_workscope_group.id"), nullable=False - ) +# # notes = Column(String, nullable=True) +# # status = Column(String, nullable=True, default="pending") +# workscope_group_id = Column( +# UUID(as_uuid=True), ForeignKey("oh_ms_workscope_group.id"), nullable=False +# ) - location_tag = Column(String, nullable=False) +# location_tag = Column(String, nullable=False) - equipment = relationship( - "StandardScope", - lazy="selectin", - primaryjoin="and_(OverhaulJob.location_tag == foreign(StandardScope.location_tag))", - uselist=False, # Add this if it's a one-to-one relationship - ) +# equipment = relationship( +# "StandardScope", +# lazy="selectin", +# primaryjoin="and_(OverhaulJob.location_tag == foreign(StandardScope.location_tag))", +# uselist=False, # Add this if it's a one-to-one relationship +# ) - workscope_group = relationship("MasterActivity", lazy="selectin", back_populates="equipment_workscope_groups") +# workscope_group = relationship("MasterActivity", lazy="selectin", back_populates="equipment_workscope_groups") - # scope_equipment_job = relationship( - # "ScopeEquipmentJob", lazy="raise", back_populates="overhaul_jobs" - # ) +# # scope_equipment_job = relationship( +# # "ScopeEquipmentJob", lazy="raise", back_populates="overhaul_jobs" +# # ) - # overhaul_activity = relationship("OverhaulActivity", lazy="raise", back_populates="overhaul_jobs") +# # overhaul_activity = relationship("OverhaulActivity", lazy="raise", back_populates="overhaul_jobs")