Merge branch 'develop' of https://github.com/Real-Dev-Squad/website-backend into feat/cpllapsed-task

Author: sahsisunny

.github/workflows/test.yml

@@ -6,16 +6,15 @@ name: Tests
 on:
   pull_request:
     branches:
-      - '**'
+      - "**"
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v3

controllers/arts.js

@@ -1,5 +1,5 @@
 const artsQuery = require("../models/arts");
-
+const { SOMETHING_WENT_WRONG, INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 /**
  * Adds art
  *
@@ -17,7 +17,7 @@ const addArt = async (req, res) => {
     });
   } catch (error) {
     logger.error(`Error adding art: ${error}`);
-    return res.boom.serverUnavailable("Something went wrong please contact admin");
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 
@@ -36,7 +36,7 @@ const fetchArts = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while fetching arts ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -56,7 +56,7 @@ const getSelfArts = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while getting user arts ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -70,7 +70,7 @@ const getUserArts = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while getting user arts ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 

controllers/auction.js

@@ -1,5 +1,6 @@
 const auctions = require("../models/auctions");
 const wallet = require("../models/wallets");
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 
 /**
  * Fetches all the active (ongoing) auctions
@@ -16,7 +17,7 @@ const fetchAvailableAuctions = async (_req, res) => {
     });
   } catch (error) {
     logger.error(`Error fetching available auctions: ${error}`);
-    return res.boom.badImplementation("An internal server error occured.");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -36,7 +37,7 @@ const fetchAuctionById = async (req, res) => {
     return res.json(auctionData);
   } catch (error) {
     logger.error(`Error fetching auction: ${error}`);
-    return res.boom.badImplementation("An internal server error occured.");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -59,7 +60,7 @@ const createNewAuction = async (req, res) => {
     return res.status(201).json({ id: auctionId, message: "Auction created successfully!" });
   } catch (error) {
     logger.error(`Error creating new auctions: ${error}`);
-    return res.boom.badImplementation("An internal server error occured.");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -84,7 +85,7 @@ const makeNewBid = async (req, res) => {
     return res.status(201).json({ message: "Successfully placed bid!" });
   } catch (error) {
     logger.error(`Error creating new auctions: ${error}`);
-    return res.boom.badImplementation("An internal server error occured.");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 

controllers/challenge.js

@@ -1,6 +1,5 @@
 const challengeQuery = require("../models/challenges");
-
-const ERROR_MESSAGE = "Something went wrong. Please try again or contact admin";
+const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 /**
  * Get the challenges
@@ -19,7 +18,7 @@ const fetchChallenges = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while retrieving challenges ${err}`);
-    return res.boom.serverUnavailable(ERROR_MESSAGE);
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 
@@ -41,7 +40,7 @@ const createChallenge = async (req, res) => {
     }
   } catch (err) {
     logger.error(`Error while adding challenge ${err}`);
-    return res.boom.serverUnavailable(ERROR_MESSAGE);
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 
@@ -79,7 +78,7 @@ const subscribeToChallenge = async (req, res) => {
     }
   } catch (err) {
     logger.error(`Error while retrieving challenges ${err}`);
-    return res.boom.serverUnavailable(ERROR_MESSAGE);
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 

controllers/contributions.js

@@ -1,7 +1,6 @@
 const contributionsService = require("../services/contributions");
 const { fetchUser } = require("../models/users");
-
-const ERROR_MESSAGE = "Something went wrong. Please try again or contact admin";
+const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 /**
  * Get the  contributions of the user
@@ -20,7 +19,7 @@ const getUserContributions = async (req, res) => {
     return res.boom.notFound("User doesn't exist");
   } catch (err) {
     logger.error(`Error while retriving contributions ${err}`);
-    return res.boom.badImplementation(ERROR_MESSAGE);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
   }
 };
 

controllers/extensionRequests.js

@@ -3,7 +3,7 @@ const { addLog } = require("../models/logs");
 const tasks = require("../models/tasks");
 const { getUsername } = require("../utils/users");
 const { EXTENSION_REQUEST_STATUS } = require("../constants/extensionRequests");
-
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 /**
  * Create ETA extension Request
  *
@@ -66,7 +66,7 @@ const createTaskExtensionRequest = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new extension request: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -87,7 +87,7 @@ const fetchExtensionRequests = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while fetching Extension Requests ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -102,7 +102,7 @@ const getExtensionRequest = async (req, res) => {
     extensionRequestData.id = extensionRequestId;
     return res.json({ message: "Extension Requests returned successfully!", extensionRequest: extensionRequestData });
   } catch (err) {
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -128,7 +128,7 @@ const getSelfExtensionRequests = async (req, res) => {
     return res.boom.notFound("User doesn't exist");
   } catch (error) {
     logger.error(`Error while fetching extension requests: ${error}`);
-    return res.boom.badImplementation("An internal server error occured");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -156,7 +156,7 @@ const updateExtensionRequest = async (req, res) => {
     return res.status(204).send();
   } catch (err) {
     logger.error(`Error while updating extension request: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -221,7 +221,7 @@ const updateExtensionRequestStatus = async (req, res) => {
     return res.json({ message: `Extension request ${extensionStatus} succesfully`, extensionLog });
   } catch (err) {
     logger.error(`Error while updating extension request: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 

controllers/external-accounts.js

@@ -1,4 +1,5 @@
 const externalAccountsModel = require("../models/external-accounts");
+const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 const addExternalAccountData = async (req, res) => {
   const createdOn = Date.now();
@@ -17,7 +18,7 @@ const addExternalAccountData = async (req, res) => {
     return res.status(201).json({ message: "Added external account data successfully" });
   } catch (error) {
     logger.error(`Error adding data: ${error}`);
-    return res.boom.serverUnavailable("Something went wrong please contact admin");
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 
@@ -36,7 +37,7 @@ const getExternalAccountData = async (req, res) => {
     return res.status(200).json({ message: "Data returned successfully", attributes: attributes });
   } catch (error) {
     logger.error(`Error getting external account data: ${error}`);
-    return res.boom.serverUnavailable("Something went wrong please contact admin");
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };
 

controllers/items.js

@@ -1,4 +1,5 @@
 const ItemTagsModel = require("../models/items");
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 
 /**
  * Adds a tag to an item with its corresponding a level
@@ -16,7 +17,7 @@ const addTagsToItem = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new item: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -37,7 +38,7 @@ const removeTagsFromItem = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new item: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -60,7 +61,7 @@ const getItemBasedOnFilter = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new item: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 

controllers/levels.js

@@ -1,5 +1,6 @@
 const LevelModel = require("../models/levels");
 const admin = require("firebase-admin");
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 
 /**
  * Creates a level
@@ -24,7 +25,7 @@ const addLevel = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new level: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -43,7 +44,7 @@ const deleteLevel = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new Level: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 
@@ -62,7 +63,7 @@ const getAllLevels = async (req, res) => {
     });
   } catch (err) {
     logger.error(`Error while creating new Level: ${err}`);
-    return res.boom.badImplementation("An internal server error occurred");
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
   }
 };
 

controllers/logs.js

@@ -1,4 +1,5 @@
 const logsQuery = require("../models/logs");
+const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 /**
  * Fetches logs
@@ -15,7 +16,7 @@ const fetchLogs = async (req, res) => {
     });
   } catch (error) {
     logger.error(`Error while fetching logs: ${error}`);
-    return res.boom.serverUnavailable("Something went wrong please contact admin");
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
   }
 };