From 5608a78485176b7e367416edf36cf2560ad943a3 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 6 May 2026 16:43:19 +0700 Subject: [PATCH] update: service-user/src/controllers/user.ts --- src/controllers/user.ts | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/controllers/user.ts b/src/controllers/user.ts index 99ac4fe..2947f71 100644 --- a/src/controllers/user.ts +++ b/src/controllers/user.ts @@ -204,14 +204,25 @@ export class UserController { filter: param.filter, col_any_eq: ["email"], col_any_like: ["User.name", "User.username"], - additional_where: "roles.name = :doctor_role_name", + additional_where: "roles.is_doctor = true", }); - // whereVal.doctor_role_name = "Doctor"; - const res_count = userRepository.createQueryBuilder("User").leftJoin("User.roles", "roles").where(whereAttr, whereVal); + const res_count = userRepository + .createQueryBuilder("User") + .leftJoin("User.roles", "roles") + .where(whereAttr, whereVal); const orderExpr = "User." + param.order_field; - const subquery = userRepository.createQueryBuilder("User").select("User.id", "id").addSelect(orderExpr, "_list_doctor_order").leftJoin("User.roles", "roles").where(whereAttr, whereVal).orderBy(orderExpr, param.order_direction).offset(offset).limit(param.limit).distinct(true); + const subquery = userRepository + .createQueryBuilder("User") + .select("User.id", "id") + .addSelect(orderExpr, "_list_doctor_order") + .leftJoin("User.roles", "roles") + .where(whereAttr, whereVal) + .orderBy(orderExpr, param.order_direction) + .offset(offset) + .limit(param.limit) + .distinct(true); const res_list = userRepository .createQueryBuilder("User") @@ -219,7 +230,6 @@ export class UserController { .setParameters(subquery.getParameters()) .leftJoinAndSelect("User.roles", "roles") .leftJoinAndSelect("roles.application", "application") - .where("roles.is_doctor = :is_doctor", { is_doctor: true }) .orderBy("User." + param.order_field, param.order_direction) .distinct(true);