fix: import addLog from service file and fix lint issue

Real-Dev-Squad · Jan 3, 2025 · 92e5035 · 92e5035
1 parent 2d84ace
commit 92e5035
Showing 1 changed file with 88 additions and 88 deletions.
diff --git a/controllers/onboardingExtension.ts b/controllers/onboardingExtension.ts
@@ -1,24 +1,24 @@
 import {
-  ERROR_WHILE_CREATING_REQUEST,
-  LOG_ACTION,
-  ONBOARDING_REQUEST_CREATED_SUCCESSFULLY,
-  REQUEST_ALREADY_PENDING,
-  REQUEST_LOG_TYPE,
-  REQUEST_STATE,
-  REQUEST_TYPE,
-  UNAUTHORIZED_TO_CREATE_ONBOARDING_EXTENSION_REQUEST,
+    ERROR_WHILE_CREATING_REQUEST,
+    LOG_ACTION,
+    ONBOARDING_REQUEST_CREATED_SUCCESSFULLY,
+    REQUEST_ALREADY_PENDING,
+    REQUEST_LOG_TYPE,
+    REQUEST_STATE,
+    REQUEST_TYPE,
+    UNAUTHORIZED_TO_CREATE_ONBOARDING_EXTENSION_REQUEST,
 } from "../constants/requests";
 import { userState } from "../constants/userStatus";
-import { addLog } from "../models/logs";
+import { addLog } from "../services/logService";
 import { createRequest, getRequestByKeyValues } from "../models/requests";
 import { fetchUser } from "../models/users";
 import { getUserStatus } from "../models/userStatus";
 import { User } from "../typeDefinitions/users";
 import { 
-  CreateOnboardingExtensionBody, 
-  OnboardingExtension, 
-  OnboardingExtensionCreateRequest, 
-  OnboardingExtensionResponse 
+    CreateOnboardingExtensionBody, 
+    OnboardingExtension, 
+    OnboardingExtensionCreateRequest, 
+    OnboardingExtensionResponse 
 } from "../types/onboardingExtension";
 import { convertDateStringToMilliseconds, getNewDeadline } from "../utils/requests";
 import { convertDaysToMilliseconds } from "../utils/time";
