From 743de3043b9bbd171b526b8222222f8ef32253df Mon Sep 17 00:00:00 2001 From: charleswrayjr Date: Tue, 16 Sep 2025 15:14:31 -0500 Subject: [PATCH] Cleaning up the user model and making sure it returns locked fields. --- src/models/user.model.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/models/user.model.js b/src/models/user.model.js index 5209a76..080e3bf 100644 --- a/src/models/user.model.js +++ b/src/models/user.model.js @@ -47,11 +47,10 @@ class User extends Model { SELECT u.id, u.email, u.first_name, u.middle_name, u.last_name, u.initials, u.nickname, u.created_by_id, u.created_at, u.is_deleted, u.deleted_by_id, u.deleted_at, u.is_active, u.deactivated_by_id, u.deactivated_at, a.password, a.password_salt, - json_agg(r.*) as roles + a.is_locked, a.locked_date, + (select json_agg(r) from phase.user_roles ur inner join phase.roles r on ur.role_id = r.id ) as roles FROM phase.users u inner join phase.authentication a on u.id = a.user_id - inner join phase.user_roles ur on u.id = ur.user_id - inner join phase.roles r on ur.role_id = r.id `; this.base_list_query = ` SELECT u.id, u.email, u.first_name, u.middle_name, u.last_name, u.initials, u.nickname, @@ -59,7 +58,6 @@ class User extends Model { FROM phase.users u `; this.default_order_by = 'ORDER BY u.email ASC'; - this.group_by = 'group by u.id, u.email, u.first_name, u.middle_name, u.last_name, u.initials, u.nickname, u.created_by_id, u.created_at, u.is_deleted, u.deleted_by_id, u.deleted_at, u.is_active, u.deactivated_by_id, u.deactivated_at, a.password, a.password_salt'; this.instance = _props => new User(_props); } -- 2.43.0