Merge branch 'hotfix/finan-last-week' into develop

RJ-SMTR · Oct 29, 2024 · 694934b · 694934b
2 parents d98c6a0 + cb130f0
commit 694934b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-cct",
-  "version": "0.13.10",
+  "version": "0.13.12",
   "description": "",
   "author": "",
   "private": true,

diff --git a/src/utils/payment-date-utils.ts b/src/utils/payment-date-utils.ts
@@ -4,6 +4,7 @@ import {
   endOfDay,
   isFriday,
   isSameMonth,
+  isSameYear,
   isThursday,
   nextFriday,
   previousFriday,
@@ -249,19 +250,30 @@ function getFirstLastFridays(
       r.endDate = previousFriday(r.endDate);
     }
 
-    // Remover semanas do futuro
-    const today = new Date();
-    /** Pega de qui-qua */
-    const thisFriday = isThursday(today)
-      ? addDays(today, 8)
-      : nextFriday(today);
-    if (r.endDate > thisFriday) {
-      r.endDate = thisFriday;
-    }
+    r.endDate = removeFutureWeeks(r.endDate);
+    r.endDate = validateLastMonthWeek(r.endDate, timeInterval);
   }
   return r;
 }
 
+function removeFutureWeeks(endDate: Date) {
+  let newEndDate = endDate;
+  const today = new Date();
+  /** Pega de qui-qua */
+  const thisFriday = isThursday(today) ? addDays(today, 8) : nextFriday(today);
+  if (newEndDate > thisFriday) {
+    newEndDate = thisFriday;
+  }
+  return newEndDate;
+}
+
+function validateLastMonthWeek(friday: Date, timeInterval?: TimeIntervalEnum) {
+  const isLastMonth = timeInterval === TimeIntervalEnum.LAST_MONTH;
+  const isLastWeek = !isSameMonth(friday, nextFriday(friday));
+  const isCurrentYearMonth = isSameYear(friday, new Date()) && isSameMonth(friday, new Date());
+  return isLastMonth && isLastWeek && isCurrentYearMonth ? nextFriday(friday) : friday;
+}
+
 export function validateDate(
   startDateStr?: string,
   endDateStr?: string,