Refactor routes and services to use ES module syntax; update imports and exports for consistency.

- Changed require statements to import statements in routes: questions, staging, stocks, subscription, tags, taskRequests, tasks, trading, userStatus, users, wallets.
- Updated service imports to use ES module syntax in contributions, discordService, githubService, onboardingExtension, tasks, and users.
- Adjusted logger configuration and removed unnecessary comments.
- Replaced NotFound errors with httpError.NotFound in various utility functions for better error handling.
- Refactored task-related functions to use taskModel for fetching and updating tasks.

Author: prakashchoudhary07

app.ts

@@ -1,15 +1,16 @@
-import createError from 'http-errors';
-import express from 'express';
-import { isMulterError, multerErrorHandling } from './utils/multer.js';
+import createError from "http-errors";
+import express from "express";
+import { isMulterError, multerErrorHandling } from "./utils/multer.js";
 
 // Attach response headers
-import { responseHeaders } from './middlewares/responseHeaders.js';
+import { responseHeaders } from "./middlewares/responseHeaders.js";
 
 // import app middlewares
-import { middleware } from './middlewares/index.js';
+import { middleware } from "./middlewares/index.js";
 
 // import routes
-import { appRoutes } from './routes/index.js';
+import { appRoutes } from "./routes/index.js";
+import logger from "./utils/logger.js";
 
 const app = express();
 
