@revolugo/common 7.3.0-rc.0 → 7.3.0-rc.2

package/package.json

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

package/src/cancellation-policies.ts

@@ -401,9 +401,10 @@ export function getCurrentPenaltyPercentage({
   })
 }
 
-export function isBetterCancellationPolicies(
+function checkCancellationPolicies(
   newVal: ICancellationPolicy[],
   oldVal: ICancellationPolicy[],
+  orEqual: boolean,
 ): boolean {
   if (isEmpty(newVal)) {
     return true
@@ -413,27 +414,8 @@ export function isBetterCancellationPolicies(
     return false
   }
 
-  if (!newVal[0]?.dateTo) {
-    return oldVal.every(oldCancellationPolicy => {
-      const relatedNewCancellationPolicy = newVal.find(newCancellationPolicy =>
-        dayjs(oldCancellationPolicy.dateTo).isBetween(
-          newCancellationPolicy.dateFrom,
-          newCancellationPolicy.dateTo,
-          null,
-          '[]',
-        ),
-      )
-
-      if (!relatedNewCancellationPolicy) {
-        return true
-      }
-
-      return (
-        oldCancellationPolicy.penaltyPercentage >=
-        relatedNewCancellationPolicy.penaltyPercentage
-      )
-    })
-  }
+  const isBetter = (oldPenalty: number, newPenalty: number) =>
+    orEqual ? oldPenalty >= newPenalty : oldPenalty > newPenalty
 
   return oldVal.every(oldCancellationPolicy => {
     const relatedNewCancellationPolicy = newVal.find(newCancellationPolicy =>
@@ -449,13 +431,27 @@ export function isBetterCancellationPolicies(
       return true
     }
 
-    return (
-      oldCancellationPolicy.penaltyPercentage >=
-      relatedNewCancellationPolicy.penaltyPercentage
+    return isBetter(
+      oldCancellationPolicy.penaltyPercentage,
+      relatedNewCancellationPolicy.penaltyPercentage,
     )
   })
 }
 
+export function isBetterCancellationPolicies(
+  newVal: ICancellationPolicy[],
+  oldVal: ICancellationPolicy[],
+): boolean {
+  return checkCancellationPolicies(newVal, oldVal, false)
+}
+
+export function isSameOrBetterCancellationPolicies(
+  newVal: ICancellationPolicy[],
+  oldVal: ICancellationPolicy[],
+): boolean {
+  return checkCancellationPolicies(newVal, oldVal, true)
+}
+
 export function parseCancellationPolicies(
   cancellationPolicies: {
     dateFrom: string