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

update service fare

Browse Source
This commit is contained in:
wayanrivan
2026-03-31 14:26:10 +07:00
parent eab31e95fe
commit c7921e5619
3 changed files with 123 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
src/controllers/service_fare.ts
View File

@ -236,21 +236,35 @@ export class ServiceFareController {
/* /*
#swagger.tags = ['Service Fare'] #swagger.tags = ['Service Fare']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } #swagger.parameters['id'] = { description: 'Service ID', in: 'path', type: 'string' }
*/ */
try { try {
const schema = Joi.object().keys({ const schema = Joi.object().keys({
id: Joi.string().uuid().required().label("Service Fare Id"), id: Joi.string().uuid().required().label("Service Id"), // ← label diupdate
}); });
let param: any = await schema.validateAsync(req.params); let param: any = await schema.validateAsync(req.params);
let serviceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }) let serviceFare = await ServiceModel.list({ "Service.id": param.id })
.then((q) => .then((q) =>
q.leftJoinAndSelect("ServiceFare.serviceClass", "serviceClass").leftJoinAndSelect("ServiceFare.service", "service").getOne() q
.select([
"Service.id",
"Service.name",
"servicefare.id",
"servicefare.fare",
"serviceClass.id",
"serviceClass.name",
"faretype.id",
"faretype.name",
])
.leftJoin("Service.servicefare", "servicefare")
.leftJoin("servicefare.serviceClass", "serviceClass")
.leftJoin("servicefare.faretype", "faretype")
.getOne()
); );
if (!serviceFare) throw { message: "Service Fare Not Found" }; if (!serviceFare || serviceFare.length === 0) throw { message: "Service Fare Not Found" };
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, serviceFare); return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, serviceFare);
} catch (e: unknown) { } catch (e: unknown) {
@ -260,158 +274,118 @@ export class ServiceFareController {
} }
} }
// static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> { static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
// /* /*
// #swagger.tags = ['Service Fare'] #swagger.tags = ['Service Fare']
// #swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
// #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } #swagger.parameters['id'] = { description: 'Service Fare ID', in: 'path', type: 'string' }
// #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/serviceFare" } } } } #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/serviceFareUpdate" } } } }
// */ */
// const queryRunner = OrmHelper.DB.createQueryRunner(); const queryRunner = OrmHelper.DB.createQueryRunner();
// await queryRunner.startTransaction(); await queryRunner.startTransaction();
// try { try {
// const schema = Joi.object().keys({ const schema = Joi.object().keys({
// service_id: Joi.string().uuid().required().label("Service ID"), id: Joi.string().uuid().required().label("Service Fare ID"),
// faretype: Joi.array().items( fare: Joi.number().min(0).required().label("Fare"),
// Joi.object().keys({ });
// faretype_id: Joi.string().uuid().required().label("Fare Type ID"),
// service_class: Joi.array().items(
// Joi.object().keys({
// service_class_id: Joi.string().uuid().required().label("Service Class ID"),
// fare: Joi.number().min(0).allow(null).label("Fare"),
// })
// ).min(1).required().label("Service Class"),
// })
// ).min(1).required().label("Fare Type"),
// });
// let param: any = await schema.validateAsync(req.body); let param: any = await schema.validateAsync({
...req.body,
id: req.params.id,
});
// // Validasi Service // Cari data berdasarkan ID
// let service = await ServiceModel.list({ "Service.id": param.service_id }).then((q) => q.getOne()); let serviceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }).then((q) => q.getOne());
// if (!service) throw { message: "Service not found" }; if (!serviceFare) throw { message: "Service Fare " + Language.lang.failed_not_found };
// // Hapus semua row lama berdasarkan service_id // Update fare saja
// const existingFares = await ServiceFareModel.list({ "ServiceFare.serviceId": param.service_id }).then((q) => q.getMany()); serviceFare.fare = String(param.fare);
// if (existingFares.length > 0) { serviceFare.updated_by = req.auth.data.name;
// await queryRunner.manager.remove(existingFares);
// }
// const savedServiceFares: ServiceFare[] = []; await queryRunner.manager.save(serviceFare);
await queryRunner.commitTransaction();
// // Loop tiap faretype return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, serviceFare);
// for (const ft of param.faretype) {
// // Validasi FareType } catch (e: unknown) {
// let fareType = await OrmHelper.DB.getRepository("FareType") await queryRunner.rollbackTransaction();
// .createQueryBuilder("FareType") log.error(e);
// .where("FareType.id = :id", { id: ft.faretype_id }) const err = e as Error;
// .getOne(); return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
// if (!fareType) throw { message: `Fare Type ID ${ft.faretype_id} not found` }; } finally {
await queryRunner.release();
}
}
// // Loop tiap service_class dalam faretype ini static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> {
// for (const sc of ft.service_class) { /*
#swagger.tags = ['Service Fare']
#swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['id'] = { in: 'path', required: true, type: 'string' }
#swagger.parameters['hard'] = { in: 'path', description: 'Is Hard Delete', required: false, type: 'boolean' }
*/
try {
const schema = Joi.object().keys({
id: Joi.string().uuid().required().label("ID"),
hard: Joi.bool().optional().allow("").label("Is hard delete?"),
});
// // Validasi ServiceClass const param: { id: string; hard: boolean } = await schema.validateAsync(req.params);
// let serviceClass = await ServiceClassModel.list({ "ServiceClass.id": sc.service_class_id }).then((q) => q.getOne());
// if (!serviceClass) throw { message: `Service Class ID ${sc.service_class_id} not found` };
// let serviceFare = new ServiceFare(); let affected = 0;
// serviceFare.service = service; if (!param.hard) {
// serviceFare.faretype = ft.faretype_id; let serviceFare: ServiceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }).then((q) => q.getOne());
// serviceFare.serviceClass = serviceClass;
// serviceFare.fare = String(sc.fare ?? 0);
// serviceFare.created_by = req.auth.data.name;
// serviceFare.updated_by = req.auth.data.name;
// const saved = await queryRunner.manager.save(serviceFare); if (!serviceFare) throw { message: "Service Fare " + Language.lang.failed_not_found };
// savedServiceFares.push(saved);
// }
// }
// await queryRunner.commitTransaction(); serviceFare.deleted_by = req.auth.data.name;
serviceFare.deleted_at = moment().toDate();
await OrmHelper.DB.manager.save(serviceFare);
affected = 1;
} else {
const repo = OrmHelper.DB.getRepository(ServiceFare);
affected = (await repo.delete({ id: param.id })).affected ?? 0;
}
// return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, savedServiceFares); if (affected > 0) {
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
} else {
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
}
} catch (e: unknown) {
log.error(e);
const err = e as Error;
return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_delete, err.message);
}
}
// } catch (e: unknown) { static async restore(req: Request, res: Response, next: NextFunction): Promise<Response> {
// await queryRunner.rollbackTransaction(); /*
// log.error(e); #swagger.tags = ['Service Fare']
// const err = e as Error; #swagger.security = [{ "bearerAuth": [] }]
// return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); #swagger.parameters['id'] = { in: 'path', required: true, type: 'string' }
// } finally { */
// await queryRunner.release(); try {
// } const schema = Joi.object().keys({
// } id: Joi.string().uuid().required().label("ID"),
});
// static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> { const param: any = await schema.validateAsync(req.params);
// /*
// #swagger.tags = ['Service Fare']
// #swagger.security = [{ "bearerAuth": [] }]
// #swagger.parameters['id'] = { in: 'path', required: true, type: 'string' }
// #swagger.parameters['hard'] = { in: 'path', description: 'Is Hard Delete', required: false, type: 'boolean' }
// */
// try {
// const schema = Joi.object().keys({
// id: Joi.string().uuid().required().label("ID"),
// hard: Joi.bool().optional().allow("").label("Is hard delete?"),
// });
// const param: { id: string; hard: boolean } = await schema.validateAsync(req.params); const repo = OrmHelper.DB.getRepository(ServiceFare);
// let affected = 0; const affected = (await repo.restore({ id: param.id })).affected ?? 0;
// if (!param.hard) {
// let serviceFare: ServiceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }).then((q) => q.getOne());
// if (!serviceFare) throw { message: "Service Fare " + Language.lang.failed_not_found }; if (affected > 0) {
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
// serviceFare.deleted_by = req.auth.data.name; } else {
// serviceFare.deleted_at = moment().toDate(); return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
// await OrmHelper.DB.manager.save(serviceFare); }
// affected = 1; } catch (e: unknown) {
// } else { log.error(e);
// const repo = OrmHelper.DB.getRepository(ServiceFare); const err = e as Error;
// affected = (await repo.delete({ id: param.id })).affected ?? 0; return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_restore, err.message);
// } }
}
// if (affected > 0) {
// return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
// } else {
// return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
// }
// } catch (e: unknown) {
// log.error(e);
// const err = e as Error;
// return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_delete, err.message);
// }
// }
// static async restore(req: Request, res: Response, next: NextFunction): Promise<Response> {
// /*
// #swagger.tags = ['Service Fare']
// #swagger.security = [{ "bearerAuth": [] }]
// #swagger.parameters['id'] = { in: 'path', required: true, type: 'string' }
// */
// try {
// const schema = Joi.object().keys({
// id: Joi.string().uuid().required().label("ID"),
// });
// const param: any = await schema.validateAsync(req.params);
// const repo = OrmHelper.DB.getRepository(ServiceFare);
// const affected = (await repo.restore({ id: param.id })).affected ?? 0;
// if (affected > 0) {
// return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
// } else {
// return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
// }
// } catch (e: unknown) {
// log.error(e);
// const err = e as Error;
// return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_restore, err.message);
// }
// }
} }

