minor renaming

Author: LCcodder

source/api/v1/api/handlers/Handler.d.ts

@@ -1,3 +1,3 @@
-export interface Handler {
+export interface IHandlers {
     handleRoutes(): void
 }

source/api/v1/api/handlers/auth/AuthHandlers.ts

@@ -5,10 +5,10 @@ import { AuthUserSchema, ChangePasswordSchema } from "../../validation/schemas/A
 import { extractJwtPayload } from "../../../shared/utils/jwt/PayloadExtractor"; 
 import { extractToken } from "../../../shared/utils/common/TokenExtractor";
 import { isException } from "../../../shared/utils/guards/ExceptionGuard";
-import { Handler } from "../Handler";
+import { IHandlers } from "../Handler";
 import { AuthorizationPreHandler } from "../../prehandlers/AuthPreHandler";
 
-export class AuthHandler implements Handler {
+export class AuthHandlers implements IHandlers {
     constructor(
         private server: FastifyInstance, 
         private authorizationPreHandler: AuthorizationPreHandler,

…/v1/api/handlers/common/CommonHandler.ts …v1/api/handlers/common/CommonHandlers.tssource/api/v1/api/handlers/common/CommonHandler.ts renamed to source/api/v1/api/handlers/common/CommonHandlers.ts source/api/v1/api/handlers/common/CommonHandler.ts renamed to source/api/v1/api/handlers/common/CommonHandlers.ts

@@ -1,9 +1,9 @@
 import { FastifyInstance } from "fastify";
 import Healthcheck, { SystemReport } from "../../../shared/utils/common/Healthcheck";
-import { Handler } from "../Handler";
+import { IHandlers } from "../Handler";
 import { isException } from "../../../shared/utils/guards/ExceptionGuard";
 
-export class CommonHandler implements Handler {
+export class CommonHandlers implements IHandlers {
     constructor(
         private server: FastifyInstance, 
         private healthcheck: Healthcheck

source/api/v1/api/handlers/notes/NotesHandlers.ts

@@ -5,10 +5,10 @@ import { extractJwtPayload } from "../../../shared/utils/jwt/PayloadExtractor";
 import { extractToken } from "../../../shared/utils/common/TokenExtractor";
 import { AddCollaboratorSchema, CreateNoteSchema, DeleteNoteSchema, GetNoteCollaboratorsSchema, GetNoteSchema, GetNotesSchema, RemoveCollaboratorSchema, UpdateNoteSchema } from "../../validation/schemas/NoteSchemas";
 import { isException } from "../../../shared/utils/guards/ExceptionGuard";
-import { Handler } from "../Handler";
+import { IHandlers } from "../Handler";
 import { AuthorizationPreHandler } from "../../prehandlers/AuthPreHandler";
 
-export class NotesHandler implements Handler {
+export class NotesHandlers implements IHandlers {
     constructor(
         private server: FastifyInstance, 
         private authorizationPreHandler: AuthorizationPreHandler,

source/api/v1/api/handlers/users/UsersHandlers.ts

@@ -4,13 +4,13 @@ import { CreateUserSchema, GetMyProfileSchema, GetUserSchema, UpdateUserSchema }
 import { extractJwtPayload } from "../../../shared/utils/jwt/PayloadExtractor";
 import { extractToken } from "../../../shared/utils/common/TokenExtractor";
 import { isException } from "../../../shared/utils/guards/ExceptionGuard";
-import { Handler } from "../Handler";
+import { IHandlers } from "../Handler";
 import { AuthorizationPreHandler } from "../../prehandlers/AuthPreHandler";
 import { IUsersService } from "../../../services/users/UsersServiceInterface";
 import { UsersService } from "../../../services/users/UsersService";
 
 
-export class UsersHandler implements Handler {
+export class UsersHandlers implements IHandlers {
     constructor (
         private server: FastifyInstance, 
         private authorizationPreHandler: AuthorizationPreHandler,

source/api/v1/shared/decorators/WithRetry.ts

@@ -1,16 +1,25 @@
 import { LOGGER } from "../utils/common/Logger"
 
-export const withRetry = (_target: any, _key: string, descriptor: PropertyDescriptor) => {
-    const originalMethod = descriptor.value
+export const withRetry = (maxRetries: number = 5, delay: number = 1000) => {
+    return function (_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
+      const originalMethod = descriptor.value;
 
-    descriptor.value = async function (...args: any[]) {
-        try {
-            return await originalMethod.apply(this, args)
-        } catch (error) {
-            LOGGER.error(error)
-            return await originalMethod.apply(this, args)
-        }
-    }
-
-    return descriptor
+        descriptor.value = async function (...args: any[]) {
+            let attempts = 0;
+            let lastError: any;
+    
+            while (attempts < maxRetries) {
+                try {
+                    return await originalMethod.apply(this, args);
+                } catch (error) {
+                    lastError = error;
+                    attempts++;
+                    LOGGER.error(error)
+                    await new Promise(resolve => setTimeout(resolve, delay));
+                }
+            }
+  
+            throw lastError;
+        };
+    };
 }

source/main.ts

@@ -13,10 +13,10 @@ import { Note as NoteEntity } from './api/v1/database/entities/Note'
 import { initSwaggerViewer } from './api/v1/api/openapi/swagger/InitSwagger'
 import { connectAndGetRedisInstance } from './api/v1/cache/InitRedisInstance'
 import Healthcheck from './api/v1/shared/utils/common/Healthcheck'
-import { CommonHandler } from './api/v1/api/handlers/common/CommonHandler'
-import { AuthHandler } from './api/v1/api/handlers/auth/AuthHandlers'
-import { NotesHandler } from './api/v1/api/handlers/notes/NotesHandlers'
-import { UsersHandler } from './api/v1/api/handlers/users/UsersHandlers'
+import { CommonHandlers } from './api/v1/api/handlers/common/CommonHandlers'
+import { AuthHandlers } from './api/v1/api/handlers/auth/AuthHandlers'
+import { NotesHandlers } from './api/v1/api/handlers/notes/NotesHandlers'
+import { UsersHandlers } from './api/v1/api/handlers/users/UsersHandlers'
 import { LOGGER } from './api/v1/shared/utils/common/Logger'
 
 const main = async () => {
@@ -58,10 +58,10 @@ const main = async () => {
 
     // registering handlers with version prefix
     server.register((server, _, done) => {
-        const usersHandler = new UsersHandler(server, authentication, usersService)
-        const notesHandler = new NotesHandler(server, authentication, notesService)
-        const authHandler = new AuthHandler(server, authentication, authService)
-        const commonHandler = new CommonHandler(server, healthcheck)
+        const usersHandler = new UsersHandlers(server, authentication, usersService)
+        const notesHandler = new NotesHandlers(server, authentication, notesService)
+        const authHandler = new AuthHandlers(server, authentication, authService)
+        const commonHandler = new CommonHandlers(server, healthcheck)
 
         usersHandler.handleRoutes()
         notesHandler.handleRoutes()