From 81042f19515e20754d6e1b3fb6f9881b9dc451a7 Mon Sep 17 00:00:00 2001 From: Silviu Popa Date: Fri, 14 May 2021 15:47:35 +0300 Subject: [PATCH] [ACA-3700] - fix suspened date start date (#7020) * fix suspened date start date * remove unnecesarry parameters --- .../models/process-filter-cloud.model.spec.ts | 29 +++++++++++++++++++ .../models/process-filter-cloud.model.ts | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.spec.ts index ef38507403..882a8734d7 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.spec.ts @@ -15,6 +15,8 @@ * limitations under the License. */ +import moment from 'moment'; +import { DateCloudFilterType } from 'process-services-cloud'; import { ProcessFilterCloudModel } from './process-filter-cloud.model'; describe('ProcessFilterCloudModel', () => { @@ -35,4 +37,31 @@ describe('ProcessFilterCloudModel', () => { expect(model.appVersion).toEqual([1, 2]); }); + + it('should get suspended start and end date if date type is today', () => { + const date = new Date(); + const model = new ProcessFilterCloudModel({ + suspendedDateType: DateCloudFilterType.TODAY + }); + expect(model.suspendedFrom).toEqual(moment(date).startOf('day').toISOString(true)); + expect(model.suspendedTo).toEqual(moment(date).endOf('day').toISOString(true)); + }); + + it('should get completed date start and end date if date type is today', () => { + const date = new Date(); + const model = new ProcessFilterCloudModel({ + completedDateType: DateCloudFilterType.TODAY + }); + expect(model.completedFrom).toEqual(moment(date).startOf('day').toISOString(true)); + expect(model.completedTo).toEqual(moment(date).endOf('day').toISOString(true)); + }); + + it('should get started date start and end date if date type is today', () => { + const date = new Date(); + const model = new ProcessFilterCloudModel({ + startedDateType: DateCloudFilterType.TODAY + }); + expect(model.startFrom).toEqual(moment(date).startOf('day').toISOString(true)); + expect(model.startTo).toEqual(moment(date).endOf('day').toISOString(true)); + }); }); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts index 011e02ff01..21a7b011ce 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts @@ -150,7 +150,7 @@ export class ProcessFilterCloudModel { if (this.isDateRangeType(this.suspendedDateType)) { return this._suspendedFrom; } - return this.getEndDate(this.suspendedDateType); + return this.getStartDate(this.suspendedDateType); } get suspendedTo(): string {