Cleaning up the user model and making sure it returns locked fields.

diff --git a/src/models/user.model.js b/src/models/user.model.js
index 5209a762930b338eb8b5869281ee238d0abf7dda..080e3bf8e7a33eaa5de05d227628a31125c7b7e8 100644 (file)
--- 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);
   }