fix: mapping payload and fixing between and outside of time range M2-…

…8346 (#914) Co-authored-by: Felipe Imperio <felipeimp@Felipes-MacBook-Pro.local>
ChildMindInstitute · Dec 12, 2024 · f3a98fb · f3a98fb
1 parent ed9e49f
commit f3a98fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/entities/activity/model/mappers.ts b/src/entities/activity/model/mappers.ts
@@ -129,8 +129,6 @@ function mapConditionalLogic(dto: ConditionalLogicDto | null) {
                 updatedCondition.payload = { time: condition.payload.time };
                 break;
 
-              case 'OUTSIDE_OF_TIMES_RANGE':
-              case 'BETWEEN_TIMES_RANGE':
               case 'BETWEEN_TIMES':
               case 'OUTSIDE_OF_TIMES':
                 updatedCondition.payload = {
@@ -139,6 +137,15 @@ function mapConditionalLogic(dto: ConditionalLogicDto | null) {
                 };
                 break;
 
+              case 'OUTSIDE_OF_TIMES_RANGE':
+              case 'BETWEEN_TIMES_RANGE':
+                updatedCondition.payload = {
+                  minTime: condition.payload.minTime,
+                  maxTime: condition.payload.maxTime,
+                  fieldName: condition.payload.fieldName,
+                };
+                break;
+
               case 'GREATER_THAN_TIME_RANGE':
               case 'LESS_THAN_TIME_RANGE':
               case 'EQUAL_TO_TIME_RANGE':

diff --git a/src/entities/conditional-logic/model/conditions.ts b/src/entities/conditional-logic/model/conditions.ts
@@ -253,8 +253,8 @@ export const isBetweenTimesRange = (
 
   return (
     selectedTimeInMinutes !== null &&
-    selectedTimeInMinutes >= timeToMinutes(minTime) &&
-    selectedTimeInMinutes <= timeToMinutes(maxTime)
+    selectedTimeInMinutes > timeToMinutes(minTime) &&
+    selectedTimeInMinutes < timeToMinutes(maxTime)
   );
 };