From 143cf856ed482cc4f6a9b16afbf2564eb75a0d63 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Wed, 11 Feb 2026 14:31:26 +0700 Subject: [PATCH] ud --- src/controllers/department.ts | 255 +++++++++++++++++++++++++++ src/controllers/doctor_schedule.ts | 273 +++++++++++++++++++++++++++++ src/controllers/room.ts | 32 ++-- src/helpers/orm.ts | 4 +- src/model/department.ts | 23 +++ src/model/doctor_schedule.ts | 23 +++ src/routes/private.ts | 16 ++ src/swagger/builder.js | 14 ++ 8 files changed, 628 insertions(+), 12 deletions(-) create mode 100644 src/controllers/department.ts create mode 100644 src/controllers/doctor_schedule.ts create mode 100644 src/model/department.ts create mode 100644 src/model/doctor_schedule.ts diff --git a/src/controllers/department.ts b/src/controllers/department.ts new file mode 100644 index 0000000..2df945f --- /dev/null +++ b/src/controllers/department.ts @@ -0,0 +1,255 @@ +import { Department, Paging } from "entity"; +import { NextFunction, Response } from "express"; +import { Request } from "express-jwt"; +import Joi from "joi"; +import { ILogObj, Logger } from "tslog"; +import CommonHelper from "../helpers/common"; +import { ReturnHelper } from "../helpers/express/return"; +import { Language } from "../langs/lang"; +import { DepartmentModel } from "../model/department"; +import { OrmHelper } from "../helpers/orm"; +import moment from "moment"; + +const log: Logger = new Logger({ + name: "[DepartmentController]", + type: "pretty", +}); + +export class DepartmentController { + static async list(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Department'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['filter'] = { description: '', 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' } + #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' } + #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } } + */ + try { + const schema = Joi.object().keys({ + filter: Joi.string().allow("").optional().label("Filter"), + page: Joi.number().required().min(1).label("Page"), + limit: Joi.number().required().min(1).label("Limit"), + with_deleted: Joi.bool().required().label("With Deleted"), + order_field: Joi.string().required().label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"), + }); + + let param: Paging = await schema.validateAsync(req.query); + + let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + + var query = await DepartmentModel.list(filter); + + const offset = (param.page - 1) * param.limit; + let limit = param.limit; + + const res_count = query; + const res_list = query + .orderBy("Department." + param.order_field, param.order_direction) + .offset(offset) + .limit(limit); + + if (param.with_deleted) { + res_count.withDeleted(); + res_list.withDeleted(); + } + + const current_page = param.page; + const total_count_data = await res_count.getCount(); + const list_data = await res_list.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, 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); + } + } + + static async create(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Department'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/department" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + name: Joi.string().max(128).required().label("Name"), + status: Joi.string().required().label("Status"), + }); + + let param: any = await schema.validateAsync(req.body); + + let filter = { name: param.name }; + let exist = await DepartmentModel.list(filter).then((q) => q.getOne()); + if (exist) throw { message: "Department " + Language.lang.failed_duplicate }; + + let department = new Department(); + department.name = param.name; + department.status = param.status; + department.created_by = req.auth.data.name; + department.updated_by = req.auth.data.name; + await queryRunner.manager.save(department); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, department); + } catch (e: unknown) { + await queryRunner.rollbackTransaction(); + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } finally { + await queryRunner.release(); + } + } + + static async detail(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Department'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + */ + try { + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Department Id"), + }); + + let param: any = await schema.validateAsync(req.params); + + let department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!department) throw { message: "Department Not Found" }; + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, department); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_not_found, err.message); + } + } + + static async update(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Department'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/department" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + + try { + req.body.id = req.params["id"]; + + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Department ID"), + name: Joi.string().max(128).required().label("Name"), + status: Joi.string().required().label("Status"), + }); + + let param: any = await schema.validateAsync(req.body); + + let filter = { name: param.name }; + let exist = await DepartmentModel.list(filter).then((q) => q.getOne()); + if (exist && exist.id != param.id) throw { message: "Department " + Language.lang.failed_duplicate }; + + let department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!department) throw { message: "Department " + Language.lang.failed_not_found }; + + department.name = param.name; + department.status = param.status; + department.updated_by = req.auth.data.name; + await queryRunner.manager.save(department); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, department); + } catch (e: unknown) { + await queryRunner.rollbackTransaction(); + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } finally { + await queryRunner.release(); + } + } + + static async delete(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Department'] + #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); + + let affected = 0; + if (!param.hard) { + let department: Department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!department) throw { message: "Department " + Language.lang.failed_not_found }; + + department.deleted_by = req.auth.data.name; + department.deleted_at = moment().toDate(); + await OrmHelper.DB.manager.save(department); + affected = 1; + } else { + const repo = OrmHelper.DB.getRepository(Department); + affected = (await repo.delete({ id: param.id })).affected ?? 0; + } + + 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 { + /* + #swagger.tags = ['Department'] + #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(Department); + + 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); + } + } +} diff --git a/src/controllers/doctor_schedule.ts b/src/controllers/doctor_schedule.ts new file mode 100644 index 0000000..3713651 --- /dev/null +++ b/src/controllers/doctor_schedule.ts @@ -0,0 +1,273 @@ +import { DoctorSchedule, Room, Paging } from "entity"; +import { NextFunction, Response } from "express"; +import { Request } from "express-jwt"; +import Joi from "joi"; +import { ILogObj, Logger } from "tslog"; +import CommonHelper from "../helpers/common"; +import { ReturnHelper } from "../helpers/express/return"; +import { Language } from "../langs/lang"; +import { DoctorScheduleModel } from "../model/doctor_schedule"; +import { OrmHelper } from "../helpers/orm"; +import moment from "moment"; + +const log: Logger = new Logger({ + name: "[DoctorScheduleController]", + type: "pretty", +}); + +export class DoctorScheduleController { + static async list(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Schedule'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['filter'] = { description: '', 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' } + #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' } + #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } } + */ + try { + const schema = Joi.object().keys({ + filter: Joi.string().allow("").optional().label("Filter"), + page: Joi.number().required().min(1).label("Page"), + limit: Joi.number().required().min(1).label("Limit"), + with_deleted: Joi.bool().required().label("With Deleted"), + order_field: Joi.string().required().label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"), + }); + + let param: Paging = await schema.validateAsync(req.query); + + let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + + var query = await DoctorScheduleModel.list(filter); + + const offset = (param.page - 1) * param.limit; + let limit = param.limit; + + const res_count = query; + const res_list = query + .orderBy("DoctorSchedule." + param.order_field, param.order_direction) + .offset(offset) + .limit(limit); + + if (param.with_deleted) { + res_count.withDeleted(); + res_list.withDeleted(); + } + + const current_page = param.page; + const total_count_data = await res_count.getCount(); + const list_data = await res_list.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, 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); + } + } + + static async create(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Schedule'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/doctorSchedule" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + day: Joi.string().max(32).required().label("Day"), + start_time: Joi.string().max(16).required().label("Start Time"), + end_time: Joi.string().max(16).required().label("End Time"), + doctor_id: Joi.string().uuid().required().label("Doctor ID"), + room_id: Joi.string().uuid().required().label("Room ID"), + quota: Joi.string().max(32).allow("", null).optional().label("Quota"), + status: Joi.string().required().label("Status"), + }); + + let param: any = await schema.validateAsync(req.body); + + let room = await OrmHelper.DB.getRepository(Room).findOne({ where: { id: param.room_id } }); + if (!room) throw { message: "Room " + Language.lang.failed_not_found }; + + let doctorSchedule = new DoctorSchedule(); + doctorSchedule.day = param.day; + doctorSchedule.start_time = param.start_time; + doctorSchedule.end_time = param.end_time; + doctorSchedule.doctor_id = param.doctor_id; + doctorSchedule.room = room; + doctorSchedule.quota = param.quota || null; + doctorSchedule.status = param.status; + doctorSchedule.created_by = req.auth.data.name; + doctorSchedule.updated_by = req.auth.data.name; + await queryRunner.manager.save(doctorSchedule); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, doctorSchedule); + } catch (e: unknown) { + await queryRunner.rollbackTransaction(); + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } finally { + await queryRunner.release(); + } + } + + static async detail(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Schedule'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + */ + try { + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Doctor Schedule Id"), + }); + + let param: any = await schema.validateAsync(req.params); + + let doctorSchedule = await DoctorScheduleModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!doctorSchedule) throw { message: "Doctor Schedule Not Found" }; + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, doctorSchedule); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_not_found, err.message); + } + } + + static async update(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Schedule'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/doctorSchedule" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + + try { + req.body.id = req.params["id"]; + + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Doctor Schedule ID"), + day: Joi.string().max(32).required().label("Day"), + start_time: Joi.string().max(16).required().label("Start Time"), + end_time: Joi.string().max(16).required().label("End Time"), + doctor_id: Joi.string().uuid().required().label("Doctor ID"), + room_id: Joi.string().uuid().required().label("Room ID"), + quota: Joi.string().max(32).allow("", null).optional().label("Quota"), + status: Joi.string().required().label("Status"), + }); + + let param: any = await schema.validateAsync(req.body); + + let room = await OrmHelper.DB.getRepository(Room).findOne({ where: { id: param.room_id } }); + if (!room) throw { message: "Room " + Language.lang.failed_not_found }; + + let doctorSchedule = await DoctorScheduleModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!doctorSchedule) throw { message: "Doctor Schedule " + Language.lang.failed_not_found }; + + doctorSchedule.day = param.day; + doctorSchedule.start_time = param.start_time; + doctorSchedule.end_time = param.end_time; + doctorSchedule.doctor_id = param.doctor_id; + doctorSchedule.room = room; + doctorSchedule.quota = param.quota || null; + doctorSchedule.status = param.status; + doctorSchedule.updated_by = req.auth.data.name; + await queryRunner.manager.save(doctorSchedule); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, doctorSchedule); + } catch (e: unknown) { + await queryRunner.rollbackTransaction(); + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } finally { + await queryRunner.release(); + } + } + + static async delete(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Schedule'] + #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); + + let affected = 0; + if (!param.hard) { + let doctorSchedule: DoctorSchedule = await DoctorScheduleModel.list({ id: param.id }).then((q) => q.getOne()); + + if (!doctorSchedule) throw { message: "Doctor Schedule " + Language.lang.failed_not_found }; + + doctorSchedule.deleted_by = req.auth.data.name; + doctorSchedule.deleted_at = moment().toDate(); + await OrmHelper.DB.manager.save(doctorSchedule); + affected = 1; + } else { + const repo = OrmHelper.DB.getRepository(DoctorSchedule); + affected = (await repo.delete({ id: param.id })).affected ?? 0; + } + + 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 { + /* + #swagger.tags = ['Doctor Schedule'] + #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(DoctorSchedule); + + 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); + } + } +} diff --git a/src/controllers/room.ts b/src/controllers/room.ts index dbf5706..5d61d04 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -8,6 +8,7 @@ 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"; @@ -21,7 +22,7 @@ export class RoomController { /* #swagger.tags = ['Room'] #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (status, code, poli_id, etc.)', in: 'query', type: 'string' } + #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (status, code, poli_id, 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,6 +48,7 @@ export class RoomController { 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) .limit(param.limit); @@ -82,7 +84,8 @@ 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().required().label("Poli ID"), + 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"), }); @@ -91,14 +94,18 @@ export class RoomController { let exist = await RoomModel.list({ code: param.code }).then((q) => q.getOne()); if (exist) throw { message: "Room " + Language.lang.failed_duplicate }; - let poli = await PoliModel.list({ id: param.poli_id }).then((q) => q.getOne()); - if (!poli) throw { message: "Poli not found" }; + 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; + room.poli = poli || null; + room.department = department; room.status = param.status; room.created_by = req.auth.data.name; room.updated_by = req.auth.data.name; @@ -128,7 +135,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").getOne()); + .then((q) => q.leftJoinAndSelect("Room.poli", "poli").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) { @@ -154,7 +161,8 @@ 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().required().label("Poli ID"), + 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"), }); let param: any = await schema.validateAsync(req.body); @@ -162,8 +170,11 @@ export class RoomController { let exist = await RoomModel.list({ code: param.code }).then((q) => q.getOne()); if (exist && exist.id != param.id) throw { message: "Room " + Language.lang.failed_duplicate }; - let poli = await PoliModel.list({ id: param.poli_id }).then((q) => q.getOne()); - if (!poli) throw { message: "Poli not found" }; + 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 }; @@ -171,7 +182,8 @@ export class RoomController { room.room = param.room; room.code = param.code; room.description = param.description || null; - room.poli = poli; + room.poli = poli || null; + room.department = department; room.status = param.status; room.updated_by = req.auth.data.name; await queryRunner.manager.save(room); diff --git a/src/helpers/orm.ts b/src/helpers/orm.ts index 088d7dd..32d5427 100644 --- a/src/helpers/orm.ts +++ b/src/helpers/orm.ts @@ -1,7 +1,7 @@ import config from 'config'; import { DataSource } from "typeorm"; import { ILogObj, Logger } from 'tslog'; -import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Poli, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage } from 'entity' +import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Poli, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule } from 'entity' export class OrmHelper { static DB: DataSource = null @@ -20,7 +20,7 @@ export class OrmHelper { database: String(config.get("database.database")), synchronize: true, logging: config.get('database.logging'), - entities: [Menu, Administrativu, Aldeia, District, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Poli, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage], + entities: [Menu, Administrativu, Aldeia, District, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Poli, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule], subscribers: [], migrations: [], }) diff --git a/src/model/department.ts b/src/model/department.ts new file mode 100644 index 0000000..afd87d7 --- /dev/null +++ b/src/model/department.ts @@ -0,0 +1,23 @@ +import { Department } from "entity"; +import { SelectQueryBuilder } from "typeorm"; +import CommonHelper from "../helpers/common"; +import { OrmHelper } from "../helpers/orm"; + +export class DepartmentModel { + static async list(filter = {}): Promise> { + const repo = OrmHelper.DB.getRepository(Department); + let whereAttr: string[] = []; + let whereVal: any = {}; + if (filter && Object.keys(filter).length > 0) { + whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr]; + whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal }; + } + + var query = repo.createQueryBuilder("Department"); + if (whereAttr.length != 0) { + query = query.where(whereAttr.join(" and "), whereVal); + } + + return query; + } +} diff --git a/src/model/doctor_schedule.ts b/src/model/doctor_schedule.ts new file mode 100644 index 0000000..6b3db24 --- /dev/null +++ b/src/model/doctor_schedule.ts @@ -0,0 +1,23 @@ +import { DoctorSchedule } from "entity"; +import { SelectQueryBuilder } from "typeorm"; +import CommonHelper from "../helpers/common"; +import { OrmHelper } from "../helpers/orm"; + +export class DoctorScheduleModel { + static async list(filter = {}): Promise> { + const repo = OrmHelper.DB.getRepository(DoctorSchedule); + let whereAttr: string[] = []; + let whereVal: any = {}; + if (filter && Object.keys(filter).length > 0) { + whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr]; + whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal }; + } + + var query = repo.createQueryBuilder("DoctorSchedule").leftJoinAndSelect("DoctorSchedule.room", "Room"); + if (whereAttr.length != 0) { + query = query.where(whereAttr.join(" and "), whereVal); + } + + return query; + } +} diff --git a/src/routes/private.ts b/src/routes/private.ts index 2cbc425..f058c8a 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -18,6 +18,8 @@ import { ServiceClassController } from '../controllers/service_class'; import { ServiceController } from '../controllers/service'; import { ServiceFareController } from '../controllers/service_fare'; import { ServicePackageController } from '../controllers/service_package'; +import { DepartmentController } from '../controllers/department'; +import { DoctorScheduleController } from '../controllers/doctor_schedule'; export class RoutePrivate { static setup(app: express.Application) { @@ -144,5 +146,19 @@ export class RoutePrivate { app.put('/api/service-package/update/:id', ServicePackageController.update) app.delete('/api/service-package/delete/:id/:hard', ServicePackageController.delete) app.put('/api/service-package/restore/:id', ServicePackageController.restore) + + app.get('/api/department/list', DepartmentController.list) + app.post('/api/department/create', DepartmentController.create) + app.get('/api/department/detail/:id', DepartmentController.detail) + app.put('/api/department/update/:id', DepartmentController.update) + app.delete('/api/department/delete/:id/:hard', DepartmentController.delete) + app.put('/api/department/restore/:id', DepartmentController.restore) + + app.get('/api/doctor-schedule/list', DoctorScheduleController.list) + app.post('/api/doctor-schedule/create', DoctorScheduleController.create) + app.get('/api/doctor-schedule/detail/:id', DoctorScheduleController.detail) + app.put('/api/doctor-schedule/update/:id', DoctorScheduleController.update) + app.delete('/api/doctor-schedule/delete/:id/:hard', DoctorScheduleController.delete) + app.put('/api/doctor-schedule/restore/:id', DoctorScheduleController.restore) } } \ No newline at end of file diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 16ec6e3..a987621 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -115,6 +115,7 @@ const doc = { $code: "R001", $description: "Optional description", $poli_id: "uuid-string", + $department_id: "uuid-string", $status: "Y" }, serviceType: { @@ -140,6 +141,19 @@ const doc = { $fare: 500000, $service_ids: ["uuid-string"] }, + department: { + $name: "igd", + $status: { "@enum": ["Y", "N"] } + }, + doctorSchedule: { + $day: "Senin", + $start_time: "08:00", + $end_time: "12:00", + $doctor_id: "uuid-string", + $room_id: "uuid-string", + $quota: "20", + $status: { "@enum": ["Y", "N"] } + }, }, parameters: {