From 77149e10a4265fce1d7ece88f92b8591cb395cf3 Mon Sep 17 00:00:00 2001
From: Cizz22 <cisatraa@gmail.com>
Date: Thu, 9 Jan 2025 15:11:28 +0700
Subject: [PATCH] add id to overview overhaul

---
 src/overhaul_scope/service.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/overhaul_scope/service.py b/src/overhaul_scope/service.py
index 615c153..8e66229 100644
--- a/src/overhaul_scope/service.py
+++ b/src/overhaul_scope/service.py
@@ -101,7 +101,6 @@ async def get_overview_overhaul(*, db_session: DbSession):
     ).where(
         OverhaulScope.start_date <= current_date,
         OverhaulScope.end_date >= current_date,
-        OverhaulScope.status != 'Completed'
     ).group_by(
         OverhaulScope.id
     )
@@ -116,6 +115,7 @@ async def get_overview_overhaul(*, db_session: DbSession):
         return {
             "status": "Ongoing",
             "overhaul": {
+                "id": ongoing_overhaul.id,
                 "type": ongoing_overhaul.type,
                 "start_date": ongoing_overhaul.start_date,
                 "end_date": ongoing_overhaul.end_date,
@@ -134,7 +134,6 @@ async def get_overview_overhaul(*, db_session: DbSession):
         OverhaulScope.activity_equipments
     ).where(
         OverhaulScope.start_date > current_date,
-        OverhaulScope.status == 'Upcoming'
     ).group_by(
         OverhaulScope.id
     ).order_by(
@@ -151,6 +150,7 @@ async def get_overview_overhaul(*, db_session: DbSession):
         return {
             "status": "Upcoming",
             "overhaul": {
+                "id": upcoming_overhaul.id,
                 "type": upcoming_overhaul.type,
                 "start_date": upcoming_overhaul.start_date,
                 "end_date": upcoming_overhaul.end_date,