From a9265180cfea1ca73a441f4a9f3c416dc5aa1a4a Mon Sep 17 00:00:00 2001 From: Zachary Klein Date: Wed, 8 May 2024 16:42:41 -0500 Subject: [PATCH 1/2] Skip supervisor-less member profiles when generating default review assignments --- .../services/reviews/ReviewAssignmentServicesImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java index f8c3a78d09..20ba4bb998 100644 --- a/server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java +++ b/server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java @@ -75,7 +75,7 @@ public ReviewAssignment findById(@NotNull UUID id) { @Override public Set findAllByReviewPeriodIdAndReviewerId(UUID reviewPeriodId, @Nullable UUID reviewerId) { - Set reviewAssignments = null; + Set reviewAssignments; if (reviewerId == null) { reviewAssignments = reviewAssignmentRepository.findByReviewPeriodId(reviewPeriodId); @@ -113,6 +113,10 @@ private Set defaultReviewAssignments(UUID reviewPeriodId) { Set reviewAssignments = new HashSet<>(); memberProfileRepository.findAll().forEach(memberProfile -> { + if(memberProfile.getSupervisorid() == null) { + return; + } + ReviewAssignment reviewAssignment = new ReviewAssignment(); reviewAssignment.setReviewerId(memberProfile.getSupervisorid()); reviewAssignment.setRevieweeId(memberProfile.getId()); From ca6640bcd790f3ac31757ad54df85fd3187ad1cb Mon Sep 17 00:00:00 2001 From: Zachary Klein Date: Wed, 8 May 2024 16:45:52 -0500 Subject: [PATCH 2/2] Skip supervisor-less member profiles when generating default review assignments --- .../services/reviews/ReviewAssignmentControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java index 69e95cfb8d..40aad813f6 100644 --- a/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java +++ b/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java @@ -147,7 +147,7 @@ public void testGETFindAssignmentsByPeriodIdDefaultAssignments() { final HttpResponse> response = client.toBlocking().exchange(request, Argument.setOf(ReviewAssignment.class)); assertNotNull(response.body()); - assertEquals(8, Objects.requireNonNull(response.body()).size()); + assertEquals(3, Objects.requireNonNull(response.body()).size()); assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberOne.getId()))); assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberTwo.getId()))); assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberThree.getId())));