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

upd

Browse Source
This commit is contained in:
Narul Hidayah
2026-02-11 14:41:49 +07:00
parent 143cf856ed
commit bc4cb35f54
6 changed files with 4 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/controllers/room.ts
View File

@ -7,7 +7,6 @@ import CommonHelper from "../helpers/common";
import { ReturnHelper } from "../helpers/express/return";
import { Language } from "../langs/lang";
import { RoomModel } from "../model/room";
import { PoliModel } from "../model/poli";
import { DepartmentModel } from "../model/department";
import { OrmHelper } from "../helpers/orm";
import moment from "moment";
@ -22,7 +21,7 @@ export class RoomController {
/*
#swagger.tags = ['Room']
#swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (status, code, poli_id, departmentId, etc.)', in: 'query', type: 'string' }
#swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (status, code, departmentId, etc.)', in: 'query', type: 'string' }
#swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' }
#swagger.parameters['page'] = { in: 'query', required: true, type: 'number' }
#swagger.parameters['with_deleted'] = { in: 'query', required: true, type: 'boolean' }
@ -47,7 +46,6 @@ export class RoomController {
const offset = (param.page - 1) * param.limit;
const res_count = query;
const res_list = query
.leftJoinAndSelect("Room.poli", "poli")
.leftJoinAndSelect("Room.department", "department")
.orderBy("Room." + param.order_field, param.order_direction)
.offset(offset)
@ -84,7 +82,6 @@ export class RoomController {
room: Joi.string().max(256).required().label("Room"),
code: Joi.string().max(128).required().label("Code"),
description: Joi.string().allow("").max(512).optional().label("Description"),
poli_id: Joi.string().uuid().allow("", null).optional().label("Poli ID"),
department_id: Joi.string().uuid().required().label("Department ID"),
status: Joi.string().required().label("Status"),
});
@ -97,14 +94,10 @@ export class RoomController {
let department = await DepartmentModel.list({ id: param.department_id }).then((q) => q.getOne());
if (!department) throw { message: "Department not found" };
let poli = param.poli_id ? await PoliModel.list({ id: param.poli_id }).then((q) => q.getOne()) : null;
if (param.poli_id && !poli) throw { message: "Poli not found" };
let room = new Room();
room.room = param.room;
room.code = param.code;
room.description = param.description || null;
room.poli = poli || null;
room.department = department;
room.status = param.status;
room.created_by = req.auth.data.name;
@ -135,7 +128,7 @@ export class RoomController {
});
let param: any = await schema.validateAsync(req.params);
let room = await RoomModel.list({ "Room.id": param.id })
.then((q) => q.leftJoinAndSelect("Room.poli", "poli").leftJoinAndSelect("Room.department", "department").getOne());
.then((q) => q.leftJoinAndSelect("Room.department", "department").getOne());
if (!room) throw { message: "Room Not Found" };
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, room);
} catch (e: unknown) {
@ -161,7 +154,6 @@ export class RoomController {
room: Joi.string().max(256).required().label("Room"),
code: Joi.string().max(128).required().label("Code"),
description: Joi.string().allow("").max(512).optional().label("Description"),
poli_id: Joi.string().uuid().allow("", null).optional().label("Poli ID"),
department_id: Joi.string().uuid().required().label("Department ID"),
status: Joi.string().required().label("Status"),
});
@ -173,16 +165,12 @@ export class RoomController {
let department = await DepartmentModel.list({ id: param.department_id }).then((q) => q.getOne());
if (!department) throw { message: "Department not found" };
let poli = param.poli_id ? await PoliModel.list({ id: param.poli_id }).then((q) => q.getOne()) : null;
if (param.poli_id && !poli) throw { message: "Poli not found" };
let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne());
if (!room) throw { message: "Room " + Language.lang.failed_not_found };
room.room = param.room;
room.code = param.code;
room.description = param.description || null;
room.poli = poli || null;
room.department = department;
room.status = param.status;
room.updated_by = req.auth.data.name;