From bbac90245eff866702763b6d43420dfd91aaec24 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Fri, 10 Jan 2025 16:39:14 +0700 Subject: [PATCH] add target reliability calculation --- src/api.py | 19 ++++++++++--------- src/calculation_target_reliability/service.py | 1 - src/overhaul_activity/service.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api.py b/src/api.py index a9b91dc..9305800 100644 --- a/src/api.py +++ b/src/api.py @@ -24,6 +24,7 @@ from src.overhaul.router import router as overhaul_router from src.scope_equipment.router import router as scope_equipment_router from src.overhaul_scope.router import router as scope_router from src.overhaul_activity.router import router as overhaul_activity_router +from src.calculation_target_reliability.router import router as calculation_target_reliability class ErrorMessage(BaseModel): msg: str @@ -89,25 +90,25 @@ authenticated_api_router.include_router( # ovehaul_schedule_router, prefix="/overhaul-schedules", tags=["overhaul_schedules"] # ) -# # calculation -# calculation_router = APIRouter(prefix="/calculation", tags=["calculations"]) +# calculation +calculation_router = APIRouter(prefix="/calculation", tags=["calculations"]) # # Time constrains # calculation_router.include_router( # calculation_time_constrains_router, prefix="/time-constraint", tags=["calculation", "time_constraint"]) -# # Target reliability -# calculation_router.include_router( -# calculation_target_reliability, prefix="/target-reliability", tags=["calculation", "target_reliability"] -# ) +# Target reliability +calculation_router.include_router( + calculation_target_reliability, prefix="/target-reliability", tags=["calculation", "target_reliability"] +) # # Budget Constrain # calculation_router.include_router( # calculation_budget_constraint, prefix="/budget-constraint", tags=["calculation", "budget_constraint"] # ) -# authenticated_api_router.include_router( -# calculation_router -# ) +authenticated_api_router.include_router( + calculation_router +) api_router.include_router(authenticated_api_router) diff --git a/src/calculation_target_reliability/service.py b/src/calculation_target_reliability/service.py index 01c992f..08337af 100644 --- a/src/calculation_target_reliability/service.py +++ b/src/calculation_target_reliability/service.py @@ -5,7 +5,6 @@ from typing import Optional from src.database.core import DbSession from src.auth.service import CurrentUser -from src.overhaul_schedule.service import get_all as get_all_schedules from src.scope_equipment.model import ScopeEquipment from src.scope_equipment.service import get_by_scope_name diff --git a/src/overhaul_activity/service.py b/src/overhaul_activity/service.py index ef02b58..8a98bcf 100644 --- a/src/overhaul_activity/service.py +++ b/src/overhaul_activity/service.py @@ -37,7 +37,7 @@ async def get_all(*, common: CommonParameters, overhaul_session_id: UUID, assetn joinedload(OverhaulActivity.overhaul_scope)) if scope_name: - query = query.filter(OverhaulActivity.assetnum == assetnum).options( + query = query.filter(OverhaulActivity.scope_name == scope_name).options( joinedload(OverhaulActivity.overhaul_scope)) results = await search_filter_sort_paginate(model=query, **common)