From f8a6bbf21125df0a99e09f8f098e7cf1055d6d53 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Mon, 30 Mar 2026 09:55:52 +0700 Subject: [PATCH] update service fare --- src/controllers/service_fare.ts | 106 ++++++++++++++++---------------- src/routes/private.ts | 2 +- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/controllers/service_fare.ts b/src/controllers/service_fare.ts index e16949c..d6b8aa2 100644 --- a/src/controllers/service_fare.ts +++ b/src/controllers/service_fare.ts @@ -75,66 +75,66 @@ export class ServiceFareController { } } - // static async option(req: Request, res: Response, next: NextFunction): Promise { - // /* - // #swagger.tags = ['Service Fare'] - // #swagger.security = [{ "bearerAuth": [] }] - // */ - // try { - // const [services, fareTypes, serviceClasses] = await Promise.all([ - // OrmHelper.DB.getRepository(Service) - // .createQueryBuilder("Service") - // .select(["Service.id", "Service.name"]) - // .getMany(), + static async option(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Service Fare'] + #swagger.security = [{ "bearerAuth": [] }] + */ + try { + const [services, fareTypes, serviceClasses] = await Promise.all([ + OrmHelper.DB.getRepository(Service) + .createQueryBuilder("Service") + .select(["Service.id", "Service.name"]) + .getMany(), - // OrmHelper.DB.getRepository(FareType) - // .createQueryBuilder("FareType") - // .select(["FareType.id", "FareType.name"]) - // .getMany(), + OrmHelper.DB.getRepository(FareType) + .createQueryBuilder("FareType") + .select(["FareType.id", "FareType.name"]) + .getMany(), - // OrmHelper.DB.getRepository(ServiceClass) - // .createQueryBuilder("ServiceClass") - // .select(["ServiceClass.id", "ServiceClass.name"]) - // .getMany(), - // ]); + OrmHelper.DB.getRepository(ServiceClass) + .createQueryBuilder("ServiceClass") + .select(["ServiceClass.id", "ServiceClass.name"]) + .getMany(), + ]); - // // Semua FareType dapat semua ServiceClass - // const fareTypesWithClass = fareTypes.map((ft) => ({ - // id: ft.id, - // name: ft.name, - // service_class: serviceClasses.map((sc) => ({ - // id: sc.id, - // name: sc.name, - // })), - // })); + // Semua FareType dapat semua ServiceClass + const fareTypesWithClass = fareTypes.map((ft) => ({ + id: ft.id, + name: ft.name, + service_class: serviceClasses.map((sc) => ({ + id: sc.id, + name: sc.name, + })), + })); - // // Semua Service dapat semua FareType (yang sudah berisi ServiceClass) - // const list_data = services.map((svc) => ({ - // service: { - // id: svc.id, - // name: svc.name, - // faretype: fareTypesWithClass, - // }, - // })); + // Semua Service dapat semua FareType (yang sudah berisi ServiceClass) + const list_data = services.map((svc) => ({ + service: { + id: svc.id, + name: svc.name, + faretype: fareTypesWithClass, + }, + })); - // const total_count_data = list_data.length; - // const count_data = CommonHelper.countObject(list_data); + const total_count_data = list_data.length; + const count_data = CommonHelper.countObject(list_data); - // return ReturnHelper.successResponselist( - // res, 200, - // Language.lang.success_view, - // count_data, - // 1, - // total_count_data, - // list_data - // ); + return ReturnHelper.successResponselist( + res, 200, + Language.lang.success_view, + count_data, + 1, + total_count_data, + list_data + ); - // } catch (e: unknown) { - // log.error(e); - // const err = e as Error; - // return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); - // } - // } + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } static async create(req: Request, res: Response, next: NextFunction): Promise { /* diff --git a/src/routes/private.ts b/src/routes/private.ts index 3fa9a9b..20dd6dc 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -182,7 +182,7 @@ export class RoutePrivate { app.put('/api/service/restore/:id', ServiceController.restore) app.get('/api/service-fare/list', ServiceFareController.list) - // app.get('/api/service-fare/option', ServiceFareController.option) + app.get('/api/service-fare/option', ServiceFareController.option) app.post('/api/service-fare/create', ServiceFareController.create) app.get('/api/service-fare/detail/:id', ServiceFareController.detail) app.put('/api/service-fare/update/:id', ServiceFareController.update)