@@ -27,6 +28,7 @@ app.use(function (err, req, res, next) {
   if (isMulterError(err)) {
     return multerErrorHandling(err, req, res, next);
   }
+  logger.error(err);
   return res.boom.boomify(err, {
     statusCode: err.statusCode,
   });

constants/imageVerificationTypes.ts

@@ -1,3 +1,3 @@
 const IMAGE_VERIFICATION_TYPES = ["profile", "discord"];
 
-export default  { IMAGE_VERIFICATION_TYPES };
+export { IMAGE_VERIFICATION_TYPES };

constants/logs.ts

@@ -1,4 +1,4 @@
-import { REQUEST_LOG_TYPE } from "./requests";
+import { REQUEST_LOG_TYPE } from "./requests.js";
 
 export const logType = {
   PROFILE_DIFF_APPROVED: "PROFILE_DIFF_APPROVED",

controllers/answers.ts

@@ -1,14 +1,14 @@
 import { Request } from "express";
 import crypto from "crypto";
 
-import { Answer, AnswerClient, AnswerFieldsToUpdate, AnswerStatus } from "../typeDefinitions/answers";
-import { CustomRequest, CustomResponse } from "../typeDefinitions/global";
+import { Answer, AnswerClient, AnswerFieldsToUpdate, AnswerStatus } from "../typeDefinitions/answers.js";
+import { CustomRequest, CustomResponse } from "../typeDefinitions/global.js";
 
-import * as answerQuery from "../models/answers";
+import * as answerQuery from "../models/answers.js";
 
-import { ANSWER_STATUS } from "../constants/answers";
-import { HEADERS_FOR_SSE } from "../constants/constants";
-import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages";
+import { ANSWER_STATUS } from "../constants/answers.js";
+import { HEADERS_FOR_SSE } from "../constants/constants.js";
+import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages.js";
 import logger from "../utils/logger.js";
 
 /* Refer to limitation of this clients array here(in the limitations section of doc) - https://github.com/Real-Dev-Squad/website-www/wiki/%5BFeature%5D-%E2%80%90-Realtime-Word-Cloud-Questions-Answers-Feature*/

controllers/applications.ts

@@ -1,7 +1,9 @@
-import { logType } from "../constants/logs.js";
 import type { Request, Response } from "express";
+import admin from "firebase-admin";
+
+import { logType } from "../constants/logs.js";
 import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages.js";
-import { 
+import {
   getAllApplications,
   getUserApplications,
   addApplication,
@@ -10,7 +12,6 @@ import {
   getApplicationById
 } from "../models/applications.js";
 import { API_RESPONSE_MESSAGES } from "../constants/application.js";
-import admin from "firebase-admin";
 import logger from "../utils/logger.js";
 import { addLog } from "../services/logService.js";
 

controllers/arts.js

@@ -1,5 +1,7 @@
 import { SOMETHING_WENT_WRONG } from "../constants/errorMessages.js";
 import artsQuery from "../models/arts.js";
+import logger from "../utils/logger.js";
+
 /**
  * Adds art
  *

controllers/auction.js

@@ -1,6 +1,7 @@
 import auctions from "../models/auctions.js";
-import wallet from "../models/wallets.js";
+import { fetchWallet } from "../models/wallets.js";
 import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages.js";
+import logger from "../utils/logger.js";
 
 /**
  * Fetches all the active (ongoing) auctions
@@ -52,7 +53,7 @@ const createNewAuction = async (req, res) => {
     const { id: seller } = req.userData;
     const { initial_price: initialPrice, item_type: itemType, end_time: endTime, quantity } = req.body;
 
-    const { currencies } = await wallet.fetchWallet(seller);
+    const { currencies } = await fetchWallet(seller);
     const itemQuantity = parseInt(currencies[`${itemType}`]);
     if (!itemQuantity || itemQuantity < quantity) return res.boom.forbidden(`You do not have enough of ${itemType}s!`);
 

controllers/auth.js

@@ -1,9 +1,10 @@
 import config from "config";
 import passport from "passport";
+
 import { DATA_ADDED_SUCCESSFULLY, SOMETHING_WENT_WRONG } from "../constants/errorMessages.js";
 import QrCodeAuthModel from "../models/qrCodeAuth.js";
-import users from "../models/users.js";
-import authService from "../services/authService.js";
+import { addOrUpdate, fetchUser } from "../models/users.js";
+import { generateAuthToken } from "../services/authService.js";
 import logger from "../utils/logger.js";
 
 const googleAuthLogin = (req, res, next) => {
@@ -80,7 +81,7 @@ async function handleGoogleLogin(req, res, user, authRedirectionUrl) {
       updated_at: null,
     };
 
-    const userDataFromDB = await users.fetchUser({ email: userData.email });
+    const userDataFromDB = await fetchUser({ email: userData.email });
 
     if (userDataFromDB.userExists) {
       if (userDataFromDB.user.roles?.developer) {
@@ -90,9 +91,9 @@ async function handleGoogleLogin(req, res, user, authRedirectionUrl) {
       }
     }
 
-    const { userId, incompleteUserDetails } = await users.addOrUpdate(userData);
+    const { userId, incompleteUserDetails } = await addOrUpdate(userData);
 
-    const token = authService.generateAuthToken({ userId });
+    const token = generateAuthToken({ userId });
 
     const cookieOptions = getAuthCookieOptions();
 
@@ -184,17 +185,17 @@ const githubAuthCallback = (req, res, next) => {
         }
       }
 
-      const { userId, incompleteUserDetails, role } = await users.addOrUpdate(userData);
+      const { userId, incompleteUserDetails, role } = await addOrUpdate(userData);
 
-      const token = authService.generateAuthToken({ userId });
+      const token = generateAuthToken({ userId });
 
       const cookieOptions = getAuthCookieOptions();
       // respond with a cookie
       res.cookie(config.get("userToken.cookieName"), token, cookieOptions);
 
       /* redirectUrl woud be like https://realdevsquad.com?v2=true */
       if (isV2FlagPresent) {
-        const tokenV2 = authService.generateAuthToken({ userId, role });
+        const tokenV2 = generateAuthToken({ userId, role });
         res.cookie(config.get("userToken.cookieV2Name"), tokenV2, cookieOptions);
       }
 
@@ -264,7 +265,7 @@ const updateAuthStatus = async (req, res) => {
     const authStatus = req.params.authorization_status;
     let token;
     if (authStatus === "AUTHORIZED") {
-      token = authService.generateAuthToken({ userId });
+      token = generateAuthToken({ userId });
     }
     const result = await QrCodeAuthModel.updateStatus(userId, authStatus, token);
 

controllers/awsAccess.ts

@@ -1,9 +1,9 @@
-import { PROFILE_SVC_GITHUB_URL } from "../constants/urls";
+import { PROFILE_SVC_GITHUB_URL } from "../constants/urls.js";
 import logger from "../utils/logger.js";
-import {addUserToGroup, createUser, fetchAwsUserIdByUsername} from "../utils/awsFunctions";
+import {addUserToGroup, createUser, fetchAwsUserIdByUsername} from "../utils/awsFunctions.js";
 
-import * as dataAccess from "../services/dataAccessLayer";
-import * as userDataLevels from '../constants/userDataLevels';
+import * as dataAccess from "../services/dataAccessLayer.js";
+import * as userDataLevels from '../constants/userDataLevels.js';
 
 export const addUserToAWSGroup = async (req, res) => {
     const { groupId, userId } = req.body;
@@ -15,15 +15,15 @@ export const addUserToAWSGroup = async (req, res) => {
       } else if(!userInfoData.user.email) {
         return res.status(400).json({ error: `User email is required to create an AWS user. Please update your email by setting up Profile service, url : ${PROFILE_SVC_GITHUB_URL}` });
       }
-      
+
       let awsUserId = await fetchAwsUserIdByUsername(userInfoData.user.username);
-      
+
       let userCreationResponse = null;
-      
+
       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`

controllers/badges.ts

@@ -26,7 +26,7 @@ export const getBadges = async (req, res, next) => {
  * @param res {Object} - Express response object
  * @returns {Object}: <badges: Array<badge>, message: string> - Return user badges
  */
-async function getUserBadges(req, res) {
+export async function getUserBadges(req, res) {
   try {
     const userId = req.params.id;
     const { badges } = await badgeQuery.fetchUserBadges(userId);