Adjust the inclusion to only rely on the request being sent after the period start date and before the close of the review

mkimberlin · mkimberlin · commit 2094d1fa0f74 · 2024-11-14T07:23:11.000-06:00
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/reports/ReportDataCollation.java b/server/src/main/java/com/objectcomputing/checkins/services/reports/ReportDataCollation.java
@@ -262,7 +262,7 @@ private List<Feedback> getFeedbackType(FeedbackType type) {
               case FeedbackType.feedback:
                 use = !template.getIsReview() && request.getStatus().equalsIgnoreCase("submitted") &&
                       request.getSendDate() != null && request.getSendDate().isAfter(reviewPeriod.getPeriodStartDate().toLocalDate()) &&
-                      request.getSubmitDate() != null && request.getSubmitDate().isBefore(reviewPeriod.getCloseDate().toLocalDate());
+                      request.getSendDate().isBefore(reviewPeriod.getCloseDate().toLocalDate());
                 break;
             }
             if (use) {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ private List<Feedback> getFeedbackType(FeedbackType type) {`
`262`	`262`	`case FeedbackType.feedback:`
`263`	`263`	`use = !template.getIsReview() && request.getStatus().equalsIgnoreCase("submitted") &&`
`264`	`264`	`request.getSendDate() != null && request.getSendDate().isAfter(reviewPeriod.getPeriodStartDate().toLocalDate()) &&`
`265`		`- request.getSubmitDate() != null && request.getSubmitDate().isBefore(reviewPeriod.getCloseDate().toLocalDate());`
	`265`	`+ request.getSendDate().isBefore(reviewPeriod.getCloseDate().toLocalDate());`
`266`	`266`	`break;`
`267`	`267`	`}`
`268`	`268`	`if (use) {`