Merge branch 'develop' into feature-2645/feedback-request-add-ability-to-request-feedback-from-external-source

# Conflicts:
#	server/src/main/java/com/objectcomputing/checkins/services/reports/ReportDataCollation.java
#	server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java

Author: Luch76

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.8"
+version "0.8.10"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/services/reports/ReportDataCollation.java

@@ -22,16 +22,9 @@
 import com.objectcomputing.checkins.services.feedback_template.template_question.TemplateQuestion;
 import com.objectcomputing.checkins.services.employee_hours.EmployeeHoursServices;
 import com.objectcomputing.checkins.services.employee_hours.EmployeeHours;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import java.util.UUID;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashMap;
+import java.util.*;
 import java.time.LocalDate;
 import java.time.Month;
 import java.nio.ByteBuffer;
@@ -222,27 +215,29 @@ public ReportHours getReportHours() {
     private List<Feedback> getFeedbackType(FeedbackType type) {
       List<Feedback> feedback = new ArrayList<Feedback>();
 
+      ReviewPeriod reviewPeriod = reviewPeriodServices.findById(reviewPeriodId);
       // Get the list of requests for the member and review period.
       // We will need to cross-reference the templates.
       LocalDateRange dateRange = getDateRange();
       List<FeedbackRequest> requests =
         feedbackRequestServices.findByValues(null, memberId, null, null, null, null, null, null);
 
+        feedbackRequestServices.findByValues(null, memberId, null,
+                reviewPeriod.getPeriodStartDate().toLocalDate(), null, null, null);
+      List<FeedbackRequest> filtered = new LinkedList<>();
       // Iterate over each request and find the template.  Determine the purpose
       // of the template.
-      ReviewPeriod reviewPeriod = reviewPeriodServices.findById(reviewPeriodId);
       Map<UUID, String> templates = new HashMap<UUID, String>();
       for (FeedbackRequest request: requests) {
         // Make sure we haven't already considered this template.
         // Also, require that the request either be directly associated with
         // our review period or that the request was submitted within the time
         // range of our review period.
-        if (!templates.containsKey(request.getTemplateId()) &&
-            ((request.getReviewPeriodId() != null &&
+        if ((request.getReviewPeriodId() != null &&
               request.getReviewPeriodId().equals(reviewPeriod.getId())) ||
-             (request.getSubmitDate() != null &&
-              dateInRange(request.getSubmitDate(), dateRange.start,
-                          dateRange.end)))) {
+             (request.getStatus().equalsIgnoreCase("submitted") &&
+                     request.getSendDate() != null &&
+                     request.getSendDate().isBefore(reviewPeriod.getCloseDate().toLocalDate()))) {
           try {
             FeedbackTemplate template =
                    feedbackTemplateServices.getById(request.getTemplateId());
@@ -263,7 +258,10 @@ private List<Feedback> getFeedbackType(FeedbackType type) {
                 break;
             }
             if (use) {
-              templates.put(template.getId(), template.getTitle());
+                filtered.add(request);
+                if(!templates.containsKey(template.getId())) {
+                    templates.put(template.getId(), template.getTitle());
+                }
             }
           } catch(NotFoundException ex) {
             LOG.error(ex.toString());
@@ -277,7 +275,7 @@ private List<Feedback> getFeedbackType(FeedbackType type) {
         String templateTitle = templates.get(templateId);
         List<Feedback.Answer> feedbackAnswers =
                                    new ArrayList<Feedback.Answer>();
-        for (FeedbackRequest request: requests) {
+        for (FeedbackRequest request: filtered) {
           if (request.getTemplateId().equals(templateId)) {
             UUID recipientId = request.getRecipientId();
             MemberProfile recipient = memberProfileServices.getById(

server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java

@@ -4,11 +4,16 @@
 import com.objectcomputing.checkins.services.feedback_template.FeedbackTemplate;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
-
+import jnr.constants.platform.Local;
 import java.time.LocalDate;
-
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalField;
+import java.util.Date;
+import java.util.Random;
 import java.util.UUID;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 public interface FeedbackRequestFixture extends RepositoryFixture, FeedbackTemplateFixture {
 
@@ -92,6 +97,15 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
         return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), null, templateId, testDate, null, "pending", null, null, externalRecipient.getId()));
     }
 
+    default LocalDate getRandomLocalDateTime(LocalDateTime start, LocalDateTime end) {
+        LocalDate startDate = start.toLocalDate();
+        long daysBetween = ChronoUnit.DAYS.between(startDate, end.toLocalDate());
+        Random random = new Random();
+        long randomDays = random.nextLong(daysBetween);
+
+        return startDate.plusDays(randomDays);
+    }
+
     /**
      * Saves a sample feedback request
      * @param creator The {@link MemberProfile} of the creator of the feedback request

server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java

@@ -81,10 +81,10 @@ default ReviewPeriod createAClosedReviewPeriod() {
 
     default ReviewPeriod createAClosedReviewPeriod(
                            LocalDateTime periodStart, LocalDateTime periodEnd) {
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS);
-        LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
+        LocalDateTime launchDate = periodEnd.plusMinutes(1)
+                                                .truncatedTo(ChronoUnit.MILLIS).plusDays(1);
+        LocalDateTime selfReviewCloseDate = launchDate.plusDays(3);
+        LocalDateTime closeDate = selfReviewCloseDate.plusDays(7);
         return getReviewPeriodRepository().save(
           new ReviewPeriod(
                  "Period of Closure", ReviewStatus.CLOSED, null, null,

server/src/test/java/com/objectcomputing/checkins/services/reports/ReportDataControllerTest.java

@@ -75,7 +75,7 @@ void createRolesAndPermissions() {
     questionTwo = saveAnotherTemplateQuestion(feedbackTemplate, 2);
     feedbackRequest = saveSampleFeedbackRequest(admin, regular, admin,
                                                 feedbackTemplate.getId(),
-                                                reviewPeriod);
+                                                reviewPeriod, "submitted");
     saveSampleFeedbackAnswer(questionOne.getId(), feedbackRequest.getId());
     saveSampleFeedbackAnswer(questionTwo.getId(), feedbackRequest.getId());
 

web-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "private": true,
   "type": "module",
   "dependencies": {

web-ui/src/components/kudos_dialog/KudosDialog.jsx

@@ -317,13 +317,13 @@ const KudosDialog = ({ open, recipient, teamId, onClose }) => {
               value={message}
               onChange={handleMessageChange}
             />
-            <Alert
+            {publicKudos ? <Alert
               severity="info"
               style={{ marginTop: '1rem', marginBottom: '2rem' }}
             >
               Kudos will be visible to admins for approval, then sent to the
               recipient.
-            </Alert>
+            </Alert> : <div style={{ height: "20px" }}/>}
             <Button
               variant="contained"
               disabled={message.trim().length === 0}