fix(page-job-scheduler): corrige erro quando 'firstExecution' undefined

Corrigo erro quando 'firstExecution' é definido como undefined fixes DTHFUI-10385
po-ui · Dec 6, 2024 · c916ed4 · c916ed4
1 parent d77f819
commit c916ed4
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 9 deletions.
diff --git a/...emplates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts b/...emplates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts
@@ -786,4 +786,22 @@ describe('PoPageJobSchedulerComponent:', () => {
       expect(executionElementHiddenAttribute).toBeFalsy();
     });
   });
+
+  it(`getSteps: should use 'literals' when the parameterization step title is not defined`, () => {
+    const mock = Object.assign(new QueryList(), {
+      _results: [{}, {}],
+      length: 1
+    }) as QueryList<PoJobSchedulerParametersTemplateDirective>;
+
+    component.parametersTemplate = mock;
+    component['getSteps']();
+
+    const result = component['steps'].slice(1, -1);
+    const resultExpected = [
+      { label: `${component['literals']['parameterization']} 1` },
+      { label: `${component['literals']['parameterization']} 2` }
+    ];
+
+    expect(result).toEqual(resultExpected);
+  });
 });
diff --git a/.../templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts b/.../templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts
@@ -379,6 +379,84 @@ describe('PoPageJobSchedulerService:', () => {
       expect(poPageJobSchedulerService['removeInvalidKeys']).toHaveBeenCalledWith(jobSchedulerInternal);
     });
 
+    it(`convertToJobScheduler: should ignore when 'firstExecutionHour' is set but 'firstExecution' is not set`, () => {
+      const jobSchedulerInternal = {
+        executionParameter: 'value',
+        firstExecution: undefined,
+        firstExecutionHour: '15:30',
+        processID: '1'
+      };
+
+      const jobSchedulerInternalExpected = {
+        executionParameter: 'value',
+        firstExecution: undefined,
+        processID: '1'
+      };
+
+      const result = <any>poPageJobSchedulerService['convertToJobScheduler'](jobSchedulerInternal);
+
+      expect(result).toEqual(jobSchedulerInternalExpected);
+    });
+
+    it(`convertToJobScheduler: should ignore when 'firstExecutionHour' is set but 'firstExecution' is set date invalid`, () => {
+      const jobSchedulerInternal = {
+        executionParameter: 'value',
+        firstExecution: 'XPTO',
+        firstExecutionHour: '99',
+        processID: '1'
+      };
+
+      const jobSchedulerInternalExpected = {
+        executionParameter: 'value',
+        firstExecution: 'XPTO',
+        processID: '1'
+      };
+
+      const result = <any>poPageJobSchedulerService['convertToJobScheduler'](jobSchedulerInternal);
+
+      expect(result).toEqual(jobSchedulerInternalExpected);
+    });
+
+    it(`convertToJobScheduler: should ignore when 'firstExecutionHour' is set but 'firstExecution' is set string in format yyyy-mm-dd`, () => {
+      const jobSchedulerInternal = {
+        executionParameter: 'value',
+        firstExecution: 'XPTO-XP-TO',
+        firstExecutionHour: '15:30',
+        processID: '1'
+      };
+
+      const jobSchedulerInternalExpected = {
+        executionParameter: 'value',
+        firstExecution: 'XPTO-XP-TO',
+        processID: '1'
+      };
+
+      const result = <any>poPageJobSchedulerService['convertToJobScheduler'](jobSchedulerInternal);
+
+      expect(result).toEqual(jobSchedulerInternalExpected);
+    });
+
+    it(`convertToJobScheduler: should ignore 'firstExecutionHour' when thrown error`, () => {
+      const jobSchedulerInternal = {
+        executionParameter: 'value',
+        firstExecution: '2024-12-30',
+        firstExecutionHour: '15:30',
+        processID: '1'
+      };
+
+      const jobSchedulerInternalExpected = {
+        executionParameter: 'value',
+        firstExecution: '2024-12-30',
+        processID: '1'
+      };
+
+      spyOn(utilsFunctions, 'convertDateToISOExtended').and.throwError('Convert Date');
+
+      const result = <any>poPageJobSchedulerService['convertToJobScheduler'](jobSchedulerInternal);
+
+      expect(result).toEqual(jobSchedulerInternalExpected);
+    });
+
     it(`convertToJobSchedulerInternal: should set 'jobSchedulerInternal.firstExecutionHour' with 'getHourFirstExecution'
       return if 'firstExecution' is defined`, () => {
       const jobSchedulerInternal = {
@@ -483,6 +561,7 @@ describe('PoPageJobSchedulerService:', () => {
 
       expect(result).toEqual(jobSchedulerInternalExpected);
     });
+
     it(`convertToJobSchedulerInternal: should return the merge between 'jobSchedulerInternal' and
       the return from 'convertToPeriodicityInternal'`, () => {
       const jobSchedulerInternal = {
@@ -788,6 +867,15 @@ describe('PoPageJobSchedulerService:', () => {
       );
     });
 
+    it(`replaceHourFirstExecution: should replace hour add time zone`, () => {
+      const stringDate = new Date().toString();
+      const timeZone = `${stringDate.substring(28, 31)}:${stringDate.substring(31, 33)}`;
+
+      const result = `2025-12-24T23:59:00${timeZone}`;
+
+      expect(poPageJobSchedulerService['replaceHourFirstExecution']('2025-12-24', '23:59')).toBe(result);
+    });
+
     it('returnValidExecutionParameter: should remove keys that have undefined value', () => {
       const parameter = {
         numberKey: 1,

diff --git a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts
@@ -232,18 +232,35 @@ export class PoPageJobSchedulerService {
   }
 
   private replaceHourFirstExecution(date: string, time: string): string {
-    const dateSplited = date.split('-');
-    const year = parseInt(dateSplited[0]);
-    const monthIndex = parseInt(dateSplited[1]) - 1;
-    const day = parseInt(dateSplited[2]);
+    try {
+      if (!date) {
+        return date;
+      }
+
+      const dateSplited = date.split('-');
+      const timeSplited = time.split(':');
+
+      if (dateSplited.length < 2 || timeSplited.length < 1) {
+        return date;
+      }
 
-    const timeSplited = time.split(':');
-    const hours = parseInt(timeSplited[0], 10);
-    const minutes = parseInt(timeSplited[1], 10);
+      const year = parseInt(dateSplited[0]);
+      const monthIndex = parseInt(dateSplited[1]) - 1;
+      const day = parseInt(dateSplited[2]);
 
-    const firstExecutionDate = new Date(year, monthIndex, day, hours, minutes);
+      const hours = parseInt(timeSplited[0], 10);
+      const minutes = parseInt(timeSplited[1], 10);
 
-    return convertDateToISOExtended(firstExecutionDate);
+      const firstExecutionDate = new Date(year, monthIndex, day, hours, minutes);
+
+      if (!(firstExecutionDate instanceof Date && !isNaN(firstExecutionDate.getTime()))) {
+        return date;
+      }
+
+      return convertDateToISOExtended(firstExecutionDate);
+    } catch {
+      return date;
+    }
   }
 
   private returnValidExecutionParameter(parameter: object) {