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

fix(surgery-type): searching error

Browse Source
This commit is contained in:
avicenan
2026-05-04 14:37:40 +07:00
parent 1c0474600f
commit 40609b4782
2 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/controllers/surgery_type.ts
View File

@ -17,15 +17,15 @@ const log: Logger<ILogObj> = new Logger({
export class SurgeryTypeController { export class SurgeryTypeController {
static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> { static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
/* /*
#swagger.tags = ['Surgery Type'] #swagger.tags = ['Surgery Type']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' }
#swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' }
#swagger.parameters['page'] = { 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['with_deleted'] = { in: 'query', required: true, type: 'boolean' }
#swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' } #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' }
#swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } } #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } }
*/ */
try { try {
const schema = Joi.object().keys({ const schema = Joi.object().keys({
filter: Joi.string().allow("").optional().label("Filter"), filter: Joi.string().allow("").optional().label("Filter"),
@ -39,15 +39,20 @@ export class SurgeryTypeController {
let param: Paging = await schema.validateAsync(req.query); let param: Paging = await schema.validateAsync(req.query);
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
let filterAny = filter.any && filter.any !== "" ? filter.any : "";
var query = await SurgeryTypeModel.list(filter); let filterObj = { ...filter } as any;
delete filterObj.any;
filterObj = { ...filterObj };
var query = await SurgeryTypeModel.list(filterObj, filterAny);
const offset = (param.page - 1) * param.limit; const offset = (param.page - 1) * param.limit;
let limit = param.limit; let limit = param.limit;
const res_count = query; const res_count = query;
const res_list = query const res_list = query
.orderBy("st." + param.order_field, param.order_direction) .orderBy("SurgeryType." + param.order_field, param.order_direction)
.offset(offset) .offset(offset)
.limit(limit); .limit(limit);
@ -71,10 +76,10 @@ export class SurgeryTypeController {
static async create(req: Request, res: Response, next: NextFunction): Promise<void | Response> { static async create(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
/* /*
#swagger.tags = ['Surgery Type'] #swagger.tags = ['Surgery Type']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/surgery_type" } } } } #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/surgery_type" } } } }
*/ */
try { try {
const schema = Joi.object().keys({ const schema = Joi.object().keys({
name: Joi.string().required().label("Name"), name: Joi.string().required().label("Name"),
@ -99,10 +104,10 @@ export class SurgeryTypeController {
static async detail(req: Request, res: Response, next: NextFunction): Promise<void | Response> { static async detail(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
/* /*
#swagger.tags = ['Surgery Type'] #swagger.tags = ['Surgery Type']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' }
*/ */
try { try {
const schema = Joi.object().keys({ const schema = Joi.object().keys({
id: Joi.string().uuid().required().label("Surgery Type Id"), id: Joi.string().uuid().required().label("Surgery Type Id"),
@ -110,7 +115,7 @@ export class SurgeryTypeController {
let param: { id: string } = await schema.validateAsync(req.params); let param: { id: string } = await schema.validateAsync(req.params);
let surgeryType = await SurgeryTypeModel.list({ "st.id": param.id }).then((q) => q.getOne()); let surgeryType = await SurgeryTypeModel.list({ "SurgeryType.id": param.id }).then((q) => q.getOne());
if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found }; if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found };
@ -124,11 +129,11 @@ export class SurgeryTypeController {
static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> { static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
/* /*
#swagger.tags = ['Surgery Type'] #swagger.tags = ['Surgery Type']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' }
#swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/surgery_type" } } } } #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/surgery_type" } } } }
*/ */
try { try {
req.body.id = req.params["id"]; req.body.id = req.params["id"];
@ -142,7 +147,7 @@ export class SurgeryTypeController {
let exist = await SurgeryTypeModel.list({ name: param.name }).then((q) => q.getOne()); let exist = await SurgeryTypeModel.list({ name: param.name }).then((q) => q.getOne());
if (exist && exist.id != param.id) throw { message: "Surgery Type " + Language.lang.failed_duplicate }; if (exist && exist.id != param.id) throw { message: "Surgery Type " + Language.lang.failed_duplicate };
let surgeryType = await SurgeryTypeModel.list({ "st.id": param.id }).then((q) => q.getOne()); let surgeryType = await SurgeryTypeModel.list({ "SurgeryType.id": param.id }).then((q) => q.getOne());
if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found }; if (!surgeryType) throw { message: "Surgery Type " + Language.lang.failed_not_found };
@ -159,11 +164,11 @@ export class SurgeryTypeController {
static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> { static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> {
/* /*
#swagger.tags = ['Surgery Type'] #swagger.tags = ['Surgery Type']
#swagger.security = [{ "bearerAuth": [] }] #swagger.security = [{ "bearerAuth": [] }]
#swagger.parameters['id'] = { in: 'path', required: true, type: 'string' } #swagger.parameters['id'] = { in: 'path', required: true, type: 'string' }
#swagger.parameters['hard'] = { in: 'path', description: 'Is Hard Delete (ignored; entity has no soft delete)', required: false, type: 'boolean' } #swagger.parameters['hard'] = { in: 'path', description: 'Is Hard Delete (ignored; entity has no soft delete)', required: false, type: 'boolean' }
*/ */
try { try {
const schema = Joi.object().keys({ const schema = Joi.object().keys({
id: Joi.string().uuid().required().label("ID"), id: Joi.string().uuid().required().label("ID"),

29
src/model/surgery_type.ts
View File

@ -4,22 +4,29 @@ import CommonHelper from "../helpers/common";
import { OrmHelper } from "../helpers/orm"; import { OrmHelper } from "../helpers/orm";
export class SurgeryTypeModel { export class SurgeryTypeModel {
static async list(filter = {}): Promise<SelectQueryBuilder<any>> { static async list(filterObj = {}, filterAny: string = ""): Promise<SelectQueryBuilder<any>> {
const repo = OrmHelper.DB.getRepository(SurgeryType); const repo = OrmHelper.DB.getRepository(SurgeryType);
let whereAttr: string[] = []; let whereAttr = [];
let whereVal: any = {}; let whereVal: any = {};
if (filter && Object.keys(filter).length > 0) { if (filterObj) {
const normalized: Record<string, unknown> = {}; const filterResult = CommonHelper.handleQueryFilter(filterObj);
for (const key of Object.keys(filter)) { whereAttr = [...whereAttr, ...filterResult.whereAttr];
const nk = key.replace(/^SurgeryType\./, "st."); whereVal = { ...whereVal, ...filterResult.whereVal };
normalized[nk] = (filter as Record<string, unknown>)[key]; }
if (filterAny && filterAny !== "" && filterAny !== null && filterAny !== undefined) {
const filterResult = CommonHelper.handleFilter({
filter: JSON.stringify({ any: filterAny }),
col_any_eq: [],
col_any_like: ["name"],
});
if (filterResult.whereAttr && filterResult.whereAttr !== "") {
whereAttr = [...whereAttr, filterResult.whereAttr];
whereVal = { ...whereVal, ...filterResult.whereVal };
} }
const parsed = CommonHelper.handleQueryFilter(normalized, "st");
whereAttr = [...whereAttr, ...parsed.whereAttr];
whereVal = { ...whereVal, ...parsed.whereVal };
} }
var query = repo.createQueryBuilder("st"); var query = repo.createQueryBuilder("SurgeryType");
if (whereAttr.length != 0) { if (whereAttr.length != 0) {
query = query.where(whereAttr.join(" and "), whereVal); query = query.where(whereAttr.join(" and "), whereVal);
} }