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

refactor(room_services): enhance service handling and response formatting; update service type handling in service controller

Browse Source
This commit is contained in:
Narul Hidayah
2026-05-24 15:59:31 +09:00
parent e083c19135
commit 6f8ed0efbb
4 changed files with 288 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/controllers/service.ts
View File

@ -1,4 +1,4 @@
import { Service, Paging } from "entity";
import { Service, Paging, Status } from "entity";
import { NextFunction, Response } from "express";
import { Request } from "express-jwt";
import Joi from "joi";
@ -9,7 +9,7 @@ import { Language } from "../langs/lang";
import { ServiceModel } from "../model/service";
import { ServiceTypeModel } from "../model/service_type";
import { ServiceFareModel } from "../model/service_fare";
import { RoomModel } from "../model/room";
import { RoomServicesModel } from "../model/room_services";
import { OrmHelper } from "../helpers/orm";
import moment from "moment";
@ -104,6 +104,12 @@ export class ServiceController {
await queryRunner.commitTransaction();
const saved = await ServiceModel.list({ "Service.id": service.id })
.then((q) => q.leftJoinAndSelect("Service.serviceType", "serviceType").getOne());
if (saved) {
await RoomServicesModel.syncRoomsOnServiceCreated(OrmHelper.DB.manager, saved);
}
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, service);
} catch (e: unknown) {
await queryRunner.rollbackTransaction();
@ -178,6 +184,8 @@ export class ServiceController {
if (!service) throw { message: "Service " + Language.lang.failed_not_found };
const oldTypeId = service.serviceType?.id;
service.name = param.name;
service.serviceType = serviceType;
service.status = param.status;
@ -186,6 +194,16 @@ export class ServiceController {
await queryRunner.commitTransaction();
const saved = await ServiceModel.list({ "Service.id": service.id })
.then((q) => q.leftJoinAndSelect("Service.serviceType", "serviceType").getOne());
if (saved) {
await RoomServicesModel.syncRoomsOnServiceUpdated(
OrmHelper.DB.manager,
saved,
oldTypeId
);
}
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, service);
} catch (e: unknown) {
await queryRunner.rollbackTransaction();
@ -278,6 +296,7 @@ export class ServiceController {
}
if (affected > 0) {
await RoomServicesModel.syncRoomsOnServiceDeleted(OrmHelper.DB.manager, param.id);
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
} else {
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
@ -307,6 +326,11 @@ export class ServiceController {
const affected = (await repo.restore({ id: param.id })).affected ?? 0;
if (affected > 0) {
const service = await ServiceModel.list({ "Service.id": param.id })
.then((q) => q.leftJoinAndSelect("Service.serviceType", "serviceType").getOne());
if (service && service.status === Status.Active) {
await RoomServicesModel.syncRoomsOnServiceCreated(OrmHelper.DB.manager, service);
}
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
} else {
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");