moved the check inside a method and added unit tests for method

Alfresco · Jul 15, 2023 · 96b9553 · 96b9553
1 parent 4900879
commit 96b9553
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 8 deletions.
diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts
@@ -234,5 +234,36 @@ describe('Process filter', () => {
             });
 
         });
+
+        describe('isFilterAlreadyExisting', () => {
+            let dummyFilter;
+
+            beforeEach(() => {
+                dummyFilter = [
+                    { name: 'filter1' },
+                    { name: 'filter2' }
+                ];
+            });
+
+            it('should return true if the filter already exists', () => {
+                const filterName = 'filter2';
+                const isFilterAlreadyExistingSpy = spyOn<any>(service, 'isFilterAlreadyExisting').and.callThrough();
+
+                const result = service.isFilterAlreadyExisting(dummyFilter, filterName);
+
+                expect(isFilterAlreadyExistingSpy).toHaveBeenCalled();
+                expect(result).toBe(true);
+            });
+
+            it('should return false if the filter does not exist', () => {
+                const filterName = 'filter3';
+                const isFilterAlreadyExistingSpy = spyOn<any>(service, 'isFilterAlreadyExisting').and.callThrough();
+
+                const result = service.isFilterAlreadyExisting(dummyFilter, filterName);
+
+                expect(isFilterAlreadyExistingSpy).toHaveBeenCalled();
+                expect(result).toBe(false);
+            });
+        });
     });
 });
diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.ts
@@ -51,8 +51,7 @@ export class ProcessFilterService {
                 map((response) => {
                     const filters: FilterProcessRepresentationModel[] = [];
                     response.data.forEach((filter) => {
-                        const isFilterAlreadyExisting = filters.some((existingFilter) => existingFilter.name === filter.name);
-                        if (!isFilterAlreadyExisting) {
+                        if (!this.isFilterAlreadyExisting(filters, filter.name)) {
                             const filterModel = new FilterProcessRepresentationModel(filter);
                             filters.push(filterModel);
                         }
@@ -119,8 +118,7 @@ export class ProcessFilterService {
                 (res) => {
                     const filters: FilterProcessRepresentationModel[] = [];
                     res.forEach((filter) => {
-                        const isFilterAlreadyExisting = filters.some((existingFilter) => existingFilter.name === filter.name);
-                        if (!isFilterAlreadyExisting) {
+                        if (!this.isFilterAlreadyExisting(filters, filter.name)) {
                             if (filter.name === runningFilter.name) {
                                 filters.push(new FilterProcessRepresentationModel({ ...filter, filter: runningFilter.filter, appId }));
                             } else if (filter.name === completedFilter.name) {
@@ -139,6 +137,10 @@ export class ProcessFilterService {
         });
     }
 
+    isFilterAlreadyExisting(filters: any, filterName: string): boolean {
+        return filters.some((existingFilter) => existingFilter.name === filterName);
+    }
+
     /**
      * Creates and returns a filter that matches "running" process instances.
      *

diff --git a/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts
@@ -251,4 +251,35 @@ describe('Activiti Task filter Service', () => {
             });
         });
    });
+
+    describe('isFilterAlreadyExisting', () => {
+        let dummyFilter;
+
+        beforeEach(() => {
+            dummyFilter = [
+                { name: 'filter1' },
+                { name: 'filter2' }
+            ];
+        });
+
+        it('should return true if the filter already exists', () => {
+            const filterName = 'filter2';
+            const isFilterAlreadyExistingSpy = spyOn<any>(service, 'isFilterAlreadyExisting').and.callThrough();
+
+            const result = service.isFilterAlreadyExisting(dummyFilter, filterName);
+
+            expect(isFilterAlreadyExistingSpy).toHaveBeenCalled();
+            expect(result).toBe(true);
+        });
+
+        it('should return false if the filter does not exist', () => {
+            const filterName = 'filter3';
+            const isFilterAlreadyExistingSpy = spyOn<any>(service, 'isFilterAlreadyExisting').and.callThrough();
+
+            const result = service.isFilterAlreadyExisting(dummyFilter, filterName);
+
+            expect(isFilterAlreadyExistingSpy).toHaveBeenCalled();
+            expect(result).toBe(false);
+        });
+    });
 });
diff --git a/lib/process-services/src/lib/task-list/services/task-filter.service.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.ts
@@ -67,8 +67,7 @@ export class TaskFilterService {
                 (res) => {
                     const filters: FilterRepresentationModel[] = [];
                     res.forEach((filter) => {
-                        const isFilterAlreadyExisting = filters.some((existingFilter) => existingFilter.name === filter.name);
-                        if (!isFilterAlreadyExisting) {
+                        if (!this.isFilterAlreadyExisting(filters, filter.name)) {
                             if (filter.name === involvedTasksFilter.name) {
                                 filters.push(new FilterRepresentationModel({
                                     ...filter,
@@ -117,8 +116,7 @@ export class TaskFilterService {
                 map((response: any) => {
                     const filters: FilterRepresentationModel[] = [];
                     response.data.forEach((filter: FilterRepresentationModel) => {
-                        const isFilterAlreadyExisting = filters.some((existingFilter) => existingFilter.name === filter.name);
-                        if (!isFilterAlreadyExisting) {
+                        if (!this.isFilterAlreadyExisting(filters, filter.name)) {
                             const filterModel = new FilterRepresentationModel(filter);
                             filters.push(filterModel);
                         }
@@ -129,6 +127,10 @@ export class TaskFilterService {
             );
     }
 
+    isFilterAlreadyExisting(filters: FilterRepresentationModel[], filterName: string): boolean {
+        return filters.some((existingFilter) => existingFilter.name === filterName);
+    }
+
     /**
      * Gets a task filter by ID.
      *