diff --git a/src/controllers/doctor_favorite_item.ts b/src/controllers/doctor_favorite_item.ts deleted file mode 100644 index fdfccc2..0000000 --- a/src/controllers/doctor_favorite_item.ts +++ /dev/null @@ -1,219 +0,0 @@ -import { DoctorFavoriteItem, ItemMaster, User } from "entity"; -import { NextFunction, Response } from "express"; -import { Request } from "express-jwt"; -import Joi from "joi"; -import { ILogObj, Logger } from "tslog"; -import { ReturnHelper } from "../helpers/express/return"; -import { Language } from "../langs/lang"; -import { DoctorFavoriteItemModel } from "../model/doctor_favorite_item"; -import { OrmHelper } from "../helpers/orm"; - -const log: Logger = new Logger({ - name: "[DoctorFavoriteItemController]", - type: "pretty", -}); - -export class DoctorFavoriteItemController { - static async list(req: Request, res: Response, next: NextFunction): Promise { - /* - #swagger.tags = ['Doctor Favorite Item'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['doctor_id'] = { in: 'query', required: true, type: 'string' } - #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } - #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } - #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } - #swagger.parameters['order_field'] = { in: 'query', required: false, type: 'string' } - #swagger.parameters['order_direction'] = { in: 'query', required: false, schema: { '@enum': ['ASC', 'DESC'] } } - */ - try { - const schema = Joi.object().keys({ - doctor_id: Joi.string().uuid().required().label("Doctor ID"), - filter: Joi.string().allow("").optional().label("Filter"), - page: Joi.number().required().min(1).label("Page"), - limit: Joi.number().required().min(1).label("Limit"), - order_field: Joi.string().optional().label("Order Field"), - order_direction: Joi.string().allow("asc", "desc").optional().label("Order Direction"), - }); - - let param: any = await schema.validateAsync(req.query); - let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; - filter.doctor_id = param.doctor_id; - - const query = await DoctorFavoriteItemModel.list(filter); - - const orderField = param.order_field || "id"; - const orderDirection = param.order_direction || "asc"; - - const total_count_data = await query.getCount(); - const offset = (param.page - 1) * param.limit; - const rows = await query - .orderBy("DoctorFavoriteItem." + orderField, orderDirection) - .offset(offset) - .limit(param.limit) - .getMany(); - - const favorites = rows - .map((row: any) => row.item_master) - .filter((item: any) => !!item); - - const list_data = favorites; - const count_data = favorites.length; - const current_page = param.page; - - 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 Favorite Item'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/doctorFavoriteItem" } } } } - */ - const queryRunner = OrmHelper.DB.createQueryRunner(); - await queryRunner.startTransaction(); - try { - const schema = Joi.object().keys({ - doctor_id: Joi.string().uuid().required().label("Doctor ID"), - item_master_id: Joi.string().uuid().required().label("Item Master ID"), - }); - - let param: any = await schema.validateAsync(req.body); - - const doctor = await OrmHelper.DB.getRepository(User).findOne({ where: { id: param.doctor_id } }); - if (!doctor) throw { message: "Doctor (User) " + Language.lang.failed_not_found }; - - const itemMaster = await OrmHelper.DB.getRepository(ItemMaster).findOne({ where: { id: param.item_master_id } }); - if (!itemMaster) throw { message: "Item Master " + Language.lang.failed_not_found }; - - const exist = await DoctorFavoriteItemModel.list({ doctor_id: param.doctor_id, item_master_id: param.item_master_id }).then((q) => q.getOne()); - if (exist) throw { message: "Doctor Favorite Item " + Language.lang.failed_duplicate }; - - let doctorFavoriteItem = new DoctorFavoriteItem(); - doctorFavoriteItem.doctor = doctor; - doctorFavoriteItem.item_master = itemMaster; - doctorFavoriteItem.created_by = req.auth.data.name; - doctorFavoriteItem.updated_by = req.auth.data.name; - await queryRunner.manager.save(doctorFavoriteItem); - - await queryRunner.commitTransaction(); - - return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, doctorFavoriteItem); - } catch (e: unknown) { - await queryRunner.rollbackTransaction(); - log.error(e); - const err = e as Error; - return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_insert, err.message); - } finally { - await queryRunner.release(); - } - } - - static async detail(req: Request, res: Response, next: NextFunction): Promise { - /* - #swagger.tags = ['Doctor Favorite Item'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } - */ - try { - const schema = Joi.object().keys({ - id: Joi.string().uuid().required().label("Doctor Favorite Item Id"), - }); - - let param: any = await schema.validateAsync(req.params); - - let doctorFavoriteItem = await DoctorFavoriteItemModel.list({ "DoctorFavoriteItem.id": param.id }).then((q) => q.getOne()); - - if (!doctorFavoriteItem) throw { message: "Doctor Favorite Item " + Language.lang.failed_not_found }; - - return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, doctorFavoriteItem); - } 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 Favorite Item'] - #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['id'] = { description: '', in: 'path', type: 'string' } - #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/doctorFavoriteItem" } } } } - */ - 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 Favorite Item ID"), - doctor_id: Joi.string().uuid().required().label("Doctor ID"), - item_master_id: Joi.string().uuid().required().label("Item Master ID"), - }); - - let param: any = await schema.validateAsync(req.body); - - const doctor = await OrmHelper.DB.getRepository(User).findOne({ where: { id: param.doctor_id } }); - if (!doctor) throw { message: "Doctor (User) " + Language.lang.failed_not_found }; - - const itemMaster = await OrmHelper.DB.getRepository(ItemMaster).findOne({ where: { id: param.item_master_id } }); - if (!itemMaster) throw { message: "Item Master " + Language.lang.failed_not_found }; - - let doctorFavoriteItem = await DoctorFavoriteItemModel.list({ "DoctorFavoriteItem.id": param.id }).then((q) => q.getOne()); - if (!doctorFavoriteItem) throw { message: "Doctor Favorite Item " + Language.lang.failed_not_found }; - - const exist = await DoctorFavoriteItemModel.list({ doctor_id: param.doctor_id, item_master_id: param.item_master_id }).then((q) => q.getOne()); - if (exist && exist.id != param.id) throw { message: "Doctor Favorite Item " + Language.lang.failed_duplicate }; - - doctorFavoriteItem.doctor = doctor; - doctorFavoriteItem.item_master = itemMaster; - doctorFavoriteItem.updated_by = req.auth.data.name; - await queryRunner.manager.save(doctorFavoriteItem); - - await queryRunner.commitTransaction(); - - return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, doctorFavoriteItem); - } catch (e: unknown) { - await queryRunner.rollbackTransaction(); - log.error(e); - const err = e as Error; - return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_update, err.message); - } finally { - await queryRunner.release(); - } - } - - static async delete(req: Request, res: Response, next: NextFunction): Promise { - /* - #swagger.tags = ['Doctor Favorite Item'] - #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: { id: string } = await schema.validateAsync(req.params); - - const repo = OrmHelper.DB.getRepository(DoctorFavoriteItem); - const 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); - } - } -} diff --git a/src/controllers/doctor_item.ts b/src/controllers/doctor_item.ts new file mode 100644 index 0000000..86b5d39 --- /dev/null +++ b/src/controllers/doctor_item.ts @@ -0,0 +1,292 @@ +import { DoctorItem, GenericName, ItemMaster, ItemPrice, ItemTypeDetail, User, SellingPricePercentage } from "entity"; +import { NextFunction, Response } from "express"; +import { Request } from "express-jwt"; +import Joi from "joi"; +import { ILogObj, Logger } from "tslog"; +import { ReturnHelper } from "../helpers/express/return"; +import { Language } from "../langs/lang"; +import { DoctorItemModel } from "../model/doctor_item"; +import { OrmHelper } from "../helpers/orm"; +import CommonHelper from "../helpers/common"; + +const log: Logger = new Logger({ + name: "[DoctorItemController]", + type: "pretty", +}); + +export class DoctorItemController { + static async listAll(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Item'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['doctor_id'] = { in: 'query', required: true, type: 'string' } + #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } + #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['order_field'] = { in: 'query', required: false, type: 'string' } + #swagger.parameters['order_direction'] = { in: 'query', required: false, schema: { '@enum': ['ASC', 'DESC'] } } + */ + try { + const schema = Joi.object().keys({ + doctor_id: Joi.string().uuid().required().label("Doctor ID"), + filter: Joi.string().allow("").optional().label("Filter"), + page: Joi.number().required().min(1).label("Page"), + limit: Joi.number().required().min(1).label("Limit"), + order_field: Joi.string().optional().label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").optional().label("Order Direction"), + }); + + let param: any = await schema.validateAsync(req.query); + let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + + const repo = OrmHelper.DB.getRepository(ItemMaster); + + let whereAttr: string[] = []; + let whereVal: any = {}; + + if (filter && Object.keys(filter).length > 0) { + const filterResult = CommonHelper.handleQueryFilter(filter, "item_master"); + whereAttr = [...whereAttr, ...filterResult.whereAttr]; + whereVal = { ...whereVal, ...filterResult.whereVal }; + } + + const orderField = param.order_field || "id"; + const orderDirection = param.order_direction || "asc"; + + const offset = (param.page - 1) * param.limit; + + let res_count = repo.createQueryBuilder("item_master") + .leftJoin("item_master.generic_name", "generic_name") + .leftJoin("item_master.type_detail", "item_type_detail") + .leftJoin(ItemPrice, "item_price", "item_price.item_master_id = item_master.id") + .leftJoin(SellingPricePercentage, "selling_price_percentage", "selling_price_percentage.item_master_id = item_master.id") + .leftJoin( + DoctorItem, + "doctor_item", + "doctor_item.item_master_id = item_master.id AND doctor_item.doctor_id = :doctorId", + { doctorId: param.doctor_id } + ); + + if (whereAttr.length !== 0) { + res_count = res_count.where(whereAttr.join(" and "), whereVal); + } + + let res_list = repo.createQueryBuilder("item_master") + .leftJoin("item_master.generic_name", "generic_name") + .leftJoin("item_master.type_detail", "item_type_detail") + .leftJoin(ItemPrice, "item_price", "item_price.item_master_id = item_master.id") + .leftJoin(SellingPricePercentage, "selling_price_percentage", "selling_price_percentage.item_master_id = item_master.id") + .leftJoin( + DoctorItem, + "doctor_item", + "doctor_item.item_master_id = item_master.id AND doctor_item.doctor_id = :doctorId", + { doctorId: param.doctor_id } + ); + + if (whereAttr.length !== 0) { + res_list = res_list.where(whereAttr.join(" and "), whereVal); + } + + res_list = res_list + .select([ + "item_master.id as item_id", + "item_master.item_name as item_name", + "generic_name.generic_name as item_generic_name", + "item_type_detail.type_detail_name as item_type", + // "pharmacy_stock", + // "storage_stock", + "ROUND(CASE WHEN selling_price_percentage.percentage IS NULL " + + "THEN COALESCE(item_price.selling_price, 0) " + + "ELSE COALESCE(item_price.selling_price, 0) + (COALESCE(item_price.selling_price, 0) * COALESCE(selling_price_percentage.percentage, 0) / 100) END, 2) as price", + "doctor_item.id as fav_id", + ]) + .orderBy("item_master." + orderField, orderDirection) + .offset(offset) + .limit(param.limit) + + const current_page = param.page; + const total_count_data = await res_count.getCount(); + const list_data = await res_list.getRawMany(); + 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 listFav(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Item'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['doctor_id'] = { in: 'query', required: true, type: 'string' } + #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } + #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['order_field'] = { in: 'query', required: false, type: 'string' } + #swagger.parameters['order_direction'] = { in: 'query', required: false, schema: { '@enum': ['ASC', 'DESC'] } } + */ + try { + const schema = Joi.object().keys({ + doctor_id: Joi.string().uuid().required().label("Doctor ID"), + filter: Joi.string().allow("").optional().label("Filter"), + page: Joi.number().required().min(1).label("Page"), + limit: Joi.number().required().min(1).label("Limit"), + order_field: Joi.string().optional().label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").optional().label("Order Direction"), + }); + + let param: any = await schema.validateAsync(req.query); + let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + + const repo = OrmHelper.DB.getRepository(ItemMaster); + + let whereAttr: string[] = []; + let whereVal: any = {}; + + if (filter && Object.keys(filter).length > 0) { + const filterResult = CommonHelper.handleQueryFilter(filter, "item_master"); + whereAttr = [...whereAttr, ...filterResult.whereAttr]; + whereVal = { ...whereVal, ...filterResult.whereVal }; + } + + const orderField = param.order_field || "id"; + const orderDirection = param.order_direction || "asc"; + + const offset = (param.page - 1) * param.limit; + + let res_count = repo.createQueryBuilder("item_master") + .innerJoin( + DoctorItem, + "doctor_item", + "doctor_item.item_master_id = item_master.id AND doctor_item.doctor_id = :doctorId", + { doctorId: param.doctor_id } + ) + .leftJoin("item_master.generic_name", "generic_name") + .leftJoin("item_master.type_detail", "item_type_detail") + .leftJoin(ItemPrice, "item_price", "item_price.item_master_id = item_master.id") + .leftJoin(SellingPricePercentage, "selling_price_percentage", "selling_price_percentage.item_master_id = item_master.id"); + + if (whereAttr.length !== 0) { + res_count = res_count.where(whereAttr.join(" and "), whereVal); + } + + let res_list = repo.createQueryBuilder("item_master") + .innerJoin( + DoctorItem, + "doctor_item", + "doctor_item.item_master_id = item_master.id AND doctor_item.doctor_id = :doctorId", + { doctorId: param.doctor_id } + ) + .leftJoin("item_master.generic_name", "generic_name") + .leftJoin("item_master.type_detail", "item_type_detail") + .leftJoin(ItemPrice, "item_price", "item_price.item_master_id = item_master.id") + .leftJoin(SellingPricePercentage, "selling_price_percentage", "selling_price_percentage.item_master_id = item_master.id"); + + if (whereAttr.length !== 0) { + res_list = res_list.where(whereAttr.join(" and "), whereVal); + } + + res_list = res_list + .select([ + "item_master.id as item_id", + "item_master.item_name as item_name", + "generic_name.generic_name as item_generic_name", + "item_type_detail.type_detail_name as item_type", + "ROUND(CASE WHEN selling_price_percentage.percentage IS NULL " + + "THEN COALESCE(item_price.selling_price, 0) " + + "ELSE COALESCE(item_price.selling_price, 0) + (COALESCE(item_price.selling_price, 0) * COALESCE(selling_price_percentage.percentage, 0) / 100) END, 2) as price", + "doctor_item.id as fav_id", + ]) + .orderBy("item_master." + orderField, orderDirection) + .offset(offset) + .limit(param.limit); + + const current_page = param.page; + const total_count_data = await res_count.getCount(); + const list_data = await res_list.getRawMany(); + 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 selectFav(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Item'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/doctorItem" } } } } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + doctor_id: Joi.string().uuid().required().label("Doctor ID"), + item_master_id: Joi.string().uuid().required().label("Item Master ID"), + }); + + let param: any = await schema.validateAsync(req.body); + + const doctor = await OrmHelper.DB.getRepository(User).findOne({ where: { id: param.doctor_id } }); + if (!doctor) throw { message: "Doctor (User) " + Language.lang.failed_not_found }; + + const itemMaster = await OrmHelper.DB.getRepository(ItemMaster).findOne({ where: { id: param.item_master_id } }); + if (!itemMaster) throw { message: "Item Master " + Language.lang.failed_not_found }; + + const exist = await DoctorItemModel.list({ doctor_id: param.doctor_id, item_master_id: param.item_master_id }).then((q) => q.getOne()); + if (exist) throw { message: "Doctor Item " + Language.lang.failed_duplicate }; + + let doctorItem = new DoctorItem(); + doctorItem.doctor = doctor; + doctorItem.item_master = itemMaster; + doctorItem.created_by = req.auth.data.name; + doctorItem.updated_by = req.auth.data.name; + await queryRunner.manager.save(doctorItem); + + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, doctorItem); + } catch (e: unknown) { + await queryRunner.rollbackTransaction(); + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_insert, err.message); + } finally { + await queryRunner.release(); + } + } + + static async removeFav(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Doctor Item'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['fav_id'] = { in: 'path', required: true, type: 'string' } + */ + try { + const schema = Joi.object().keys({ + fav_id: Joi.string().uuid().required().label("Favorite ID"), + }); + + const param: { fav_id: string } = await schema.validateAsync(req.params); + + const repo = OrmHelper.DB.getRepository(DoctorItem); + const affected = (await repo.delete({ id: param.fav_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); + } + } +} diff --git a/src/helpers/orm.ts b/src/helpers/orm.ts index 63e49e5..088034b 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, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift, HospitalInformation, ItemOrigin, ItemType, ItemTypeDetail, Unit, ItemCategory, ItemStatus, UsageInstructions, UsageTime, ItemClass, ItemClassDetail, GenericName, Factory, Supplier, FactoryToSupplier, ItemMaster, ItemGroup, PharmacyInfo, ItemPrice, SellingPricePercentage, PatientGroup, PatientGuarantor, InitialStock, DoctorFavoriteItem, DoctorItemPackage } from 'entity' +import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift, HospitalInformation, ItemOrigin, ItemType, ItemTypeDetail, Unit, ItemCategory, ItemStatus, UsageInstructions, UsageTime, ItemClass, ItemClassDetail, GenericName, Factory, Supplier, FactoryToSupplier, ItemMaster, ItemGroup, PharmacyInfo, ItemPrice, SellingPricePercentage, PatientGroup, PatientGuarantor, InitialStock, DoctorItem, DoctorItemPackage } from 'entity' export class OrmHelper { static DB: DataSource = null @@ -42,7 +42,7 @@ export class OrmHelper { PatientGroup, PatientGuarantor, InitialStock, - DoctorFavoriteItem, + DoctorItem, DoctorItemPackage ], subscribers: [], diff --git a/src/model/doctor_favorite_item.ts b/src/model/doctor_item.ts similarity index 64% rename from src/model/doctor_favorite_item.ts rename to src/model/doctor_item.ts index be13b9b..beb6d81 100644 --- a/src/model/doctor_favorite_item.ts +++ b/src/model/doctor_item.ts @@ -1,24 +1,22 @@ -import { DoctorFavoriteItem } from "entity"; +import { DoctorItem } from "entity"; import { SelectQueryBuilder } from "typeorm"; import CommonHelper from "../helpers/common"; import { OrmHelper } from "../helpers/orm"; -export class DoctorFavoriteItemModel { +export class DoctorItemModel { static async list(filter = {}): Promise> { - const repo = OrmHelper.DB.getRepository(DoctorFavoriteItem); + const repo = OrmHelper.DB.getRepository(DoctorItem); let whereAttr: string[] = []; let whereVal: any = {}; if (filter && Object.keys(filter).length > 0) { - const filterResult = CommonHelper.handleQueryFilter(filter, "DoctorFavoriteItem"); + const filterResult = CommonHelper.handleQueryFilter(filter, "DoctorItem"); whereAttr = [...whereAttr, ...filterResult.whereAttr]; whereVal = { ...whereVal, ...filterResult.whereVal }; } let query = repo - .createQueryBuilder("DoctorFavoriteItem") - .leftJoinAndSelect("DoctorFavoriteItem.doctor", "Doctor") - .leftJoinAndSelect("DoctorFavoriteItem.item_master", "ItemMaster"); + .createQueryBuilder("DoctorItem") if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); diff --git a/src/model/doctor_item_package.ts b/src/model/doctor_item_package.ts index 0a2fd86..7d3af7e 100644 --- a/src/model/doctor_item_package.ts +++ b/src/model/doctor_item_package.ts @@ -4,7 +4,7 @@ import CommonHelper from "../helpers/common"; import { OrmHelper } from "../helpers/orm"; export class DoctorItemPackageModel { - static async list(filter = {}): Promise> { + static async list(filter = {}, filterAny: string = ""): Promise> { const repo = OrmHelper.DB.getRepository(DoctorItemPackage); let whereAttr: string[] = []; let whereVal: any = {}; @@ -14,11 +14,24 @@ export class DoctorItemPackageModel { whereAttr = [...whereAttr, ...filterResult.whereAttr]; whereVal = { ...whereVal, ...filterResult.whereVal }; } + if (filterAny && filterAny !== "" && filterAny !== null && filterAny !== undefined) { + const filterResult = CommonHelper.handleFilter({ + filter: JSON.stringify({ any: filterAny }), + col_any_eq: [], + col_any_like: ["DoctorItemPackage.name"], + }); + + if (filterResult.whereAttr && filterResult.whereAttr !== "") { + whereAttr = [...whereAttr, filterResult.whereAttr]; + whereVal = { ...whereVal, ...filterResult.whereVal }; + } + } let query = repo .createQueryBuilder("DoctorItemPackage") .leftJoinAndSelect("DoctorItemPackage.doctor", "Doctor") - .leftJoinAndSelect("DoctorItemPackage.items", "ItemMaster"); + .leftJoinAndSelect("DoctorItemPackage.items", "ItemMaster") + .leftJoinAndSelect("ItemMaster.generic_name", "GenericName"); if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); diff --git a/src/routes/private.ts b/src/routes/private.ts index d15d285..a87fa61 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -20,7 +20,6 @@ import { ServiceFareController } from '../controllers/service_fare'; import { ServicePackageController } from '../controllers/service_package'; import { DepartmentController } from '../controllers/department'; import { DoctorScheduleController } from '../controllers/doctor_schedule'; -import { DoctorFavoriteItemController } from '../controllers/doctor_favorite_item'; import { DoctorItemPackageController } from '../controllers/doctor_item_package'; import { MeasurementUnitController } from '../controllers/measurement_unit'; import { ReferenceRangeController } from '../controllers/reference_range'; @@ -54,6 +53,7 @@ import { GenericNameController } from '../controllers/pharmacy/generic_name'; import { RefferalHospital } from 'entity'; import { RefferalHospitalController } from '../controllers/refferal_hospital'; import { InitialStockController } from '../controllers/pharmacy/initial_stock'; +import { DoctorItemController } from '../controllers/doctor_item'; export class RoutePrivate { static setup(app: express.Application) { @@ -199,11 +199,10 @@ export class RoutePrivate { app.delete('/api/doctor-schedule/delete/:id/:hard', DoctorScheduleController.delete) app.put('/api/doctor-schedule/restore/:id', DoctorScheduleController.restore) - app.get('/api/doctor-favorite-item/list', DoctorFavoriteItemController.list) - app.post('/api/doctor-favorite-item/create', DoctorFavoriteItemController.create) - app.get('/api/doctor-favorite-item/detail/:id', DoctorFavoriteItemController.detail) - app.put('/api/doctor-favorite-item/update/:id', DoctorFavoriteItemController.update) - app.delete('/api/doctor-favorite-item/delete/:id', DoctorFavoriteItemController.delete) + app.get('/api/doctor-item/list', DoctorItemController.listAll) + app.get('/api/doctor-item/list-fav', DoctorItemController.listFav) + app.post('/api/doctor-item/select-fav', DoctorItemController.selectFav) + app.delete('/api/doctor-item/remove-fav/:fav_id', DoctorItemController.removeFav) app.get('/api/doctor-item-package/list', DoctorItemPackageController.list) app.post('/api/doctor-item-package/create', DoctorItemPackageController.create) diff --git a/src/swagger/builder.js b/src/swagger/builder.js index b1a100e..9feac7f 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -161,7 +161,7 @@ const doc = { $quota: "20", $status: { "@enum": ["Y", "N"] } }, - doctorFavoriteItem: { + doctorItem: { $doctor_id: "uuid-string", $item_master_id: "uuid-string" },