refactor: pass type as repo dependency

webiny · leopuleo · Jun 24, 2024 · Jun 25, 2024 · Aug 15, 2024 · Aug 27, 2024
commit 11f093ed580394d8f7347cfd7b045c93f83b35c6
diff --git a/packages/app-aco/src/features/folder/createFolder/CreateFolderRepository.ts b/packages/app-aco/src/features/folder/createFolder/CreateFolderRepository.ts
@@ -8,10 +8,12 @@ import { FolderDto } from "./FolderDto";
 export class CreateFolderRepository implements ICreateFolderRepository {
     private cache: FoldersCache;
     private gateway: ICreateFolderGateway;
+    private type: string;
 
-    constructor(cache: FoldersCache, gateway: ICreateFolderGateway) {
+    constructor(cache: FoldersCache, gateway: ICreateFolderGateway, type: string) {
         this.cache = cache;
         this.gateway = gateway;
+        this.type = type;
         makeAutoObservable(this);
     }
 
@@ -20,7 +22,7 @@ export class CreateFolderRepository implements ICreateFolderRepository {
             title: folder.title,
             slug: folder.slug,
             permissions: folder.permissions,
-            type: folder.type,
+            type: this.type,
             parentId: folder.parentId
         };
 

diff --git a/packages/app-aco/src/features/folder/createFolder/useCreateFolder.ts b/packages/app-aco/src/features/folder/createFolder/useCreateFolder.ts
@@ -16,8 +16,8 @@ export const useCreateFolder = (cache: FoldersCache, loading: LoadingRepository,
     }, [client]);
 
     const repository = useMemo(() => {
-        return new CreateFolderRepository(cache, gateway);
-    }, [cache, gateway]);
+        return new CreateFolderRepository(cache, gateway, type);
+    }, [cache, gateway, type]);
 
     const useCase = useMemo(() => {
         const createFolderUseCase = new CreateFolderUseCase(repository);
@@ -26,7 +26,7 @@ export const useCreateFolder = (cache: FoldersCache, loading: LoadingRepository,
 
     const createFolder = useCallback(
         (params: CreateFolderParams) => {
-            return useCase.execute({ ...params, type });
+            return useCase.execute(params);
         },
         [useCase]
     );

diff --git a/packages/app-aco/src/features/folder/deleteFolder/useDeleteFolder.ts b/packages/app-aco/src/features/folder/deleteFolder/useDeleteFolder.ts
@@ -8,7 +8,7 @@ import { DeleteFolderUseCase } from "./DeleteFolderUseCase";
 import { DeleteFolderUseCaseWithLoading } from "./DeleteFolderUseCaseWithLoading";
 import { DeleteFolderParams } from "./IDeleteFolderUseCase";
 
-export const useDeleteFolder = (cache: FoldersCache, loading: LoadingRepository, type: string) => {
+export const useDeleteFolder = (cache: FoldersCache, loading: LoadingRepository) => {
     const client = useApolloClient();
 
     const gateway = useMemo(() => {
@@ -26,7 +26,7 @@ export const useDeleteFolder = (cache: FoldersCache, loading: LoadingRepository,
 
     const deleteFolder = useCallback(
         (params: DeleteFolderParams) => {
-            return useCase.execute({ ...params, type });
+            return useCase.execute(params);
         },
         [useCase]
     );

diff --git a/packages/app-aco/src/features/folder/listFolders/IListFoldersRepository.ts b/packages/app-aco/src/features/folder/listFolders/IListFoldersRepository.ts
@@ -1,3 +1,3 @@
 export interface IListFoldersRepository {
-    execute: (type: string) => Promise<void>;
+    execute: () => Promise<void>;
 }
diff --git a/packages/app-aco/src/features/folder/listFolders/IListFoldersUseCase.ts b/packages/app-aco/src/features/folder/listFolders/IListFoldersUseCase.ts
@@ -1,7 +1,3 @@
-export interface ListFoldersParams {
-    type: string;
-}
-
 export interface IListFoldersUseCase {
-    execute: (params: ListFoldersParams) => Promise<void>;
+    execute: () => Promise<void>;
 }
diff --git a/packages/app-aco/src/features/folder/listFolders/ListFoldersRepository.ts b/packages/app-aco/src/features/folder/listFolders/ListFoldersRepository.ts
@@ -7,15 +7,17 @@ import { IListFoldersRepository } from "./IListFoldersRepository";
 export class ListFoldersRepository implements IListFoldersRepository {
     private cache: FoldersCache;
     private gateway: IListFoldersGateway;
+    private type: string;
 
-    constructor(cache: FoldersCache, gateway: IListFoldersGateway) {
+    constructor(cache: FoldersCache, gateway: IListFoldersGateway, type: string) {
         this.cache = cache;
         this.gateway = gateway;
+        this.type = type;
         makeAutoObservable(this);
     }
 
-    async execute(type: string) {
-        const items = await this.gateway.execute(type);
+    async execute() {
+        const items = await this.gateway.execute(this.type);
         await this.cache.setMultiple(items.map(item => Folder.create(item)));
     }
 }
diff --git a/packages/app-aco/src/features/folder/listFolders/ListFoldersUseCase.ts b/packages/app-aco/src/features/folder/listFolders/ListFoldersUseCase.ts
@@ -1,4 +1,4 @@
-import { IListFoldersUseCase, ListFoldersParams } from "./IListFoldersUseCase";
+import { IListFoldersUseCase } from "./IListFoldersUseCase";
 import { IListFoldersRepository } from "./IListFoldersRepository";
 
 export class ListFoldersUseCase implements IListFoldersUseCase {
@@ -8,7 +8,7 @@ export class ListFoldersUseCase implements IListFoldersUseCase {
         this.repository = repository;
     }
 
-    async execute(params: ListFoldersParams) {
-        await this.repository.execute(params.type);
+    async execute() {
+        await this.repository.execute();
     }
 }
diff --git a/packages/app-aco/src/features/folder/listFolders/ListFoldersUseCaseWithLoading.ts b/packages/app-aco/src/features/folder/listFolders/ListFoldersUseCaseWithLoading.ts
@@ -1,6 +1,6 @@
 import { ILoadingRepository } from "@webiny/app-utils";
 import { LoadingActionsEnum } from "~/types";
-import { IListFoldersUseCase, ListFoldersParams } from "./IListFoldersUseCase";
+import { IListFoldersUseCase } from "./IListFoldersUseCase";
 
 export class ListFoldersUseCaseWithLoading implements IListFoldersUseCase {
     private loadingRepository: ILoadingRepository;
@@ -11,10 +11,7 @@ export class ListFoldersUseCaseWithLoading implements IListFoldersUseCase {
         this.useCase = useCase;
     }
 
-    async execute(params: ListFoldersParams) {
-        await this.loadingRepository.runCallBack(
-            this.useCase.execute(params),
-            LoadingActionsEnum.list
-        );
+    async execute() {
+        await this.loadingRepository.runCallBack(this.useCase.execute(), LoadingActionsEnum.list);
     }
 }
diff --git a/packages/app-aco/src/features/folder/listFolders/useListFolders.ts b/packages/app-aco/src/features/folder/listFolders/useListFolders.ts
@@ -15,16 +15,16 @@ export const useListFolders = (cache: FoldersCache, loading: LoadingRepository,
     }, [client]);
 
     const repository = useMemo(() => {
-        return new ListFoldersRepository(cache, gateway);
-    }, [cache, gateway]);
+        return new ListFoldersRepository(cache, gateway, type);
+    }, [cache, gateway, type]);
 
     const useCase = useMemo(() => {
         const listFolderUseCase = new ListFoldersUseCase(repository);
         return new ListFoldersUseCaseWithLoading(loading, listFolderUseCase);
     }, [repository, loading]);
 
     const listFolders = useCallback(() => {
-        return useCase.execute({ type });
+        return useCase.execute();
     }, [useCase]);
 
     return {

diff --git a/packages/app-aco/src/features/folder/updateFolder/useUpdateFolder.ts b/packages/app-aco/src/features/folder/updateFolder/useUpdateFolder.ts
@@ -8,7 +8,7 @@ import { UpdateFolderUseCase } from "./UpdateFolderUseCase";
 import { UpdateFolderUseCaseWithLoading } from "./UpdateFolderUseCaseWithLoading";
 import { UpdateFolderParams } from "./IUpdateFolderUseCase";
 
-export const useUpdateFolder = (cache: FoldersCache, loading: LoadingRepository, type: string) => {
+export const useUpdateFolder = (cache: FoldersCache, loading: LoadingRepository) => {
     const client = useApolloClient();
 
     const gateway = useMemo(() => {
@@ -26,7 +26,7 @@ export const useUpdateFolder = (cache: FoldersCache, loading: LoadingRepository,
 
     const updateFolder = useCallback(
         (params: UpdateFolderParams) => {
-            return useCase.execute({ ...params, type });
+            return useCase.execute(params);
         },
         [useCase]
     );

diff --git a/packages/app-aco/src/hooks/useFolders.ts b/packages/app-aco/src/hooks/useFolders.ts
@@ -52,9 +52,9 @@ export const useFolders = () => {
     }, [type]);
 
     const { createFolder } = useCreateFolder(foldersCache, loadingRepository, type);
-    const { deleteFolder } = useDeleteFolder(foldersCache, loadingRepository, type);
+    const { deleteFolder } = useDeleteFolder(foldersCache, loadingRepository);
     const { listFolders } = useListFolders(foldersCache, loadingRepository, type);
-    const { updateFolder } = useUpdateFolder(foldersCache, loadingRepository, type);
+    const { updateFolder } = useUpdateFolder(foldersCache, loadingRepository);
     const { getDescendantFolders } = useGetDescendantFolders(foldersCache);
     const { getFolder } = useGetFolder(foldersCache, loadingRepository);