diff --git a/src/controllers/service.ts b/src/controllers/service.ts index f73485f..8c57286 100644 --- a/src/controllers/service.ts +++ b/src/controllers/service.ts @@ -8,6 +8,7 @@ import { ReturnHelper } from "../helpers/express/return"; 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 { OrmHelper } from "../helpers/orm"; import moment from "moment"; @@ -134,7 +135,12 @@ export class ServiceController { if (!service) throw { message: "Service Not Found" }; - return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, service); + let serviceFares = await ServiceFareModel.list({ "ServiceFare.serviceId": param.id }) + .then((q) => q + .leftJoinAndSelect("ServiceFare.serviceClass", "serviceClass") + .getMany()); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, { ...service, serviceFares }); } catch (e: unknown) { log.error(e); const err = e as Error;