Refactor ResourceUtil and UserMiddleware; update type definitions and…

… improve method naming for clarity
OneUptime · Sep 26, 2024 · bf01322 · bf01322
1 parent 73fc3e3
commit bf01322
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/APIReference/Utils/Resources.ts b/APIReference/Utils/Resources.ts
@@ -15,7 +15,7 @@ export default class ResourceUtil {
   // Get all resources that should have documentation enabled
   public static getResources(): Array<ModelDocumentation> {
     const resources: Array<ModelDocumentation> = Models.filter(
-      (model: typeof BaseModel) => {
+      (model: { new (): BaseModel }) => {
         const modelInstance: BaseModel = new model();
         let showDocs: boolean = modelInstance.enableDocumentation;
 
@@ -27,7 +27,7 @@ export default class ResourceUtil {
         return showDocs;
       },
     )
-      .map((model: typeof BaseModel) => {
+      .map((model: { new (): BaseModel }) => {
         const modelInstance: BaseModel = new model();
 
         return {

diff --git a/Common/Tests/Server/Middleware/UserAuthorization.test.ts b/Common/Tests/Server/Middleware/UserAuthorization.test.ts
@@ -64,7 +64,8 @@ describe("UserMiddleware", () => {
         query: {},
       } as any;
 
-      const result: StringOrUndefined = UserMiddleware.getAccessToken(req);
+      const result: StringOrUndefined =
+        UserMiddleware.getAccessTokenFromExpressRequest(req);
 
       expect(result).toEqual(mockedAccessToken);
     });
@@ -76,7 +77,8 @@ describe("UserMiddleware", () => {
         query: {},
       } as ExpressRequest;
 
-      const result: StringOrUndefined = UserMiddleware.getAccessToken(req);
+      const result: StringOrUndefined =
+        UserMiddleware.getAccessTokenFromExpressRequest(req);
 
       expect(result).toBeUndefined();
     });

diff --git a/Common/Tests/Server/Services/ScheduledMaintenanceService.test.ts b/Common/Tests/Server/Services/ScheduledMaintenanceService.test.ts
@@ -95,7 +95,7 @@ describe("ScheduledMaintenanceService", () => {
 
       expect(ongoingState).not.toBeNull();
 
-      jest.spyOn(ScheduledMaintenanceService, "onTrigger");
+      jest.spyOn(ScheduledMaintenanceService, "onTriggerWorkflow");
 
       await ScheduledMaintenanceService.changeScheduledMaintenanceState({
         projectId: project.id!,
@@ -113,7 +113,9 @@ describe("ScheduledMaintenanceService", () => {
       });
 
       // Assert triggering workflows only once
-      expect(ScheduledMaintenanceService.onTrigger).toHaveBeenCalledTimes(1);
+      expect(
+        ScheduledMaintenanceService.onTriggerWorkflow,
+      ).toHaveBeenCalledTimes(1);
     });
   });
 });
diff --git a/Common/Tests/Server/Utils/Cookie.test.ts b/Common/Tests/Server/Utils/Cookie.test.ts
@@ -47,7 +47,7 @@ describe("CookieUtils", () => {
     const cookieValue: string = "testValue";
 
     mockRequest.cookies[cookieName] = cookieValue;
-    const value: string | undefined = CookieUtil.getCookie(
+    const value: string | undefined = CookieUtil.getCookieFromExpressRequest(
       mockRequest,
       cookieName,
     );