@revolugo/common 7.4.1-rc.1 → 7.4.1-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revolugo/common",
-  "version": "7.4.1-rc.1",
+  "version": "7.4.1-rc.3",
   "private": false,
   "description": "Revolugo common",
   "author": "Revolugo",

package/src/cancellation-policies.ts

@@ -4,16 +4,16 @@ import { isEmpty } from './utils/is-empty.ts'
 
 import type { ICancellationPolicy } from './types/cancellation-policy.ts'
 
-function nextDay(date: string) {
-  return dayjs(date).add(1, 'day').utc().format()
-}
-
 function isUTCDate(date: string) {
   return /\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])T(?:[01]\d|2[0-3])(?::[0-5]\d){2}(?:\.\d+|)(?:Z|[+-]\d{2}:?\d{2})/u.test(
     date,
   )
 }
 
+function nextDay(date: string) {
+  return dayjs(date).add(1, 'day').utc().format()
+}
+
 function filterMatchingCancellationPolicies({
   cancellationPolicies,
   date,
@@ -180,17 +180,13 @@ export function sanitizeCancellationPolicies({
     .filter(cp => dayjs(cp.dateTo).diff(dayjs(cp.dateFrom), 'minutes') >= 20)
     .sort((a, b) => (dayjs(a.dateFrom).isAfter(dayjs(b.dateFrom)) ? 1 : -1))
     .map(cp => {
-      cp.dateFrom = dayjs
-        .tz(cp.dateFrom, timezone)
-        .utc(isUTCDate(cp.dateFrom))
-        .utc()
-        .format()
-
-      cp.dateTo = dayjs
-        .tz(cp.dateTo, timezone)
-        .utc(isUTCDate(cp.dateTo))
-        .utc()
-        .format()
+      cp.dateFrom = isUTCDate(cp.dateFrom)
+        ? dayjs(cp.dateFrom).utc().format()
+        : dayjs.tz(cp.dateFrom, timezone).utc().format()
+
+      cp.dateTo = isUTCDate(cp.dateTo)
+        ? dayjs(cp.dateTo).utc().format()
+        : dayjs.tz(cp.dateTo, timezone).utc().format()
 
       return cp
     })