refactor: add loading namespace

webiny · Oct 21, 2024 · 603aa5e · 603aa5e
1 parent 0c5b524
commit 603aa5e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 38 deletions.
diff --git a/packages/app-aco/src/features/folder/createFolder/CreateFolder.ts b/packages/app-aco/src/features/folder/createFolder/CreateFolder.ts
@@ -9,7 +9,7 @@ import { folderCacheFactory } from "../cache";
 export class CreateFolder {
     public static instance(type: string, gateway: ICreateFolderGateway): ICreateFolderUseCase {
         const foldersCache = folderCacheFactory.getCache(type);
-        const loadingRepository = loadingRepositoryFactory.getRepository();
+        const loadingRepository = loadingRepositoryFactory.getRepository(type);
         const repository = new CreateFolderRepository(foldersCache, gateway, type);
         const useCase = new CreateFolderUseCase(repository);
         return new CreateFolderUseCaseWithLoading(loadingRepository, useCase);

diff --git a/packages/app-aco/src/features/folder/deleteFolder/DeleteFolder.ts b/packages/app-aco/src/features/folder/deleteFolder/DeleteFolder.ts
@@ -9,7 +9,7 @@ import { folderCacheFactory } from "../cache";
 export class DeleteFolder {
     public static instance(type: string, gateway: IDeleteFolderGateway): IDeleteFolderUseCase {
         const foldersCache = folderCacheFactory.getCache(type);
-        const loadingRepository = loadingRepositoryFactory.getRepository();
+        const loadingRepository = loadingRepositoryFactory.getRepository(type);
         const repository = new DeleteFolderRepository(foldersCache, gateway);
         const useCase = new DeleteFolderUseCase(repository);
         return new DeleteFolderUseCaseWithLoading(loadingRepository, useCase);

diff --git a/packages/app-aco/src/features/folder/getFolder/GetFolder.ts b/packages/app-aco/src/features/folder/getFolder/GetFolder.ts
@@ -9,7 +9,7 @@ import { folderCacheFactory } from "../cache";
 export class GetFolder {
     public static instance(type: string, gateway: IGetFolderGateway): IGetFolderUseCase {
         const foldersCache = folderCacheFactory.getCache(type);
-        const loadingRepository = loadingRepositoryFactory.getRepository();
+        const loadingRepository = loadingRepositoryFactory.getRepository(type);
         const repository = new GetFolderRepository(foldersCache, gateway);
         const useCase = new GetFolderUseCase(repository);
         return new GetFolderUseCaseWithLoading(loadingRepository, useCase);

diff --git a/packages/app-aco/src/features/folder/listFolders/ListFolders.ts b/packages/app-aco/src/features/folder/listFolders/ListFolders.ts
@@ -13,39 +13,17 @@ interface IListFoldersInstance {
 }
 
 export class ListFolders {
-    static useCaseCache: Map<string, IListFoldersUseCase> = new Map();
-    static foldersCache: Map<string, FoldersCache> = new Map();
-    static loadingCache: Map<string, LoadingRepository> = new Map();
-
     public static instance(type: string, gateway: IListFoldersGateway): IListFoldersInstance {
-        if (!this.foldersCache.has(type)) {
-            this.foldersCache.set(type, folderCacheFactory.getCache(type));
-        }
-
-        if (!this.loadingCache.has(type)) {
-            this.loadingCache.set(type, loadingRepositoryFactory.getRepository());
-        }
-
-        if (!this.useCaseCache.has(type)) {
-            // Create a new instance if not cached
-            const foldersCache = this.foldersCache.get(type)!;
-            const loadingRepository = this.loadingCache.get(type)!;
-            const repository = new ListFoldersRepository(foldersCache, gateway, type);
-            const useCase = new ListFoldersUseCase(repository);
-            const useCaseWithLoading = new ListFoldersUseCaseWithLoading(
-                loadingRepository,
-                useCase
-            );
-
-            // Store in cache
-            this.useCaseCache.set(type, useCaseWithLoading);
-        }
+        const foldersCache = folderCacheFactory.getCache(type);
+        const loadingRepository = loadingRepositoryFactory.getRepository(type);
+        const repository = new ListFoldersRepository(foldersCache, gateway, type);
+        const useCase = new ListFoldersUseCase(repository);
+        const useCaseWithLoading = new ListFoldersUseCaseWithLoading(loadingRepository, useCase);
 
-        // Return the cached instance
         return {
-            useCase: this.useCaseCache.get(type)!,
-            folders: this.foldersCache.get(type)!,
-            loading: this.loadingCache.get(type)!
+            useCase: useCaseWithLoading,
+            folders: foldersCache,
+            loading: loadingRepository
         };
     }
 }
diff --git a/packages/app-aco/src/features/folder/updateFolder/UpdateFolder.ts b/packages/app-aco/src/features/folder/updateFolder/UpdateFolder.ts
@@ -9,7 +9,7 @@ import { folderCacheFactory } from "~/features/folder";
 export class UpdateFolder {
     public static instance(type: string, gateway: IUpdateFolderGateway): IUpdateFolderUseCase {
         const foldersCache = folderCacheFactory.getCache(type);
-        const loadingRepository = loadingRepositoryFactory.getRepository();
+        const loadingRepository = loadingRepositoryFactory.getRepository(type);
         const repository = new UpdateFolderRepository(foldersCache, gateway);
         const useCase = new UpdateFolderUseCase(repository);
         return new UpdateFolderUseCaseWithLoading(loadingRepository, useCase);

diff --git a/packages/app-utils/src/fta/Domain/Repositories/Loading/LoadingRepositoryFactory.ts b/packages/app-utils/src/fta/Domain/Repositories/Loading/LoadingRepositoryFactory.ts
@@ -3,8 +3,8 @@ import { LoadingRepository } from "./LoadingRepository";
 export class LoadingRepositoryFactory {
     private cache: Map<string, LoadingRepository> = new Map();
 
-    getRepository() {
-        const cacheKey = this.getCacheKey();
+    getRepository(namespace?: string) {
+        const cacheKey = this.getCacheKey(namespace);
 
         if (!this.cache.has(cacheKey)) {
             this.cache.set(cacheKey, new LoadingRepository());
@@ -13,8 +13,8 @@ export class LoadingRepositoryFactory {
         return this.cache.get(cacheKey) as LoadingRepository;
     }
 
-    private getCacheKey() {
-        return Date.now().toString();
+    private getCacheKey(namespace?: string) {
+        return namespace ?? Date.now().toString();
     }
 }