From c44b3e418314bd7a85f7d4d44ab8e7915045ef6e Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Thu, 21 May 2026 11:21:23 +0900 Subject: [PATCH 01/14] Update production config IPs for new server. Apps: 192.168.80.133, database: 192.168.80.134. --- config/prod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/prod.json b/config/prod.json index 5e84a38..36bc217 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.1.72/service-master-data/", + "host_swagger": "http://192.168.80.133/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", @@ -21,7 +21,7 @@ }, "database": { "engine": "postgres", - "host": "192.168.1.73", + "host": "192.168.80.134", "port": "5432", "username": "saude_production", "password": "y0BZQ6of14OULYnb", From 60f90a536c53d9154064d83cf9f61f94f8b35230 Mon Sep 17 00:00:00 2001 From: avicenan Date: Thu, 21 May 2026 11:48:08 +0900 Subject: [PATCH 02/14] feat(public): new resource master of room number --- src/controllers/room_number.ts | 249 +++++++++++++++++++++++++++++++++ src/helpers/orm.ts | 29 ++-- src/model/room_number.ts | 24 ++++ src/routes/private.ts | 8 ++ src/swagger/builder.js | 4 + 5 files changed, 303 insertions(+), 11 deletions(-) create mode 100644 src/controllers/room_number.ts create mode 100644 src/model/room_number.ts diff --git a/src/controllers/room_number.ts b/src/controllers/room_number.ts new file mode 100644 index 0000000..01f6bba --- /dev/null +++ b/src/controllers/room_number.ts @@ -0,0 +1,249 @@ +import { RoomNumber, 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 { RoomNumberModel } from "../model/room_number"; +import { DepartmentModel } from "../model/department"; +import { OrmHelper } from "../helpers/orm"; +import moment from "moment"; + +const log: Logger = new Logger({ + name: "[RoomNumberController]", + type: "pretty", +}); + +export class RoomNumberController { + static async list(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['RoomNumber'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (number, 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' } + #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) : {}; + const filterAny = filter.any && filter.any !== "" ? String(filter.any) : ""; + let filterObj = { ...filter } as any; + delete filterObj.any; + + var query = await RoomNumberModel.list(filterObj); + + if (filterAny !== "") { + const anyVal = filterAny.includes("%") ? filterAny : `%${filterAny}%`; + query.andWhere("RoomNumber.number ILIKE :any", { any: anyVal }); + } + + const offset = (param.page - 1) * param.limit; + const res_count = query; + const res_list = query + .leftJoinAndSelect("RoomNumber.department", "department") + .orderBy("RoomNumber." + param.order_field, param.order_direction) + .offset(offset) + .limit(param.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 = ['RoomNumber'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/room_number" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + number: Joi.string().max(256).required().label("Room Number"), + department_id: Joi.string().uuid().required().label("Department ID"), + }); + + let param: any = await schema.validateAsync(req.body); + + let exist = await RoomNumberModel.list({ number: param.number }).then((q) => q.getOne()); + if (exist) throw { message: "Room Number " + Language.lang.failed_duplicate }; + + let department = await DepartmentModel.list({ id: param.department_id }).then((q) => q.getOne()); + if (!department) throw { message: "Department not found" }; + + let roomNumber = new RoomNumber(); + roomNumber.number = param.number; + roomNumber.department = department; + roomNumber.created_by = req.auth?.data.name; + roomNumber.updated_by = req.auth?.data.name; + await queryRunner.manager.save(roomNumber); + + await queryRunner.commitTransaction(); + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, roomNumber); + } 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 = ['RoomNumber'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { in: 'path', type: 'string' } + */ + try { + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Room Number Id"), + }); + let param: any = await schema.validateAsync(req.params); + let roomNumber = await RoomNumberModel.list({ "RoomNumber.id": param.id }).then((q) => q.leftJoinAndSelect("RoomNumber.department", "department").getOne()); + if (!roomNumber) throw { message: "Room Number Not Found" }; + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, roomNumber); + } 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 = ['RoomNumber'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { in: 'path', type: 'string' } + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/room_number" } } } } + */ + 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("ID"), + number: Joi.string().max(256).required().label("Room Number"), + department_id: Joi.string().uuid().required().label("Department ID"), + }); + let param: any = await schema.validateAsync(req.body); + + let exist = await RoomNumberModel.list({ number: param.number }).then((q) => q.getOne()); + if (exist && exist.id != param.id) throw { message: "Room Number " + Language.lang.failed_duplicate }; + + let department = await DepartmentModel.list({ id: param.department_id }).then((q) => q.getOne()); + if (!department) throw { message: "Department not found" }; + + let roomNumber = await RoomNumberModel.list({ "RoomNumber.id": param.id }).then((q) => q.getOne()); + if (!roomNumber) throw { message: "Room Number " + Language.lang.failed_not_found }; + + roomNumber.number = param.number; + roomNumber.department = department; + roomNumber.updated_by = req.auth?.data.name; + await queryRunner.manager.save(roomNumber); + + await queryRunner.commitTransaction(); + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, roomNumber); + } 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 = ['RoomNumber'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { in: 'path', required: true, type: 'string' } + #swagger.parameters['hard'] = { in: 'path', 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 roomNumber: RoomNumber = await RoomNumberModel.list({ "RoomNumber.id": param.id }).then((q) => q.getOne()); + if (!roomNumber) throw { message: "Room Number " + Language.lang.failed_not_found }; + roomNumber.deleted_by = req.auth?.data.name; + roomNumber.deleted_at = moment().toDate(); + await OrmHelper.DB.manager.save(roomNumber); + affected = 1; + } else { + const repo = OrmHelper.DB.getRepository(RoomNumber); + 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 = ['RoomNumber'] + #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(RoomNumber); + 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/helpers/orm.ts b/src/helpers/orm.ts index 3c2b69a..ef3fc2e 100644 --- a/src/helpers/orm.ts +++ b/src/helpers/orm.ts @@ -89,15 +89,20 @@ import { EmrRegistrationEmergencyResponsible, DischargeStatusEmergency, EmrInternalConsultation, + Counter, + RoomNumber } from "entity"; export class OrmHelper { - static DB: DataSource = null; + static DB: DataSource = null; - static setup() { - const log: Logger = new Logger({ name: "[OrmHelper]", type: "pretty" }); + static setup() { + const log: Logger = new Logger({ + name: "[OrmHelper]", + type: "pretty", + }); - const engine: "mysql" | "postgres" = config.get("database.engine"); + const engine: "mysql" | "postgres" = config.get("database.engine"); OrmHelper.DB = new DataSource({ type: engine, @@ -196,16 +201,18 @@ export class OrmHelper { Subdistrict, Ward, ResponsiblePartyConsent, - FosterCareHistory + FosterCareHistory, + Counter, + RoomNumber ], subscribers: [], migrations: [], }); - OrmHelper.DB.initialize() - .then(() => { - // here you can start to work with your database - }) - .catch((error: any) => log.error(error)); - } + OrmHelper.DB.initialize() + .then(() => { + // here you can start to work with your database + }) + .catch((error: any) => log.error(error)); + } } diff --git a/src/model/room_number.ts b/src/model/room_number.ts new file mode 100644 index 0000000..0d9cb0b --- /dev/null +++ b/src/model/room_number.ts @@ -0,0 +1,24 @@ +import { RoomNumber } from "entity"; +import { SelectQueryBuilder } from "typeorm"; +import CommonHelper from "../helpers/common"; +import { OrmHelper } from "../helpers/orm"; + +export class RoomNumberModel { + static async list(filter = {}): Promise> { + const repo = OrmHelper.DB.getRepository(RoomNumber); + let whereAttr: string[] = []; + let whereVal: any = {}; + if (filter && Object.keys(filter).length > 0) { + const filterResult = CommonHelper.handleQueryFilter(filter, "RoomNumber"); + whereAttr = [...whereAttr, ...filterResult.whereAttr]; + whereVal = { ...whereVal, ...filterResult.whereVal }; + } + + var query = repo.createQueryBuilder("RoomNumber"); + 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 013fa87..c414546 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -12,6 +12,7 @@ import { NationalityController } from "../controllers/nationality"; import { DiagnosisController } from "../controllers/diagnosis"; import { DiagnosticProcedureController } from "../controllers/diagnostic_procedure"; import { RoomController } from "../controllers/room"; +import { RoomNumberController } from "../controllers/room_number"; import { RoomServicesController } from "../controllers/room_services"; import { ServiceTypeController } from "../controllers/service_type"; import { ServiceClassController } from "../controllers/service_class"; @@ -164,6 +165,13 @@ export class RoutePrivate { app.get("/api/room/get-template-picture", RoomController.gettemplatepicture); app.get("/api/room/list-location", RoomController.listLocation); + app.get("/api/room-number/list", RoomNumberController.list); + app.post("/api/room-number/create", RoomNumberController.create); + app.get("/api/room-number/detail/:id", RoomNumberController.detail); + app.put("/api/room-number/update/:id", RoomNumberController.update); + app.delete("/api/room-number/delete/:id/:hard", RoomNumberController.delete); + app.put("/api/room-number/restore/:id", RoomNumberController.restore); + app.get("/api/laboratory/list", LaboratoryController.list); app.get("/api/pharmacy/list", PharmacyController.list); diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 358e58d..3e3ae9e 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -133,6 +133,10 @@ const doc = { $location: "Room location", $picture: "Room picture name", }, + room_number: { + $number: "101", + $department_id: "uuid-string", + }, laboratory: { $room: "Room name", $code: "R001", From b1bfa9660079e8e00093668a300016cce6689494 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Thu, 21 May 2026 14:40:39 +0900 Subject: [PATCH 03/14] fix(config): update production app and database hosts App server 192.168.80.129, database 192.168.80.130. Co-authored-by: Cursor --- config/prod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/prod.json b/config/prod.json index 36bc217..cbb3564 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.80.133/service-master-data/", + "host_swagger": "http://192.168.80.129/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", @@ -21,7 +21,7 @@ }, "database": { "engine": "postgres", - "host": "192.168.80.134", + "host": "192.168.80.130", "port": "5432", "username": "saude_production", "password": "y0BZQ6of14OULYnb", From a4bc7e4e86a7d318ff70eb0ea77708814c0e13e6 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Thu, 21 May 2026 14:57:58 +0900 Subject: [PATCH 04/14] fix(config): route production URLs through APISIX gateway Point host_swagger to 192.168.80.123; database host unchanged. Co-authored-by: Cursor --- config/prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/prod.json b/config/prod.json index cbb3564..923d39a 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.80.129/service-master-data/", + "host_swagger": "http://192.168.80.123/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", From 9728307ebc2faabd045466c5a18a6f99e3b638e5 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Thu, 21 May 2026 15:27:05 +0900 Subject: [PATCH 05/14] fix(config): add APISIX gateway port 9080 to production URLs host_swagger now uses http://192.168.80.123:9080 for gateway routing. Co-authored-by: Cursor --- config/prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/prod.json b/config/prod.json index 923d39a..3c541f5 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.80.123/service-master-data/", + "host_swagger": "http://192.168.80.123:9080/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", From 3be0d7c3a7a490d82fc76c58be0ac108b13f7522 Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Thu, 21 May 2026 16:44:50 +0900 Subject: [PATCH 06/14] chore(config): migrate production to 3-VM infrastructure - APISIX gateway: 192.168.80.50:9080 - App server upstream: 172.16.10.10 - PostgreSQL: 172.16.10.11 - Bind services to 0.0.0.0 for cross-VM access Co-authored-by: Cursor --- config/prod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/prod.json b/config/prod.json index 3c541f5..9b52433 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.80.123:9080/service-master-data/", + "host_swagger": "http://192.168.80.50:9080/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", @@ -21,7 +21,7 @@ }, "database": { "engine": "postgres", - "host": "192.168.80.130", + "host": "172.16.10.11", "port": "5432", "username": "saude_production", "password": "y0BZQ6of14OULYnb", From 5b6c8e797ec106f8586540051f5da0949e60a835 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 21 May 2026 15:24:20 +0700 Subject: [PATCH 07/14] update --- src/controllers/pharmacy/pharmacy_info.ts | 4 ++-- src/controllers/room.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/controllers/pharmacy/pharmacy_info.ts b/src/controllers/pharmacy/pharmacy_info.ts index 93f65de..d2761d0 100644 --- a/src/controllers/pharmacy/pharmacy_info.ts +++ b/src/controllers/pharmacy/pharmacy_info.ts @@ -13,7 +13,7 @@ import fileUpload from "express-fileupload"; import fs from "fs"; import path from "path"; import { v4 as uuidv4 } from 'uuid'; - +import config from "../../../config/stag.json"; import { PharmacyInfoModel } from "../../model/pharmacy_info"; interface FileUploadRequest extends Request { @@ -669,7 +669,7 @@ export class PharmacyInfoController { name: data.name, address: data.address, phone: data.phone, - logo: 'http://his.shiblysolution.id:3011/service-master-data/uploads/hospital-logo/' + data.logo + logo: config.server.host_swagger + 'service-master-data/uploads/hospital-logo/' + data.logo }; return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, result); diff --git a/src/controllers/room.ts b/src/controllers/room.ts index 278d10c..fb873e7 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -16,6 +16,7 @@ import { v4 as uuidv4 } from "uuid"; import fs from "fs"; import path from "path"; import { Brackets } from "typeorm"; +import config from "../../config/stag.json"; const log: Logger = new Logger({ name: "[RoomController]", @@ -86,7 +87,7 @@ export class RoomController { res_list.withDeleted(); } - const photoBaseUrl = "https://his.shiblysolution.id/service-master-data/uploads/room-picture/"; + const photoBaseUrl = config.server.host_swagger+"uploads/room-picture/"; const current_page = param.page; const total_count_data = await res_count.getCount(); From e89b69ab10c3bb120182474c57ff8d18b38bb52a Mon Sep 17 00:00:00 2001 From: Narul Hidayah Date: Fri, 22 May 2026 10:03:10 +0900 Subject: [PATCH 08/14] chore(config): point gateway and swagger URLs to 10.64.1.10:9080 Co-authored-by: Cursor --- config/prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/prod.json b/config/prod.json index 9b52433..03de87f 100644 --- a/config/prod.json +++ b/config/prod.json @@ -8,7 +8,7 @@ "server": { "port": "7002", "host": "0.0.0.0", - "host_swagger": "http://192.168.80.50:9080/service-master-data/", + "host_swagger": "http://10.64.1.10:9080/service-master-data/", "max_body": "50mb", "max_upload": 104857600, "morgan": "combined", From 9211a215759917d8ed60410bbb083b8993c6643f Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 22 May 2026 10:04:36 +0900 Subject: [PATCH 09/14] remove static url --- src/controllers/room.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/room.ts b/src/controllers/room.ts index fb873e7..c7fff33 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -87,7 +87,7 @@ export class RoomController { res_list.withDeleted(); } - const photoBaseUrl = config.server.host_swagger+"uploads/room-picture/"; + const photoBaseUrl = config.server.host_swagger + "uploads/room-picture/"; const current_page = param.page; const total_count_data = await res_count.getCount(); @@ -511,7 +511,7 @@ export class RoomController { const files = fs.readdirSync(filePath); - const photoBaseUrl = "https://his.shiblysolution.id/service-master-data/uploads/room-picture/template/"; + const photoBaseUrl = config.server.host_swagger + "uploads/room-picture/template/"; const filesWithUrl = files.map((filename, index) => ({ id: index, name: `template/${filename}`, From 7d048eceb302afb1af4e1f4e2d10364b507335ca Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 22 May 2026 10:48:42 +0900 Subject: [PATCH 10/14] feat(master): add medical form --- src/controllers/medical_form.ts | 255 ++++++++++++++++++++++++++++++++ src/model/medical_form.ts | 23 +++ src/routes/private.ts | 8 + src/swagger/builder.js | 4 + 4 files changed, 290 insertions(+) create mode 100644 src/controllers/medical_form.ts create mode 100644 src/model/medical_form.ts diff --git a/src/controllers/medical_form.ts b/src/controllers/medical_form.ts new file mode 100644 index 0000000..38a20a1 --- /dev/null +++ b/src/controllers/medical_form.ts @@ -0,0 +1,255 @@ +import { MedicalForm, 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 { MedicalFormModel } from "../model/medical_form"; +import { OrmHelper } from "../helpers/orm"; +import moment from "moment"; + +const log: Logger = new Logger({ + name: "[MedicalFormController]", + type: "pretty", +}); + +export class MedicalFormController { + static async list(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object', 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 MedicalFormModel.list(filter); + + const offset = (param.page - 1) * param.limit; + let limit = param.limit; + + const res_count = query; + const res_list = query + .orderBy("MedicalForm." + 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 = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + name: Joi.string().max(256).required().label("Name"), + description: Joi.string().max(512).required().label("Description"), + }); + + let param: any = await schema.validateAsync(req.body); + + let filter = { name: param.name }; + let exist = await MedicalFormModel.list(filter).then((q) => q.getOne()); + if (exist) throw { message: "Medical Form " + Language.lang.failed_duplicate }; + + let medicalForm = new MedicalForm(); + medicalForm.name = param.name; + medicalForm.description = param.description; + medicalForm.created_by = req.auth.data.name; + medicalForm.updated_by = req.auth.data.name; + await queryRunner.manager.save(medicalForm); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, medicalForm); + } 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 = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + */ + try { + const schema = Joi.object().keys({ + id: Joi.string().uuid().required().label("Medical Form Id"), + }); + + let param: any = await schema.validateAsync(req.params); + + let medicalForm = await MedicalFormModel.list({ "MedicalForm.id": param.id }).then((q) => q.getOne()); + + if (!medicalForm) throw { message: "Medical Form Not Found" }; + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, medicalForm); + } 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 = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } + */ + 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("Medical Form ID"), + name: Joi.string().max(256).required().label("Name"), + description: Joi.string().max(512).required().label("Description"), + }); + + let param: any = await schema.validateAsync(req.body); + + let filter = { name: param.name }; + let exist = await MedicalFormModel.list(filter).then((q) => q.getOne()); + if (exist && exist.id != param.id) throw { message: "Medical Form " + Language.lang.failed_duplicate }; + + let medicalForm = await MedicalFormModel.list({ "MedicalForm.id": param.id }).then((q) => q.getOne()); + + if (!medicalForm) throw { message: "Medical Form " + Language.lang.failed_not_found }; + + medicalForm.name = param.name; + medicalForm.description = param.description; + medicalForm.updated_by = req.auth.data.name; + await queryRunner.manager.save(medicalForm); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, medicalForm); + } 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 = ['Medical Form'] + #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 medicalForm: MedicalForm = await MedicalFormModel.list({ "MedicalForm.id": param.id }).then((q) => q.getOne()); + + if (!medicalForm) throw { message: "Medical Form " + Language.lang.failed_not_found }; + + medicalForm.deleted_by = req.auth.data.name; + medicalForm.deleted_at = moment().toDate(); + await OrmHelper.DB.manager.save(medicalForm); + affected = 1; + } else { + const repo = OrmHelper.DB.getRepository(MedicalForm); + 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 = ['Medical Form'] + #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(MedicalForm); + + 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/model/medical_form.ts b/src/model/medical_form.ts new file mode 100644 index 0000000..2443874 --- /dev/null +++ b/src/model/medical_form.ts @@ -0,0 +1,23 @@ +import { MedicalForm } from "entity"; +import { SelectQueryBuilder } from "typeorm"; +import CommonHelper from "../helpers/common"; +import { OrmHelper } from "../helpers/orm"; + +export class MedicalFormModel { + static async list(filter = {}): Promise> { + const repo = OrmHelper.DB.getRepository(MedicalForm); + 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("MedicalForm"); + 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 c414546..5e58f78 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -72,6 +72,7 @@ import { SurgeryRoomController } from "../controllers/surgery_room"; import { SurgeryTypeController } from "../controllers/surgery_type"; import { FosterCareHistoryController } from "../controllers/fostercarehistory"; import { FileController } from "../controllers/file/file"; +import { MedicalFormController } from "../controllers/medical_form"; export class RoutePrivate { static setup(app: express.Application) { @@ -258,6 +259,13 @@ export class RoutePrivate { app.delete("/api/measurement-unit/delete/:id/:hard", MeasurementUnitController.delete); app.put("/api/measurement-unit/restore/:id", MeasurementUnitController.restore); + app.get("/api/medical-form/list", MedicalFormController.list); + app.post("/api/medical-form/create", MedicalFormController.create); + app.get("/api/medical-form/detail/:id", MedicalFormController.detail); + app.put("/api/medical-form/update/:id", MedicalFormController.update); + app.delete("/api/medical-form/delete/:id/:hard", MedicalFormController.delete); + app.put("/api/medical-form/restore/:id", MedicalFormController.restore); + app.get("/api/reference-range/list", ReferenceRangeController.list); app.post("/api/reference-range/create", ReferenceRangeController.create); app.get("/api/reference-range/detail/:id", ReferenceRangeController.detail); diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 3e3ae9e..67cdde0 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -214,6 +214,10 @@ const doc = { $unit: "Milligram", $status: { "@enum": ["Y", "N"] }, }, + medical_form: { + $name: "Form name", + $description: "Form description", + }, referenceRange: { $gender: { "@enum": ["male", "female"] }, $age_range_min: "0 | (days)", From 7d856ffcfc44c230b0dcb1ea4f86bd2cc279e644 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 22 May 2026 13:28:01 +0700 Subject: [PATCH 11/14] update: logo in pharmacy info --- src/controllers/pharmacy/pharmacy_info.ts | 29 +++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/controllers/pharmacy/pharmacy_info.ts b/src/controllers/pharmacy/pharmacy_info.ts index d2761d0..3a7e8c7 100644 --- a/src/controllers/pharmacy/pharmacy_info.ts +++ b/src/controllers/pharmacy/pharmacy_info.ts @@ -67,7 +67,11 @@ export class PharmacyInfoController { const current_page = param.page; const total_count_data = await res_count.getCount(); - const list_data = await res_list.getMany(); + const list_data = (await res_list.getMany()).map((item) => ({ + ...item, + logo: config.server.host_swagger + 'uploads/hospital-logo/' + item.logo, + file: item.logo + })); 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); @@ -94,14 +98,19 @@ export class PharmacyInfoController { let data = await PharmacyInfoModel.list({ "id": param.id }).then((q) => q.getOne()); if (!data) throw { message: "Pharmacy Info Not Found" }; - return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, data); + const result = { + ...data, + logo: config.server.host_swagger + 'uploads/hospital-logo/' + data.logo, + file: data.logo + }; + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, result); } 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 export(req: Request, res: Response, next: NextFunction): Promise { /* #swagger.tags = ['Pharmacy - PharmacyInfo'] @@ -331,22 +340,22 @@ export class PharmacyInfoController { munisipiu: Joi.string() .uuid() - .allow('',null) + .allow('', null) .label('Munisipiu'), postu_admin: Joi.string() .uuid() - .allow('',null) + .allow('', null) .label('Postu Admin'), suco: Joi.string() .uuid() - .allow('',null) + .allow('', null) .label('Suco'), aldeia: Joi.string() .uuid() - .allow('',null) + .allow('', null) .label('Aldeia'), @@ -377,9 +386,9 @@ export class PharmacyInfoController { if (data != null) { data.name = param.name, - data.address = param.address + data.address = param.address data.munisipiu = param.munisipiu, - data.postu_admin = param.postu_admin + data.postu_admin = param.postu_admin data.suco = param.suco data.aldeia = param.aldeia data.phone = param.phone @@ -669,7 +678,7 @@ export class PharmacyInfoController { name: data.name, address: data.address, phone: data.phone, - logo: config.server.host_swagger + 'service-master-data/uploads/hospital-logo/' + data.logo + logo: config.server.host_swagger + 'uploads/hospital-logo/' + data.logo }; return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, result); From b0b784836e2d216fc7cf3efb309adafb99cbb521 Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 22 May 2026 15:30:05 +0900 Subject: [PATCH 12/14] fix medical form --- src/controllers/file/file.ts | 5 +++-- src/controllers/medical_form.ts | 38 ++++++++++++++++++++++----------- src/controllers/room.ts | 27 ++++++++++++++++++----- src/swagger/builder.js | 4 ++++ 4 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/controllers/file/file.ts b/src/controllers/file/file.ts index 822dd1a..1466b8e 100644 --- a/src/controllers/file/file.ts +++ b/src/controllers/file/file.ts @@ -57,9 +57,9 @@ export class FileController { } // Validate file type - const allowedMimes = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp']; + const allowedMimes = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/svg+xml', 'image/svg']; if (!allowedMimes.includes(file.mimetype)) { - return ReturnHelper.errorResponse(res, 400, 400, Language.lang.failed_insert, "Invalid file type. Only JPG, PNG, and WEBP are allowed"); + return ReturnHelper.errorResponse(res, 400, 400, Language.lang.failed_insert, "Invalid file type. Only JPG, PNG, WEBP, and SVG are allowed"); } const ext = file.name.split('.'); const name = uuidv4() + '.' + ext[ext.length - 1]; @@ -190,6 +190,7 @@ export class FileController { webp: "image/webp", gif: "image/gif", pdf: "application/pdf", + svg: "image/svg+xml", }; const contentType = mimeMap[ext ?? ""] ?? "application/octet-stream"; diff --git a/src/controllers/medical_form.ts b/src/controllers/medical_form.ts index 38a20a1..fdca118 100644 --- a/src/controllers/medical_form.ts +++ b/src/controllers/medical_form.ts @@ -72,16 +72,19 @@ export class MedicalFormController { static async create(req: Request, res: Response, next: NextFunction): Promise { /* - #swagger.tags = ['Medical Form'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } - */ + #swagger.tags = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } + */ const queryRunner = OrmHelper.DB.createQueryRunner(); await queryRunner.startTransaction(); try { const schema = Joi.object().keys({ + title: Joi.string().max(256).required().label("Title"), name: Joi.string().max(256).required().label("Name"), description: Joi.string().max(512).required().label("Description"), + picture: Joi.string().max(512).allow("").optional().label("Picture"), + status: Joi.string().max(64).required().label("Status"), }); let param: any = await schema.validateAsync(req.body); @@ -91,8 +94,11 @@ export class MedicalFormController { if (exist) throw { message: "Medical Form " + Language.lang.failed_duplicate }; let medicalForm = new MedicalForm(); + medicalForm.title = param.title; medicalForm.name = param.name; medicalForm.description = param.description; + medicalForm.picture = param.picture || null; + medicalForm.status = param.status; medicalForm.created_by = req.auth.data.name; medicalForm.updated_by = req.auth.data.name; await queryRunner.manager.save(medicalForm); @@ -112,10 +118,10 @@ export class MedicalFormController { static async detail(req: Request, res: Response, next: NextFunction): Promise { /* - #swagger.tags = ['Medical Form'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } - */ + #swagger.tags = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + */ try { const schema = Joi.object().keys({ id: Joi.string().uuid().required().label("Medical Form Id"), @@ -137,11 +143,11 @@ export class MedicalFormController { static async update(req: Request, res: Response, next: NextFunction): Promise { /* - #swagger.tags = ['Medical Form'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } - #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } - */ + #swagger.tags = ['Medical Form'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/medical_form" } } } } + */ const queryRunner = OrmHelper.DB.createQueryRunner(); await queryRunner.startTransaction(); @@ -150,8 +156,11 @@ export class MedicalFormController { const schema = Joi.object().keys({ id: Joi.string().uuid().required().label("Medical Form ID"), + title: Joi.string().max(256).required().label("Title"), name: Joi.string().max(256).required().label("Name"), description: Joi.string().max(512).required().label("Description"), + picture: Joi.string().max(512).allow("").optional().label("Picture"), + status: Joi.string().max(64).required().label("Status"), }); let param: any = await schema.validateAsync(req.body); @@ -164,8 +173,11 @@ export class MedicalFormController { if (!medicalForm) throw { message: "Medical Form " + Language.lang.failed_not_found }; + medicalForm.title = param.title; medicalForm.name = param.name; medicalForm.description = param.description; + medicalForm.picture = param.picture || null; + medicalForm.status = param.status; medicalForm.updated_by = req.auth.data.name; await queryRunner.manager.save(medicalForm); diff --git a/src/controllers/room.ts b/src/controllers/room.ts index c7fff33..e504905 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -1,4 +1,4 @@ -import { Room, Paging, Service } from "entity"; +import { Room, Paging, Service, MedicalForm } from "entity"; import { NextFunction, Response } from "express"; import { Request } from "express-jwt"; import Joi from "joi"; @@ -15,7 +15,7 @@ import fileUpload from "express-fileupload"; import { v4 as uuidv4 } from "uuid"; import fs from "fs"; import path from "path"; -import { Brackets } from "typeorm"; +import { Brackets, In } from "typeorm"; import config from "../../config/stag.json"; const log: Logger = new Logger({ @@ -78,6 +78,7 @@ export class RoomController { const res_list = query .leftJoinAndSelect("Room.department", "department") .leftJoinAndSelect("Room.serviceclass", "serviceclass") + .leftJoinAndSelect("Room.medical_forms", "medical_forms") .orderBy("Room." + param.order_field, param.order_direction) .offset(offset) .limit(param.limit); @@ -167,6 +168,7 @@ export class RoomController { location: Joi.string().required().label("Location"), floor: Joi.number().required().label("Floor"), picture: Joi.string().required().label("picture"), + medical_forms: Joi.array().items(Joi.string().uuid()).optional().label("Medical Forms"), }); let param: any = await schema.validateAsync(req.body); @@ -180,6 +182,12 @@ export class RoomController { let serviceclass = await ServiceClassModel.list({ id: param.serviceclass }).then((q) => q.getOne()); if (!serviceclass) throw { message: "Class not found" }; + let medicalForms: MedicalForm[] = []; + if (param.medical_forms && param.medical_forms.length > 0) { + medicalForms = await queryRunner.manager.getRepository(MedicalForm).find({ where: { id: In(param.medical_forms) } }); + if (medicalForms.length !== param.medical_forms.length) throw { message: "Medical Form not found" }; + } + let room = new Room(); room.room = param.room; room.code = param.code; @@ -190,6 +198,7 @@ export class RoomController { room.location = param.location; room.picture = param.picture; room.floor = param.floor; + room.medical_forms = medicalForms; room.created_by = req.auth?.data.name; room.updated_by = req.auth?.data.name; await queryRunner.manager.save(room); @@ -217,7 +226,7 @@ export class RoomController { id: Joi.string().uuid().required().label("Room Id"), }); let param: any = await schema.validateAsync(req.params); - let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.leftJoinAndSelect("Room.department", "department").leftJoinAndSelect("Room.serviceclass", "serviceclass").getOne()); + let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.leftJoinAndSelect("Room.department", "department").leftJoinAndSelect("Room.serviceclass", "serviceclass").leftJoinAndSelect("Room.medical_forms", "medical_forms").getOne()); if (!room) throw { message: "Room Not Found" }; return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, room); } catch (e: unknown) { @@ -249,6 +258,7 @@ export class RoomController { status: Joi.string().required().label("Status"), location: Joi.string().required().label("Location"), picture: Joi.string().required().label("picture"), + medical_forms: Joi.array().items(Joi.string().uuid()).optional().label("Medical Forms"), }); let param: any = await schema.validateAsync(req.body); @@ -264,6 +274,12 @@ export class RoomController { let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne()); if (!room) throw { message: "Room " + Language.lang.failed_not_found }; + let medicalForms: MedicalForm[] = []; + if (param.medical_forms && param.medical_forms.length > 0) { + medicalForms = await queryRunner.manager.getRepository(MedicalForm).find({ where: { id: In(param.medical_forms) } }); + if (medicalForms.length !== param.medical_forms.length) throw { message: "Medical Form not found" }; + } + room.room = param.room; room.code = param.code; room.description = param.description || null; @@ -273,6 +289,7 @@ export class RoomController { room.floor = param.floor; room.location = param.location; room.picture = param.picture; + room.medical_forms = medicalForms; room.updated_by = req.auth?.data.name; await queryRunner.manager.save(room); @@ -400,9 +417,9 @@ export class RoomController { } // Validate file type - const allowedMimes = ["image/jpeg", "image/jpg", "image/png", "image/webp"]; + const allowedMimes = ["image/jpeg", "image/jpg", "image/png", "image/webp", "image/svg+xml", "image/svg"]; if (!allowedMimes.includes(file.mimetype)) { - return ReturnHelper.errorResponse(res, 400, 400, Language.lang.failed_insert, "Invalid file type. Only JPG, PNG, and WEBP are allowed"); + return ReturnHelper.errorResponse(res, 400, 400, Language.lang.failed_insert, "Invalid file type. Only JPG, PNG, WEBP, and SVG are allowed"); } // Normalize path diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 67cdde0..7e63986 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -132,6 +132,7 @@ const doc = { $status: "Y", $location: "Room location", $picture: "Room picture name", + medical_forms: ["uuid-string"], }, room_number: { $number: "101", @@ -215,8 +216,11 @@ const doc = { $status: { "@enum": ["Y", "N"] }, }, medical_form: { + $title: "Form title", $name: "Form name", $description: "Form description", + picture: "Form picture path", + $status: "Y", }, referenceRange: { $gender: { "@enum": ["male", "female"] }, From ce724a03a0fe987206abaadedb480208a63ddbb3 Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 22 May 2026 22:05:23 +0900 Subject: [PATCH 13/14] remove medical form and add specialist form --- src/controllers/room.ts | 25 ++++++++----------------- src/swagger/builder.js | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/controllers/room.ts b/src/controllers/room.ts index e504905..247b345 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -1,4 +1,4 @@ -import { Room, Paging, Service, MedicalForm } from "entity"; +import { Room, Paging, Service, SpecialistForm } from "entity"; import { NextFunction, Response } from "express"; import { Request } from "express-jwt"; import Joi from "joi"; @@ -78,7 +78,6 @@ export class RoomController { const res_list = query .leftJoinAndSelect("Room.department", "department") .leftJoinAndSelect("Room.serviceclass", "serviceclass") - .leftJoinAndSelect("Room.medical_forms", "medical_forms") .orderBy("Room." + param.order_field, param.order_direction) .offset(offset) .limit(param.limit); @@ -168,7 +167,7 @@ export class RoomController { location: Joi.string().required().label("Location"), floor: Joi.number().required().label("Floor"), picture: Joi.string().required().label("picture"), - medical_forms: Joi.array().items(Joi.string().uuid()).optional().label("Medical Forms"), + specialist_form: Joi.string().valid(...Object.values(SpecialistForm)).optional().allow(null, "").label("Specialist Form"), }); let param: any = await schema.validateAsync(req.body); @@ -182,11 +181,7 @@ export class RoomController { let serviceclass = await ServiceClassModel.list({ id: param.serviceclass }).then((q) => q.getOne()); if (!serviceclass) throw { message: "Class not found" }; - let medicalForms: MedicalForm[] = []; - if (param.medical_forms && param.medical_forms.length > 0) { - medicalForms = await queryRunner.manager.getRepository(MedicalForm).find({ where: { id: In(param.medical_forms) } }); - if (medicalForms.length !== param.medical_forms.length) throw { message: "Medical Form not found" }; - } + let room = new Room(); room.room = param.room; @@ -198,7 +193,7 @@ export class RoomController { room.location = param.location; room.picture = param.picture; room.floor = param.floor; - room.medical_forms = medicalForms; + room.specialist_form = param.specialist_form || null; room.created_by = req.auth?.data.name; room.updated_by = req.auth?.data.name; await queryRunner.manager.save(room); @@ -226,7 +221,7 @@ export class RoomController { id: Joi.string().uuid().required().label("Room Id"), }); let param: any = await schema.validateAsync(req.params); - let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.leftJoinAndSelect("Room.department", "department").leftJoinAndSelect("Room.serviceclass", "serviceclass").leftJoinAndSelect("Room.medical_forms", "medical_forms").getOne()); + let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.leftJoinAndSelect("Room.department", "department").leftJoinAndSelect("Room.serviceclass", "serviceclass").getOne()); if (!room) throw { message: "Room Not Found" }; return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, room); } catch (e: unknown) { @@ -258,7 +253,7 @@ export class RoomController { status: Joi.string().required().label("Status"), location: Joi.string().required().label("Location"), picture: Joi.string().required().label("picture"), - medical_forms: Joi.array().items(Joi.string().uuid()).optional().label("Medical Forms"), + specialist_form: Joi.string().valid(...Object.values(SpecialistForm)).optional().allow(null, "").label("Specialist Form"), }); let param: any = await schema.validateAsync(req.body); @@ -274,11 +269,7 @@ export class RoomController { let room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne()); if (!room) throw { message: "Room " + Language.lang.failed_not_found }; - let medicalForms: MedicalForm[] = []; - if (param.medical_forms && param.medical_forms.length > 0) { - medicalForms = await queryRunner.manager.getRepository(MedicalForm).find({ where: { id: In(param.medical_forms) } }); - if (medicalForms.length !== param.medical_forms.length) throw { message: "Medical Form not found" }; - } + room.room = param.room; room.code = param.code; @@ -289,7 +280,7 @@ export class RoomController { room.floor = param.floor; room.location = param.location; room.picture = param.picture; - room.medical_forms = medicalForms; + room.specialist_form = param.specialist_form || null; room.updated_by = req.auth?.data.name; await queryRunner.manager.save(room); diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 7e63986..2e14c8d 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -132,7 +132,7 @@ const doc = { $status: "Y", $location: "Room location", $picture: "Room picture name", - medical_forms: ["uuid-string"], + specialist_form: { "@enum": ["dental", "cardiology", "dermatology", "gynecology", "orthopedics", "neurology"] }, }, room_number: { $number: "101", From 3f5d019ac879c349b1cd219333b23db52516caf3 Mon Sep 17 00:00:00 2001 From: avicenan Date: Fri, 22 May 2026 22:25:17 +0900 Subject: [PATCH 14/14] use take and skip in room list --- src/controllers/room.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/room.ts b/src/controllers/room.ts index 247b345..b00ce94 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -79,8 +79,8 @@ export class RoomController { .leftJoinAndSelect("Room.department", "department") .leftJoinAndSelect("Room.serviceclass", "serviceclass") .orderBy("Room." + param.order_field, param.order_direction) - .offset(offset) - .limit(param.limit); + .take(param.limit) + .skip(offset); if (param.with_deleted) { res_count.withDeleted();