TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wayanrivan
2026-03-30 09:54:28 +07:00
parent af4e6b7294
commit be9c667f3a
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/controllers/service_fare.ts
View File

@ -75,66 +75,66 @@ export class ServiceFareController {
}
}
static async option(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
/*
#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<void | Response> {
// /*
// #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<void | Response> {
/*

2
src/routes/private.ts
View File

@ -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)