add requests

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."""

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
 

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.standard_scope.model import MasterEquipment
-from src.scope_equipment.model import MasterEquipment, MasterEquipmentTree
+from src.standard_scope.service import get_equipment_level_by_no
-from src.scope_equipment.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]:

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,

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):
+# class EquipmentWorkscopeGroup(Base, DefaultMixin):
-    __tablename__ = "oh_tr_equipment_workscope_group"
+#     __tablename__ = "oh_tr_equipment_workscope_group"
-
+
-    # overhaul_activity_id = Column(
+#     # overhaul_activity_id = Column(
-    #     UUID(as_uuid=True), ForeignKey("oh_tr_overhaul_activity.id"), nullable=False
+#     #     UUID(as_uuid=True), ForeignKey("oh_tr_overhaul_activity.id"), nullable=False
-    # )
+#     # )
-
+
-    # scope_equipment_job_id = Column(
+#     # scope_equipment_job_id = Column(
-    #     UUID(as_uuid=True),
+#     #     UUID(as_uuid=True),
-    #     ForeignKey("oh_ms_scope_equipment_job.id", ondelete="cascade"),
+#     #     ForeignKey("oh_ms_scope_equipment_job.id", ondelete="cascade"),
-    #     nullable=False,
+#     #     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)
+#     location_tag = Column(String, nullable=False)
-    # 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)
+#     equipment = relationship(
-
+#         "StandardScope",
-    equipment = relationship(
+#         lazy="selectin",
-        "StandardScope",
+#         primaryjoin="and_(OverhaulJob.location_tag == foreign(StandardScope.location_tag))",
-        lazy="selectin",
+#         uselist=False,  # Add this if it's a one-to-one relationship
-        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(
+#     # scope_equipment_job = relationship(
-    #     "ScopeEquipmentJob", lazy="raise", back_populates="overhaul_jobs"
+#     #     "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")