fix(page-dynamic-search): ajusta o GET request com atributo range

Foi incluído o `$filter` para filtros complexos no GET Request
quando o atributo `range` está com `true`

Fixes #1211

Author: wsteixeira

projects/templates/src/lib/components/po-page-dynamic-search/po-page-dynamic-search.component.spec.ts

@@ -214,7 +214,7 @@ describe('PoPageDynamicSearchComponent:', () => {
       expect(component.poAdvancedFilter.open).toHaveBeenCalled();
     });
 
-    it(`onAdvancedSearch: should call 'setDisclaimers', 'setFilters' and 'advancedSearch.emit'`, () => {
+    it(`onAdvancedSearch: should call 'setDisclaimers', 'setFilters', 'addComplexFilter' and 'advancedSearch.emit'`, () => {
       const filter = { property: 'value1' };
       const optionsService = undefined;
 
@@ -224,13 +224,15 @@ describe('PoPageDynamicSearchComponent:', () => {
           : component.filters;
 
       spyOn(component, <any>'setDisclaimers');
+      spyOn(component, <any>'addComplexFilter').and.returnValue(filter);
       spyOn(component.advancedSearch, 'emit');
       spyOn(component, <any>'setFilters');
 
       component.onAdvancedSearch({ filter, optionsService });
 
       expect(component['setDisclaimers']).toHaveBeenCalledWith(filter, optionsService, visibleFilters);
       expect(component['setFilters']).toHaveBeenCalledBefore(component.advancedSearch.emit);
+      expect(component['addComplexFilter']).toHaveBeenCalledWith(filter);
       expect(component.advancedSearch.emit).toHaveBeenCalledWith(filter);
     });
 
@@ -285,7 +287,8 @@ describe('PoPageDynamicSearchComponent:', () => {
         },
         poPageList: {
           clearInputSearch: () => {}
-        }
+        },
+        addComplexFilter: () => ({})
       };
       const filteredItems = { filter: 'fakeFilter', optionsService: 'fakeOptionsService' };
       const isAdvancedSearch = true;
@@ -590,6 +593,84 @@ describe('PoPageDynamicSearchComponent:', () => {
       expect(component['setDisclaimers'](filters)).toEqual(result);
     });
 
+    it(`addComplexFilter: should return {}`, () => {
+      component.filters = [{ property: 'name' }, { property: 'genre' }, { property: 'birthdate' }];
+
+      const filters = {};
+
+      const result = {};
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
+    it(`addComplexFilter: should return filter without attribute 'range'`, () => {
+      component.filters = [{ property: 'name' }, { property: 'genre' }, { property: 'birthdate' }];
+
+      const filters = { name: 'Name1', genre: 'male', birthdate: '2020-01-15' };
+
+      const result = { name: 'Name1', genre: 'male', birthdate: '2020-01-15' };
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
+    it(`addComplexFilter: should return filter with attribute 'range'`, () => {
+      component.filters = [{ property: 'name' }, { property: 'genre' }, { property: 'birthdate', range: true }];
+
+      const filters = { name: 'Name1', genre: 'male', birthdate: { start: '2020-01-01', end: '2020-01-31' } };
+
+      const result = {
+        name: 'Name1',
+        genre: 'male',
+        $filter: `birthdate ge '2020-01-01' and birthdate le '2020-01-31'`
+      };
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
+    it(`addComplexFilter: should return filter with attribute 'range' and final date 'undefined'`, () => {
+      component.filters = [{ property: 'name' }, { property: 'genre' }, { property: 'birthdate', range: true }];
+
+      const filters = { name: 'Name1', genre: 'male', birthdate: { start: '2020-01-01', end: undefined } };
+
+      const result = { name: 'Name1', genre: 'male', birthdate: { start: '2020-01-01', end: undefined } };
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
+    it(`addComplexFilter: should return filter with attribute 'range' and initial date 'undefined'`, () => {
+      component.filters = [{ property: 'name' }, { property: 'genre' }, { property: 'birthdate', range: true }];
+
+      const filters = { name: 'Name1', genre: 'male', birthdate: { start: undefined, end: '2020-01-31' } };
+
+      const result = { name: 'Name1', genre: 'male', birthdate: { start: undefined, end: '2020-01-31' } };
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
+    it(`addComplexFilter: should return filter with two attribute 'range'`, () => {
+      component.filters = [
+        { property: 'name' },
+        { property: 'genre' },
+        { property: 'birthdate', range: true },
+        { property: 'deathdate', range: true }
+      ];
+
+      const filters = {
+        name: 'Name1',
+        genre: 'male',
+        birthdate: { start: '2020-01-01', end: '2020-01-31' },
+        deathdate: { start: '2021-01-01', end: '2021-01-31' }
+      };
+
+      const result = {
+        name: 'Name1',
+        genre: 'male',
+        $filter: `birthdate ge '2020-01-01' and birthdate le '2020-01-31' and deathdate ge '2021-01-01' and deathdate le '2021-01-31'`
+      };
+
+      expect(component['addComplexFilter'](filters)).toEqual(result);
+    });
+
     it('getFilterValueToDisclaimer: should return formated date if field type is PoDynamicFieldType.Date', () => {
       const field = { type: PoDynamicFieldType.Date, property: '1', label: 'date' };
       const value = '2020-08-12';

projects/templates/src/lib/components/po-page-dynamic-search/po-page-dynamic-search.component.ts

@@ -189,7 +189,8 @@ export class PoPageDynamicSearchComponent
   }
 
   onAdvancedSearch(filteredItems, isAdvancedSearch?) {
-    const { filter, optionsService } = filteredItems;
+    const { optionsService } = filteredItems;
+    let { filter } = filteredItems;
 
     const visibleFilters =
       this.visibleFixedFilters === false
@@ -200,6 +201,8 @@ export class PoPageDynamicSearchComponent
 
     this.setFilters(filter);
 
+    filter = this.addComplexFilter(filter);
+
     this.advancedSearch.emit(filter);
 
     if (isAdvancedSearch) {
@@ -295,7 +298,7 @@ export class PoPageDynamicSearchComponent
       return this.formatValueToCurrency(field, value);
     }
 
-    if (field.type === PoDynamicFieldType.Date) {
+    if (field.type === PoDynamicFieldType.Date || field.type?.toLowerCase() === PoDynamicFieldType.DateTime) {
       return field.range ? this.formatDate(value.start) + ' - ' + this.formatDate(value.end) : this.formatDate(value);
     }
 
@@ -436,4 +439,26 @@ export class PoPageDynamicSearchComponent
 
     return this.poPageCustomizationService.getCustomOptions(onLoad, originalOption, pageOptionSchema);
   }
+
+  private addComplexFilter(filter: object): object {
+    let complexFilter;
+
+    Object.keys(filter).forEach(property => {
+      if (filter[property].start && filter[property].end) {
+        if (!complexFilter) {
+          complexFilter = '';
+        } else {
+          complexFilter += ' and ';
+        }
+        complexFilter += `${property} ge '${filter[property].start}' and ${property} le '${filter[property].end}'`;
+        delete filter[property];
+      }
+    });
+
+    if (complexFilter) {
+      filter = Object.assign(filter, { $filter: complexFilter });
+    }
+
+    return filter;
+  }
 }