Adding auth, media, and messaging.

diff --git a/src/models/role.model.js b/src/models/role.model.js
index 94a475389e17f28df92de74f21f42ac9cfd35551..63e5460901d26b2835adb1cb8c92b1073820eab8 100644 (file)
--- a/src/models/role.model.js
+++ b/src/models/role.model.js
@@ -42,12 +42,10 @@ class Role extends Model {
                r.deleted_by_id,
                r.deleted_at
         FROM phase.roles r
-        WHERE r.is_deleted = false
     `;
     this.base_list_query = `
         SELECT r.id, r.name, r.created_by_id, r.created_at
         FROM phase.roles r
-        WHERE r.is_deleted = false
     `;
     this.default_order_by = 'ORDER BY r.name ASC';
     this.instance = _props => new Role( _props );

diff --git a/src/models/user.model.js b/src/models/user.model.js
index 5e8390e6f3363d2ccbef504c3636fe8607db1c91..4b7e9825a25eb89f8f10fbbc1740653e0b61fcca 100644 (file)
--- a/src/models/user.model.js
+++ b/src/models/user.model.js
@@ -46,9 +46,12 @@ class User extends Model {
     this.base_query = `
         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
+               u.is_active, u.deactivated_by_id, u.deactivated_at, a.password, a.password_salt,
+               json_agg(r.*)
         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,
@@ -56,6 +59,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.instance = _props => new User(_props);
   }