Adding auth, media, and messaging.

diff --git a/src/models/user.model.js b/src/models/user.model.js
index 4b7e9825a25eb89f8f10fbbc1740653e0b61fcca..3a21bdb3a8b6fa8b136d29fe13ba4295623196ad 100644 (file)
--- a/src/models/user.model.js
+++ b/src/models/user.model.js
@@ -52,6 +52,7 @@ class User extends Model {
             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
+        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.base_list_query = `
         SELECT u.id, u.email, u.first_name, u.middle_name, u.last_name, u.initials, u.nickname,
@@ -59,7 +60,7 @@ class User extends Model {
         FROM phase.users u
     `;
     this.default_order_by = 'ORDER BY u.email ASC';
-    this.group_by = 'GROUP BY u.id';
+    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);
   }