Refactor profile.

maruf-me · Feb 23, 2022 · 866f62d · 866f62d
1 parent 4883cf7
commit 866f62d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/modules/platform/profile/profile.controller.js b/src/modules/platform/profile/profile.controller.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const Profile = require('./profile.model');
 const Permission = require(path.join(process.cwd(), 'src/modules/platform/permission/permission.model'));
+const User = require(path.join(process.cwd(), 'src/modules/platform/user/user.model'));
 const ProfilePermission = require(path.join(process.cwd(), 'src/modules/platform/permission/profile-permission.model'));
 const { makeCustomSlug } = require(path.join(process.cwd(), 'src/modules/core/services/slug'));
 const { Op } = require('sequelize');
@@ -64,7 +65,17 @@ async function getProfiles(req, res) {
                             attributes: ["id", "title", "slug"]
                         }
                     ]
-                }
+                },
+                {
+                    model: User,
+                    as: "createdByUser",
+                    attributes: ["id", "first_name", "last_name"]
+                },
+                {
+                    model: User,
+                    as: "updatedByUser",
+                    attributes: ["id", "first_name", "last_name"]
+                },
             ]
         });
 
@@ -106,8 +117,18 @@ async function getProfile(req, res) {
                             as: "permission",
                             attributes: ["id", "title", "slug"]
                         }
-                    ]
-                }
+                    ],
+                },
+                {
+                    model: User,
+                    as: "createdByUser",
+                    attributes: ["id", "first_name", "last_name"]
+                },
+                {
+                    model: User,
+                    as: "updatedByUser",
+                    attributes: ["id", "first_name", "last_name"]
+                },
             ]
         });
 

diff --git a/src/modules/platform/user/user.model.js b/src/modules/platform/user/user.model.js
@@ -91,6 +91,9 @@ Profile.belongsTo(User, { as: "updatedByUser", foreignKey: "updated_by" });
 Role.hasMany(User, { as: 'users', foreignKey: 'role_id' });
 User.belongsTo(Role, { as: 'role', foreignKey: 'role_id' });
 
+Role.belongsTo(User, { as: "createdByUser", foreignKey: "created_by" });
+Role.belongsTo(User, { as: "updatedByUser", foreignKey: "updated_by" });
+
 Permission.belongsTo(User, { as: 'createdByUser', foreignKey: 'created_by' });
 Permission.belongsTo(User, { as: 'updatedByUser', foreignKey: 'created_by' });