@@ -35,90 +35,90 @@ import { convertDaysToMilliseconds } from "../utils/time";
 * @returns {Promise<OnboardingExtensionResponse>} Resolves to a response with the status and data or an error message.
 */
 export const createOnboardingExtensionRequestController = async (req: OnboardingExtensionCreateRequest, res: OnboardingExtensionResponse): Promise<OnboardingExtensionResponse> => {
-  try {
+    try {
 
-    const data = req.body as CreateOnboardingExtensionBody;
-    const {user, userExists} = await fetchUser({discordId: data.userId});
-
-    if(!userExists) {
-      return res.boom.notFound("User not found");
-    }
+        const data = req.body as CreateOnboardingExtensionBody;
+        const {user, userExists} = await fetchUser({discordId: data.userId});
+        
+        if(!userExists) {
+            return res.boom.notFound("User not found");
+        }
 
-    const { id: userId, discordJoinedAt, username} = user as User;
-    const { data: userStatus } =  await getUserStatus(userId);
+        const { id: userId, discordJoinedAt, username} = user as User;
+        const { data: userStatus } =  await getUserStatus(userId);
 
-    if(!userStatus || userStatus.currentStatus.state != userState.ONBOARDING){
-      return res.boom.forbidden(UNAUTHORIZED_TO_CREATE_ONBOARDING_EXTENSION_REQUEST);
-    }
+        if(!userStatus || userStatus.currentStatus.state != userState.ONBOARDING){
+            return res.boom.forbidden(UNAUTHORIZED_TO_CREATE_ONBOARDING_EXTENSION_REQUEST);
+        }
 
-    const latestExtensionRequest: OnboardingExtension = await getRequestByKeyValues({
-        userId: userId,
-        type: REQUEST_TYPE.ONBOARDING
-    });
+        const latestExtensionRequest: OnboardingExtension = await getRequestByKeyValues({
+            userId: userId,
+            type: REQUEST_TYPE.ONBOARDING
+        });
 
-    if(latestExtensionRequest && latestExtensionRequest.state === REQUEST_STATE.PENDING){
-      return res.boom.badRequest(REQUEST_ALREADY_PENDING);
-    }
-
-    const millisecondsInThirtyOneDays = convertDaysToMilliseconds(31);
-    const numberOfDaysInMillisecond = convertDaysToMilliseconds(data.numberOfDays);
-    const { isDate, milliseconds: discordJoinedDateInMillisecond } = convertDateStringToMilliseconds(discordJoinedAt);
+        if(latestExtensionRequest && latestExtensionRequest.state === REQUEST_STATE.PENDING){
+            return res.boom.badRequest(REQUEST_ALREADY_PENDING);
+        }
+        
+        const millisecondsInThirtyOneDays = convertDaysToMilliseconds(31);
+        const numberOfDaysInMillisecond = convertDaysToMilliseconds(data.numberOfDays);
+        const { isDate, milliseconds: discordJoinedDateInMillisecond } = convertDateStringToMilliseconds(discordJoinedAt);
 
-    if(!isDate){
-      logger.error(ERROR_WHILE_CREATING_REQUEST, "Invalid date");
-      return res.boom.badImplementation(ERROR_WHILE_CREATING_REQUEST);
-    }
+        if(!isDate){
+            logger.error(ERROR_WHILE_CREATING_REQUEST, "Invalid date");
+            return res.boom.badImplementation(ERROR_WHILE_CREATING_REQUEST);
+        }
 
-    let requestNumber: number;
-    let oldEndsOn: number;
-    const currentDate = Date.now();
+        let requestNumber: number;
+        let oldEndsOn: number;
+        const currentDate = Date.now();
 
-    if(!latestExtensionRequest){
-      requestNumber = 1;
-      oldEndsOn = discordJoinedDateInMillisecond + millisecondsInThirtyOneDays;
-    }else if(latestExtensionRequest.state === REQUEST_STATE.REJECTED) {
-      requestNumber = latestExtensionRequest.requestNumber + 1;
-      oldEndsOn = latestExtensionRequest.oldEndsOn;
-    }else{
-      requestNumber = latestExtensionRequest.requestNumber + 1;
-      oldEndsOn = latestExtensionRequest.newEndsOn;
-    }
-
-    const newEndsOn = getNewDeadline(currentDate, oldEndsOn, numberOfDaysInMillisecond);
-
-    const onboardingExtension = await createRequest({
-      type: REQUEST_TYPE.ONBOARDING,
-      state: REQUEST_STATE.PENDING,
-      userId: userId,
-      requestedBy: username,
-      oldEndsOn: oldEndsOn,
-      newEndsOn: newEndsOn,
-      reason: data.reason,
-      requestNumber: requestNumber,
-    });
+        if(!latestExtensionRequest){
+            requestNumber = 1;
+            oldEndsOn = discordJoinedDateInMillisecond + millisecondsInThirtyOneDays;
+        }else if(latestExtensionRequest.state === REQUEST_STATE.REJECTED) {
+            requestNumber = latestExtensionRequest.requestNumber + 1;
+            oldEndsOn = latestExtensionRequest.oldEndsOn;
+        }else{
+            requestNumber = latestExtensionRequest.requestNumber + 1;
+            oldEndsOn = latestExtensionRequest.newEndsOn;
+        }
+        
+        const newEndsOn = getNewDeadline(currentDate, oldEndsOn, numberOfDaysInMillisecond);
+        
+        const onboardingExtension = await createRequest({
+            type: REQUEST_TYPE.ONBOARDING,
+            state: REQUEST_STATE.PENDING,
+            userId: userId,
+            requestedBy: username,
+            oldEndsOn: oldEndsOn,
+            newEndsOn: newEndsOn,
+            reason: data.reason,
+            requestNumber: requestNumber,
+        });
 
-    const onboardingExtensionLog = {
-      type: REQUEST_LOG_TYPE.REQUEST_CREATED,
-      meta: {
-        requestId: onboardingExtension.id,
-        action: LOG_ACTION.CREATE,
-        userId: userId,
-        createdAt: Date.now(),
-      },
-      body: onboardingExtension,
-    };
+        const onboardingExtensionLog = {
+            type: REQUEST_LOG_TYPE.REQUEST_CREATED,
+            meta: {
+                requestId: onboardingExtension.id,
+                action: LOG_ACTION.CREATE,
+                userId: userId,
+                createdAt: Date.now(),
+            },
+            body: onboardingExtension,
+        };
 
-    await addLog(onboardingExtensionLog.type, onboardingExtensionLog.meta, onboardingExtensionLog.body);
+        await addLog(onboardingExtensionLog.type, onboardingExtensionLog.meta, onboardingExtensionLog.body);
 
-    return res.status(201).json({
-      message: ONBOARDING_REQUEST_CREATED_SUCCESSFULLY,  
-      data: {
-        id: onboardingExtension.id,
-        ...onboardingExtension,
-      }
-    });
-  }catch (err) {
-    logger.error(ERROR_WHILE_CREATING_REQUEST, err);
-    return res.boom.badImplementation(ERROR_WHILE_CREATING_REQUEST);
-  }
+        return res.status(201).json({
+            message: ONBOARDING_REQUEST_CREATED_SUCCESSFULLY,  
+            data: {
+                id: onboardingExtension.id,
+                ...onboardingExtension,
+            }
+        });
+    }catch (err) {
+        logger.error(ERROR_WHILE_CREATING_REQUEST, err);
+        return res.boom.badImplementation(ERROR_WHILE_CREATING_REQUEST);
+    }
 };