#459461 - Fixed bug related with dates in evaluation time policy

Author: ppelgmv

src/app/pages/policies/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts

@@ -1,9 +1,9 @@
 
-import {addDays} from 'date-fns';
 import {policyLeftExpressions} from '../../../../../../shared/models/policy/policy-left-expressions';
 import {constraint, multi} from '../../../../../../shared/models/policy/ui-policy-expression-utils';
 import { UiPolicyExpression } from '../../../../../../shared/models/policy/ui-policy-expression';
 import { OperatorDto } from '../../../../../../shared/models/policy/ui-policy-constraint';
+import { adjustDate } from '../../../../../../shared/utils/date-utils';
 
 export const buildTimespanRestriction = (
   firstDay: Date,
@@ -13,7 +13,7 @@ export const buildTimespanRestriction = (
     constraint(
       policyLeftExpressions.policyEvaluationTime,
       operator,
-      value.toISOString(),
+      adjustDate(value, operator),
     );
 
   return multi(

src/app/shared/models/policy/policy-form-adapter.ts

@@ -4,6 +4,7 @@ import {PolicyOperatorConfig} from './policy-operators';
 import { UiPolicyConstraint, UiPolicyLiteral } from './ui-policy-constraint';
 import { filterNonNull } from '../../utils/array-utils';
 import { jsonValidator } from 'src/app/shared/validators/json-validator';
+import { adjustDate, convertUTCToLocalDate } from 'src/app/shared/utils/date-utils';
 
 export interface PolicyFormAdapter<T> {
   displayText: (value: UiPolicyLiteral) => string | null;
@@ -55,7 +56,7 @@ export const localDateAdapter: PolicyFormAdapter<Date | null> = {
       if (!value) {
         return value;
       }
-      return format(new Date(value), 'yyyy-MM-dd');
+      return format(convertUTCToLocalDate(value), 'yyyy-MM-dd');
     } catch (e) {
       return '' + value;
     }
@@ -72,7 +73,7 @@ export const localDateAdapter: PolicyFormAdapter<Date | null> = {
       return null;
     }
   },
-  buildValueFn: (value) => stringLiteral(value?.toISOString()),
+  buildValueFn: (value, operator) => stringLiteral(adjustDate(value, operator.id)),
   emptyConstraintValue: () => ({
     operator: 'LT',
     right: {

src/app/shared/utils/date-utils.ts

@@ -0,0 +1,41 @@
+import { OperatorDto } from "../models/policy/ui-policy-constraint";
+
+export function adjustDate(date: Date, operator: OperatorDto): string | null {
+  if (!date) {
+    return null;
+  }
+
+  if(operator === 'LEQ' || operator === 'LT') {
+    const adjustedDate = new Date(Date.UTC(
+      date.getFullYear(),
+      date.getMonth(),
+      date.getDate(),
+      23, 59, 59, 999
+    ));
+
+    return adjustedDate.toISOString();
+  } else {
+    const adjustedDate = new Date(Date.UTC(
+      date.getFullYear(),
+      date.getMonth(),
+      date.getDate(),
+      0, 0, 0, 0
+    ));
+
+    return adjustedDate.toISOString();
+  }
+
+}
+ export function convertUTCToLocalDate(utcISOString: string): Date {
+  const utcDate = new Date(utcISOString);
+
+  return new Date(
+    utcDate.getUTCFullYear(),
+    utcDate.getUTCMonth(),
+    utcDate.getUTCDate(),
+    utcDate.getUTCHours(),
+    utcDate.getUTCMinutes(),
+    utcDate.getUTCSeconds(),
+    utcDate.getUTCMilliseconds()
+  );
+}