fix: ooo get request

Author: surajmaity1

models/requests.ts

@@ -8,7 +8,7 @@ import {
   REQUEST_DOES_NOT_EXIST,
 } from "../constants/requests";
 import { getUserId } from "../utils/users";
-import { transformGetOooRequest } from "../utils/requests";
+import { fetchUser } from "./users";
 const SIZE = 5;
 
 export const createRequest = async (body: any) => {
@@ -151,7 +151,55 @@ export const getRequests = async (query: any) => {
     }
 
     if (type === REQUEST_TYPE.OOO) {
-      allRequests = await transformGetOooRequest(dev, allRequests);
+      const oooRequests = [];
+      if (dev) {
+        for (const request of allRequests) {
+          if (request.status) {
+            const modifiedRequest = {
+                id: request.id,
+                type: request.type,
+                from: request.from,
+                until: request.until,
+                message: request.reason,
+                state: request.status,
+                lastModifiedBy: request.lastModifiedBy ?? "",
+                requestedBy: request.userId,
+                reason: request.comment ?? "",
+                createdAt: request.createdAt,
+                updatedAt: request.updatedAt
+            };
+            oooRequests.push(modifiedRequest);
+          } else {
+            oooRequests.push(request);
+          }
+        }
+      } else {
+        for (const request of allRequests) {
+          if (request.state) {
+            const userResponse: any = await fetchUser({ userId: request.requestedBy });
+            const username = userResponse.user.username;
+
+            const modifiedRequest = {
+              id: request.id,
+              type: request.type,
+              from: request.from,
+              until: request.until,
+              reason: request.message,
+              status: request.state,
+              lastModifiedBy: request.lastModifiedBy ?? null,
+              requestedBy: username,
+              comment: request.reason ?? null,
+              createdAt: request.createdAt,
+              updatedAt: request.updatedAt,
+              userId: request.requestedBy
+            };
+            oooRequests.push(modifiedRequest);
+          } else {
+            oooRequests.push(request);
+          }
+        }
+      }
+      allRequests = oooRequests;
     }
 
     return {

types/oooRequest.d.ts

@@ -18,21 +18,6 @@ export type OooStatusRequest = {
   updatedAt: Timestamp;
   comment: string | null;
 };
-
-export type OldOooRequest = {
-  id: string;
-  type: REQUEST_TYPE.OOO;
-  from: number;
-  until: number;
-  message: string;
-  state: REQUEST_STATE;
-  lastModifiedBy: string | null;
-  requestedBy: string;
-  reason: string | null;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
-};
-
 export type OooStatusRequestBody = {
   from: number;
   until: number;
@@ -56,4 +41,4 @@ export type OooRequestCreateRequest = Request & {
   query: RequestQuery;
 };
 
-export type OooRequestUpdateRequest = Request & { oooRequestUpdateBody , userData: userData , query: RequestQuery , params: RequestParams };
+export type OooRequestUpdateRequest = Request & { oooRequestUpdateBody , userData: userData , query: RequestQuery , params: RequestParams };

utils/requests.ts

@@ -1,8 +1,3 @@
-import { ERROR_WHILE_FETCHING_REQUEST } from "../constants/requests";
-import { fetchUser } from "../models/users";
-import { userData } from "../types/global";
-import { OldOooRequest, OooStatusRequest } from "../types/oooRequest";
-
 /**
  * Calculates the new deadline based on the current date, the old end date, and the additional duration in milliseconds.
  *
@@ -36,64 +31,4 @@ export const convertDateStringToMilliseconds = (date: string): { isDate: boolean
         isDate: true,
         milliseconds,
     };
-};
-
-export const transformGetOooRequest = async (dev, allRequests) => {
-    const oooRequests = [];
-
-    if (dev) {
-        for (const request of allRequests) {
-            if (request.status) {
-                const modifiedRequest: OldOooRequest = {
-                    id: request.id,
-                    type: request.type,
-                    from: request.from,
-                    until: request.until,
-                    message: request.reason,
-                    state: request.status,
-                    lastModifiedBy: request.lastModifiedBy ?? "",
-                    requestedBy: request.userId,
-                    reason: request.comment ?? "",
-                    createdAt: request.createdAt,
-                    updatedAt: request.updatedAt
-                };
-                oooRequests.push(modifiedRequest);
-            } else {
-                oooRequests.push(request);
-            }
-        }
-    } else {
-        for (const request of allRequests) {
-            if (request.state) {
-                try {
-                    const userResponse: any = await fetchUser({ userId: request.requestedBy });
-                    const username = userResponse.user.username;
-
-                    const modifiedRequest: OooStatusRequest = {
-                        id: request.id,
-                        type: request.type,
-                        from: request.from,
-                        until: request.until,
-                        reason: request.message,
-                        status: request.state,
-                        lastModifiedBy: request.lastModifiedBy ?? null,
-                        requestedBy: username,
-                        comment: request.reason ?? null,
-                        createdAt: request.createdAt,
-                        updatedAt: request.updatedAt,
-                        userId: request.requestedBy
-                    };
-
-                    oooRequests.push(modifiedRequest);
-                } catch (error) {
-                    logger.error(ERROR_WHILE_FETCHING_REQUEST, error);
-                    throw error;
-                }
-            } else {
-                oooRequests.push(request);
-            }
-        }
-    }
-
-    return oooRequests;
 };