Merge branch 'develop' into iss2223-tests

Author: prakashchoudhary07

constants/logs.ts

@@ -10,6 +10,9 @@ export const logType = {
   TASKS_MISSED_UPDATES_ERRORS: "TASKS_MISSED_UPDATES_ERRORS",
   DISCORD_INVITES: "DISCORD_INVITES",
   EXTERNAL_SERVICE: "EXTERNAL_SERVICE",
+  ADD_UNVERIFIED_ROLE: "ADD_UNVERIFIED_ROLE",
+  REMOVE_ROLE_FROM_USER_SUCCESS: "REMOVE_ROLE_FROM_USER_SUCCESS",
+  REMOVE_ROLE_FROM_USER_FAILED: "REMOVE_ROLE_FROM_USER_FAILED",
   EXTENSION_REQUESTS: "extensionRequests",
   TASK: "task",
   TASK_REQUESTS: "taskRequests",

controllers/awsAccess.ts

@@ -21,6 +21,12 @@ export const addUserToAWSGroup = async (req, res) => {
       if (awsUserId === null){
         // We need to create the user in AWS before and then fetch its Id
         userCreationResponse = await createUser(userInfoData.user.username, userInfoData.user.email);
+        
+        if (userCreationResponse.conflict){
+          return res.status(400).json({
+            error: `Username or Email is already being used, please use another email / username for creating account in AWS`
+          })
+        }
         awsUserId = userCreationResponse.UserId;
       }
 

controllers/extensionRequests.js

@@ -74,7 +74,7 @@ const createTaskExtensionRequest = async (req, res) => {
       type: "extensionRequests",
       meta: {
         taskId: extensionBody.taskId,
-        createdBy: req.userData.id,
+        userId: req.userData.id,
       },
       body: {
         extensionRequestId: extensionRequest.id,

controllers/extensionRequestsv2.ts

@@ -84,7 +84,7 @@ export const createTaskExtensionRequest = async (req: ExtensionRequestRequest, r
         taskId,
         requestId: extensionRequest.id,
         action: LOG_ACTION.CREATE,
-        createdBy: requestedBy,
+        userId: requestedBy,
         createdAt: Date.now(),
       },
       body: extensionBody,

controllers/external-accounts.js

@@ -4,7 +4,7 @@ const { getDiscordMembers } = require("../services/discordService");
 const { addOrUpdate, getUsersByRole, updateUsersInBatch } = require("../models/users");
 const { retrieveDiscordUsers, fetchUsersForKeyValues } = require("../services/dataAccessLayer");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../constants/external-accounts");
-const discordServices = require("../services/discordService");
+const removeDiscordRoleUtils = require("../utils/removeDiscordRoleFromUser");
 const config = require("config");
 const logger = require("../utils/logger");
 const { markUnDoneTasksOfArchivedUsersBacklog } = require("../models/tasks");
@@ -71,14 +71,16 @@ const linkExternalAccount = async (req, res) => {
       userId
     );
 
-    try {
-      const unverifiedRoleId = config.get("discordUnverifiedRoleId");
-      await discordServices.removeRoleFromUser(unverifiedRoleId, attributes.discordId, req.userData);
-    } catch (error) {
-      logger.error(`Error getting external account data: ${error}`);
-      return res.boom.internal("Role Deletion failed. Please contact admin.", {
-        message: "Role Deletion failed. Please contact admin.",
-      });
+    const unverifiedRoleId = config.get("discordUnverifiedRoleId");
+    const unverifiedRoleRemovalResponse = await removeDiscordRoleUtils.removeDiscordRoleFromUser(
+      req.userData,
+      attributes.discordId,
+      unverifiedRoleId
+    );
+
+    if (!unverifiedRoleRemovalResponse.success) {
+      const message = `User details updated but ${unverifiedRoleRemovalResponse.message}. Please contact admin`;
+      return res.boom.internal(message, { message });
     }
 
     return res.status(204).json({ message: "Your discord profile has been linked successfully" });

controllers/invites.ts

@@ -32,7 +32,7 @@ export const createInviteLink = async (req: InviteBodyRequest, res: CustomRespon
       type: logType.DISCORD_INVITES,
       meta: {
         action: "create",
-        createdBy: logType.EXTERNAL_SERVICE,
+        userId: logType.EXTERNAL_SERVICE,
         createdAt: Date.now(),
       },
       body: {

controllers/logs.js

@@ -67,12 +67,27 @@ const fetchAllLogs = async (req, res) => {
       prev: prevUrl,
     });
   } catch (err) {
+    if (err.statusCode) {
+      return res.status(err.statusCode).json({ error: err.message });
+    }
     logger.error(ERROR_WHILE_FETCHING_LOGS, err);
     return res.boom.badImplementation(ERROR_WHILE_FETCHING_LOGS);
   }
 };
 
+const updateLogs = async (req, res) => {
+  try {
+    const response = await logsQuery.updateLogs();
+    return res.json({
+      response,
+    });
+  } catch (error) {
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
+  }
+};
+
 module.exports = {
   fetchLogs,
   fetchAllLogs,
+  updateLogs,
 };

controllers/oooRequests.ts

@@ -41,7 +41,7 @@ export const createOooRequestController = async (req: OooRequestCreateRequest, r
       meta: {
         requestId: requestResult.id,
         action: LOG_ACTION.CREATE,
-        createdBy: userId,
+        userId: userId,
         createdAt: Date.now(),
       },
       body: requestResult,
@@ -84,7 +84,7 @@ export const updateOooRequestController = async (req: UpdateRequest, res: Custom
       meta: {
         requestId: requestId,
         action: LOG_ACTION.UPDATE,
-        createdBy: userId,
+        userId: userId,
         createdAt: Date.now(),
       },
       body: requestResult,

controllers/taskRequestsv2.ts

@@ -92,7 +92,7 @@ export const createTaskRequestController = async (req: TaskRequestRequest, res:
         meta: {
           taskRequestId: updatedRequest.id,
           action: "update",
-          createdBy: req.userData.id,
+          userId: req.userData.id,
           createdAt: Date.now(),
           lastModifiedBy: req.userData.id,
           lastModifiedAt: Date.now(),
@@ -150,7 +150,7 @@ export const createTaskRequestController = async (req: TaskRequestRequest, res:
       meta: {
         taskRequestId: newTaskRequest.id,
         action: "create",
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),

controllers/tasksRequests.js

@@ -104,7 +104,7 @@ const addTaskRequests = async (req, res) => {
       meta: {
         taskRequestId: newTaskRequest.id,
         action: "create",
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),
@@ -206,7 +206,7 @@ const updateTaskRequests = async (req, res) => {
         taskRequestId: taskRequestId,
         action: "update",
         subAction: action,
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),