[Tech Debt] Fix off-by-one error in previous year calculations

18F · Feb 24, 2025 · 6d1e0f4 · 6d1e0f4
1 parent b3800ed
commit 6d1e0f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/google_analytics/query_builder.js b/src/google_analytics/query_builder.js
@@ -62,14 +62,16 @@ function _mapStringToDateRange(rangeString) {
   );
   const daysSinceStartOfPreviousYear =
     differenceInDays(startOfCurrentYear(), startOfPreviousYear()) +
-    daysSinceStartOfCurrentYear;
+    daysSinceStartOfCurrentYear -
+    1;
   const daysSinceStartOfCurrentFiscalYear = differenceInDays(
     today(),
     startOfCurrentFiscalYear(),
   );
   const daysSinceStartOfPreviousFiscalYear =
     differenceInDays(startOfCurrentFiscalYear(), startOfPreviousFiscalYear()) +
-    daysSinceStartOfCurrentFiscalYear;
+    daysSinceStartOfCurrentFiscalYear -
+    1;
   const descriptorToDateRangeHashMap = {
     yesterday: { startDate: "yesterday", endDate: "yesterday" },
     "7-days": { startDate: "7daysAgo", endDate: "yesterday" },

diff --git a/test/google_analytics/query_builder.test.js b/test/google_analytics/query_builder.test.js
@@ -83,11 +83,11 @@ describe("GoogleAnalyticsQueryBuilder", () => {
                 },
                 {
                   endDate: "49daysAgo",
-                  startDate: "415daysAgo",
+                  startDate: "414daysAgo",
                 },
                 {
                   endDate: "141daysAgo",
-                  startDate: "507daysAgo",
+                  startDate: "506daysAgo",
                 },
               ],
             },
@@ -168,11 +168,11 @@ describe("GoogleAnalyticsQueryBuilder", () => {
                 },
                 {
                   endDate: "291daysAgo",
-                  startDate: "657daysAgo",
+                  startDate: "656daysAgo",
                 },
                 {
                   endDate: "18daysAgo",
-                  startDate: "383daysAgo",
+                  startDate: "382daysAgo",
                 },
               ],
             },