2024-10-22 - feedback - external reviewer - server-side

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/feedback_external_recipient/FeedbackExternalRecipientServicesImpl.java

@@ -1,8 +1,10 @@
 package com.objectcomputing.checkins.services.feedback_external_recipient;
 
+import com.objectcomputing.checkins.exceptions.NotFoundException;
 import jakarta.inject.Singleton;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 @Singleton
@@ -31,7 +33,12 @@ public void delete(UUID id) {
 
     @Override
     public FeedbackExternalRecipient getById(UUID id) {
-        return null;
+        Optional<FeedbackExternalRecipient> optional = feedbackExternalRecipientRepository.findById(id);
+        if (optional.isEmpty()) {
+            throw new NotFoundException("No external recipient found with id: " + id);
+        }
+        FeedbackExternalRecipient feedbackExternalRecipient = optional.get();
+        return feedbackExternalRecipient;
     }
 
     @Override

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestController.java

@@ -55,15 +55,6 @@ public FeedbackRequestController(FeedbackRequestServices feedbackReqServices, Fe
     public HttpResponse<FeedbackRequestResponseDTO> save(@Body @Valid @NotNull FeedbackRequestCreateDTO requestBody) {
         FeedbackRequest savedFeedbackRequest;
         FeedbackRequest feedbackRequest = fromDTO(requestBody);
-        /*
-        FeedbackExternalRecipient feedbackExternalRecipient = new FeedbackExternalRecipient();
-        feedbackExternalRecipient.setEmail("[email protected]");
-        feedbackExternalRecipient.setCompanyName("OCI");
-        feedbackExternalRecipient.setFirstName("None");
-        feedbackExternalRecipient.setLastName("None");
-        feedbackExternalRecipient = feedbackExternalRecipientServices.save(feedbackExternalRecipient);
-        feedbackRequest.setExternalRecipientId(feedbackExternalRecipient.getId());
-        */
         try {
             savedFeedbackRequest = feedbackReqServices.save(feedbackRequest);
         } catch (Exception e) {
@@ -126,11 +117,6 @@ public HttpResponse<FeedbackRequestResponseDTO> getById(UUID id) {
     @RequiredPermission(Permission.CAN_VIEW_FEEDBACK_REQUEST)
     @Get("/{?creatorId,requesteeId,recipientId,oldestDate,reviewPeriodId,templateId,requesteeIds}")
     public List<FeedbackRequestResponseDTO> findByValues(@Nullable UUID creatorId, @Nullable UUID requesteeId, @Nullable UUID recipientId, @Nullable @Format("yyyy-MM-dd") LocalDate oldestDate, @Nullable UUID reviewPeriodId, @Nullable UUID templateId, @Nullable List<UUID> requesteeIds, @Nullable UUID externalRecipientId) {
-        List<FeedbackRequestResponseDTO> feedbackRequestResponseDTOList = feedbackReqServices.findByValues(creatorId, requesteeId, recipientId, oldestDate, reviewPeriodId, templateId, requesteeIds, externalRecipientId)
-                .stream()
-                .map(this::fromEntity)
-                .toList();
-
         return feedbackReqServices.findByValues(creatorId, requesteeId, recipientId, oldestDate, reviewPeriodId, templateId, requesteeIds, externalRecipientId)
                 .stream()
                 .map(this::fromEntity)

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java

@@ -7,6 +7,7 @@
 import com.objectcomputing.checkins.notifications.email.EmailSender;
 import com.objectcomputing.checkins.notifications.email.MailJetFactory;
 import com.objectcomputing.checkins.services.email.Email;
+import com.objectcomputing.checkins.services.feedback_external_recipient.FeedbackExternalRecipient;
 import com.objectcomputing.checkins.services.feedback_external_recipient.FeedbackExternalRecipientServices;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileUtils;
@@ -90,8 +91,11 @@ private void validateMembers(FeedbackRequest feedbackRequest) {
             throw new BadArgException("Cannot save feedback request with invalid creator ID");
         }
 
-        if (feedbackRequest.getRecipientId() == null && feedbackRequest.getExternalRecipientId() == null) {
-            throw new BadArgException("Cannot save feedback request without recipient/external-recipient ID");
+        if (feedbackRequest.getExternalRecipientId() != null && feedbackRequest.getRecipientId() != null) {
+            throw new BadArgException("Cannot save feedback request with both recipient and external-recipient ID");
+        }
+        if (feedbackRequest.getExternalRecipientId() == null && feedbackRequest.getRecipientId() == null) {
+            throw new BadArgException("Cannot save feedback request without both recipient and external-recipient ID");
         }
 
         try {
@@ -102,21 +106,20 @@ private void validateMembers(FeedbackRequest feedbackRequest) {
             throw new BadArgException("Cannot save feedback request with invalid recipient ID");
         }
 
-        /** TODO Luch
         try {
             if (feedbackRequest.getExternalRecipientId() != null) {
-                memberProfileServices.getById(feedbackRequest.getExternalRecipientId());
+                feedbackExternalRecipientServices.getById(feedbackRequest.getExternalRecipientId());
             }
         } catch (NotFoundException e) {
             throw new BadArgException("Cannot save feedback request with invalid external-recipient ID");
         }
-         **/
 
         try {
             memberProfileServices.getById(feedbackRequest.getRequesteeId());
         } catch (NotFoundException e) {
             throw new BadArgException("Cannot save feedback request with invalid requestee ID");
         }
+
     }
 
     @Override
@@ -144,21 +147,24 @@ public FeedbackRequest save(FeedbackRequest feedbackRequest) {
 
     public void sendNewRequestEmail(FeedbackRequest storedRequest) {
         MemberProfile creator = memberProfileServices.getById(storedRequest.getCreatorId());
-        MemberProfile reviewer = memberProfileServices.getById(storedRequest.getRecipientId());
+        MemberProfile reviewerMemberProfile;
+        FeedbackExternalRecipient reviewerExternalRecipient;
         MemberProfile requestee = memberProfileServices.getById(storedRequest.getRequesteeId());
         String senderName = MemberProfileUtils.getFullName(creator);
         UUID recipientOrExternalRecipientId;
         String reviewerFirstName, reviewerEmail;
 
         if (storedRequest.getExternalRecipientId() != null) {
             recipientOrExternalRecipientId = storedRequest.getExternalRecipientId();
-            reviewerFirstName = "";
-            reviewerEmail = "";
+            reviewerExternalRecipient = feedbackExternalRecipientServices.getById(recipientOrExternalRecipientId);
+            reviewerFirstName = reviewerExternalRecipient.getFirstName();
+            reviewerEmail = reviewerExternalRecipient.getEmail();
         } else {
-            reviewer = memberProfileServices.getById(storedRequest.getRecipientId());
             recipientOrExternalRecipientId = storedRequest.getRecipientId();
-            reviewerFirstName = reviewer.getFirstName();
-            reviewerEmail = reviewer.getWorkEmail();
+            reviewerMemberProfile = memberProfileServices.getById(recipientOrExternalRecipientId);
+            recipientOrExternalRecipientId = storedRequest.getRecipientId();
+            reviewerFirstName = reviewerMemberProfile.getFirstName();
+            reviewerEmail = reviewerMemberProfile.getWorkEmail();
         }
 
         String newContent = String.format(
@@ -207,7 +213,10 @@ public FeedbackRequest update(FeedbackRequestUpdateDTO feedbackRequestUpdateDTO)
             reviewAssignmentsSet = reviewAssignmentRepository.findByReviewPeriodIdAndRevieweeId(feedbackRequest.getReviewPeriodId(), feedbackRequest.getRequesteeId());
         }        
 
-        boolean reassignAttempted = !Objects.equals(originalFeedback.getRecipientId(), feedbackRequest.getRecipientId());
+        boolean reassignAttempted = false;
+        if ((!Objects.equals(originalFeedback.getRecipientId(), feedbackRequest.getRecipientId())) || (!Objects.equals(originalFeedback.getExternalRecipientId(), feedbackRequest.getExternalRecipientId()))) {
+            reassignAttempted = true;
+        }
         boolean dueDateUpdateAttempted = !Objects.equals(originalFeedback.getDueDate(), feedbackRequest.getDueDate());
         boolean submitDateUpdateAttempted = !Objects.equals(originalFeedback.getSubmitDate(), feedbackRequest.getSubmitDate());
 

server/src/test/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestControllerTest.java

@@ -396,7 +396,7 @@ void testCreateFeedbackRequestWithNoRecipients() {
         JsonNode body = responseException.getResponse().getBody(JsonNode.class).orElse(null);
         String error = Objects.requireNonNull(body).get("message").asText();
         assertEquals(HttpStatus.BAD_REQUEST, responseException.getStatus());
-        assertEquals("Cannot save feedback request without recipient/external-recipient ID", error);
+        assertEquals("Cannot save feedback request without both recipient and external-recipient ID", error);
     }
 
     @Test