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

Author: Luch76

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

@@ -31,7 +31,7 @@ public interface FeedbackRequestRepository extends CrudRepository<FeedbackReques
             "AND (:reviewPeriodId IS NULL OR review_period_id = :reviewPeriodId) " +
             "AND (:templateId IS NULL OR template_id = :templateId) " +
             "AND (requestee_id = ANY(:requesteeIds)) " +
-            "AND (:externalRecipientId IS NULL OR externalRecipientId = :externalRecipientId) "
+            "AND (:externalRecipientId IS NULL OR external_recipient_id = :externalRecipientId) "
             , nativeQuery = true)
     List<FeedbackRequest> findByValues(@Nullable String creatorId, @Nullable String recipientId, @Nullable LocalDate oldestDate, @Nullable String reviewPeriodId, @Nullable String templateId, @TypeDef(type = DataType.STRING_ARRAY) List<String> requesteeIds, @Nullable String externalRecipientId);
 
@@ -43,7 +43,7 @@ public interface FeedbackRequestRepository extends CrudRepository<FeedbackReques
             "AND (CAST(:oldestDate as date) IS NULL OR send_date >= :oldestDate) " +
             "AND (:reviewPeriodId IS NULL OR review_period_id = :reviewPeriodId) " +
             "AND (:templateId IS NULL OR template_id = :templateId) " +
-            "AND (:externalRecipientId IS NULL OR externalRecipientId = :externalRecipientId) "
+            "AND (:externalRecipientId IS NULL OR external_recipient_id = :externalRecipientId) "
             , nativeQuery = true)
     List<FeedbackRequest> findByValues(@Nullable String creatorId, @Nullable String requesteeId, @Nullable String recipientId, @Nullable LocalDate oldestDate, @Nullable String reviewPeriodId, @Nullable String templateId, @Nullable String externalRecipientId);
 

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

@@ -394,9 +394,9 @@ void testCreateFeedbackRequestWithNoRecipients() {
                 client.toBlocking().exchange(request, Map.class));
 
         JsonNode body = responseException.getResponse().getBody(JsonNode.class).orElse(null);
-        String error = Objects.requireNonNull(body).get("_embedded").get("errors").get(0).get("message").asText();
+        String error = Objects.requireNonNull(body).get("message").asText();
         assertEquals(HttpStatus.BAD_REQUEST, responseException.getStatus());
-        assertEquals("requestBody.recipientId: must not be null", error);
+        assertEquals("Cannot save feedback request without recipient/external-recipient ID", error);
     }
 
     @Test