6
src/routes/private.ts
View File

@ -186,9 +186,9 @@ export class RoutePrivate {
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.post('/api/service-fare/create', ServiceFareController.create)
app.get('/api/service-fare/detail/:id', ServiceFareController.detail) app.get('/api/service-fare/detail/:id', ServiceFareController.detail)
// app.put('/api/service-fare/update/:id', ServiceFareController.update) app.put('/api/service-fare/update/:id', ServiceFareController.update)
// app.delete('/api/service-fare/delete/:id/:hard', ServiceFareController.delete) app.delete('/api/service-fare/delete/:id/:hard', ServiceFareController.delete)
// app.put('/api/service-fare/restore/:id', ServiceFareController.restore) app.put('/api/service-fare/restore/:id', ServiceFareController.restore)
app.get('/api/service-package/list', ServicePackageController.list) app.get('/api/service-package/list', ServicePackageController.list)
app.post('/api/service-package/create', ServicePackageController.create) app.post('/api/service-package/create', ServicePackageController.create)

7
src/swagger/builder.js
View File

@ -457,10 +457,13 @@ const doc = {
payment_method: { payment_method: {
$name: "Name (string)", $name: "Name (string)",
}, },
registration_fee:{ registration_fee: {
type: "emergency | outpatient", type: "emergency | outpatient",
service: ["uuid-string-1", "uuid-string-2"] service: ["uuid-string-1", "uuid-string-2"]
} },
serviceFareUpdate: {
$fare: 100000,
},
}, },
parameters: {}, parameters: {},
securitySchemes: { securitySchemes: {