Merge pull request #166 from Sanketika-Obsrv/user_api_update

#OBS-I494: user api update
Sanketika-Obsrv · Jan 13, 2025 · ced6fe5 · ced6fe5
2 parents 0e9c8b4 + a9dfed8
commit ced6fe5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/src/main/controllers/user_create.ts b/src/main/controllers/user_create.ts
@@ -21,6 +21,9 @@ export default {
             }
 
             userRequest.user_name = userRequest.user_name.trim().replace(/\s+/g, '_');
+            const userId = _.get(req, ['session', 'userDetails', 'id']);
+            _.set(userRequest, 'created_by', userId);
+            _.set(userRequest, 'updated_by', userId);
             if (authenticationType === 'keycloak') {
                 const keycloakToken = JSON.parse(req?.session['keycloak-token']);
                 const access_token = keycloakToken.access_token;

diff --git a/src/main/controllers/user_manage_roles.ts b/src/main/controllers/user_manage_roles.ts
@@ -27,13 +27,15 @@ export default {
             const { user_name, roles } = _.get(req, ['body', 'request']);
 
             const isOwner = _.get(req, ['session', 'userDetails', 'is_owner']);
+            const userId = _.get(req, ['session', 'userDetails', 'id']);
             const user = await userService.find({ user_name });
             const updatedRoles = mergeRoles(_.get(user, ['roles']), roles, isOwner);
             const result = await userService.update(
                 { user_name },
                 {
                     roles: updatedRoles,
                     last_updated_on: new Date().toISOString(),
+                    updated_by: userId,
                 },
             );
             res.status(200).json(transform({ id: req.body.id, result: { id: result.id, user_name: result.user_name, roles: result.roles } }));

diff --git a/src/main/controllers/user_manage_status.ts b/src/main/controllers/user_manage_status.ts
@@ -9,6 +9,7 @@ export default {
         try {
             const { user_name, status } = _.get(req, ['body', 'request']);
             const isOwner = _.get(req, ['session', 'userDetails', 'is_owner']);
+            const userId = _.get(req, ['session', 'userDetails', 'id']);
 
             const user = await userService.find({ user_name });
 
@@ -25,6 +26,7 @@ export default {
                 {
                     status: status,
                     last_updated_on: new Date().toISOString(),
+                    updated_by: userId,
                 },
             );
             res.status(200).json(transform({ id: req.body.id, result: { id: result.id, user_name: result.user_name, status: result.status } }));

diff --git a/src/main/controllers/user_update.ts b/src/main/controllers/user_update.ts
@@ -10,6 +10,7 @@ export default {
         try {
             const { user_name, ...updateInfo } = _.get(req, ['body', 'request']);
             const sessionUserName = _.get(req, ['session', 'userDetails', 'user_name']);
+            const userId = _.get(req, ['session', 'userDetails', 'id']);
             if (user_name !== sessionUserName) {
                 res.status(403).json(
                     transform({
@@ -35,6 +36,7 @@ export default {
                 {
                     ...updateInfo,
                     last_updated_on: new Date().toISOString(),
+                    updated_by: userId,
                 },
             );
             res.status(200).json(transform({ id: req.body.id, result: { id: result.id, user_name: result.user_name } }));