Usage metrics now go back at least 3 years

jfkonecn · Aug 1, 2024 · 70d9e8d · 70d9e8d
1 parent 5da2253
commit 70d9e8d
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/src/test/java/org/mskcc/cbio/oncokb/web/rest/UsageAnalysisControllerIT.java b/src/test/java/org/mskcc/cbio/oncokb/web/rest/UsageAnalysisControllerIT.java
@@ -27,7 +27,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.mskcc.cbio.oncokb.config.Constants;
 import org.mskcc.cbio.oncokb.domain.User;
 import org.mskcc.cbio.oncokb.domain.enumeration.FileExtension;
@@ -522,7 +521,6 @@ private void addUsers(String[] userNames) throws Exception {
 
         for (int yearIndex = 0; yearIndex < 4; yearIndex++) {
           int year = currentYear - yearIndex;
-          Boolean isThisYear = yearIndex == 0;
 
           DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern(
             "yyyy-MM-dd"
@@ -584,33 +582,33 @@ private void addUsers(String[] userNames) throws Exception {
                   dayKey
                 );
 
-                boolean isAfterOrEqualToPast12Months = date.isAfter(
-                  today.minusMonths(11).withDayOfMonth(1).minusDays(1)
+                boolean isAfterOrEqualToPast3FullYearAndYearToDate = date.isAfter(
+                  today.minusYears(3).withDayOfYear(1).minusDays(1)
                 );
                 boolean isBeforeOrEqualToToday = date.isBefore(
-                  today.plusMonths(1).withDayOfMonth(1)
+                  today.plusDays(1)
                 );
 
-                // update expected response for monthly resource summary
-                if (isThisYear) {
+                Boolean shouldBeInResponse =
+                  isAfterOrEqualToPast3FullYearAndYearToDate &&
+                  isBeforeOrEqualToToday;
+
+                if (shouldBeInResponse) {
+                  // update expected response for monthly resource summary
                   updateResourceSummaryExpectedResponse(
                     value,
                     oncokbEndpoint,
                     monthKey
                   );
-                }
-
-                // update expected response for user usage endpoint
-                if (isThisYear) {
+                  // update expected response for user usage endpoint
                   safeAddNestedValueInFilesObject(
                     value,
                     usageUserEndpoint,
                     "summary",
                     "year",
                     oncokbEndpoint
                   );
-                }
-                if (isAfterOrEqualToPast12Months && isBeforeOrEqualToToday) {
+
                   safeAddNestedValueInFilesObject(
                     value,
                     usageUserEndpoint,
@@ -627,19 +625,15 @@ private void addUsers(String[] userNames) throws Exception {
                     dayKey,
                     oncokbEndpoint
                   );
-                }
 
-                if (isThisYear) {
                   updateSpecificEndpointUserUsageExpectedResponse(
                     value,
                     user,
                     oncokbEndpoint,
                     monthKey
                   );
-                }
 
-                // update user endpoint usage endpoint
-                if (isAfterOrEqualToPast12Months && isBeforeOrEqualToToday) {
+                  // update user endpoint usage endpoint
                   for (String usageSummaryEndpoint : userUsageSummaryEndpoints) {
                     safeAddNestedValueInFilesObject(
                       value,
@@ -657,9 +651,7 @@ private void addUsers(String[] userNames) throws Exception {
                       monthKey
                     );
                   }
-                }
 
-                if (isThisYear) {
                   userResourceUsage.put(
                     oncokbEndpoint,
                     userResourceUsage.get(oncokbEndpoint) + value