Merge pull request #2640 from objectcomputing/bufix-2638/reviews-all-users-return-on-all-deletion

Bufix 2638/reviews all users return on all deletion

Author: mkimberlin

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServices.java

@@ -16,4 +16,5 @@ public interface ReviewAssignmentServices {
     void delete(UUID id);
     Set<ReviewAssignment> findAllByReviewPeriodIdAndReviewerId(UUID reviewPeriodId, @Nullable UUID reviewerId);
 
+    Set<ReviewAssignment> defaultReviewAssignments(UUID reviewPeriodId);
 }

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java

@@ -82,10 +82,6 @@ public Set<ReviewAssignment> findAllByReviewPeriodIdAndReviewerId(UUID reviewPer
         } else {
             reviewAssignments = reviewAssignmentRepository.findByReviewPeriodIdAndReviewerId(reviewPeriodId, reviewerId);
         }
-        if (reviewAssignments.isEmpty()) {
-            //If no assignments exist for the review period, then a set of default review assignments should be returned
-            reviewAssignments = defaultReviewAssignments(reviewPeriodId);
-        }
 
         return reviewAssignments;
     }
@@ -109,7 +105,7 @@ public void delete(UUID id) {
         }
     }
 
-    private Set<ReviewAssignment> defaultReviewAssignments(UUID reviewPeriodId) {
+    public Set<ReviewAssignment> defaultReviewAssignments(UUID reviewPeriodId) {
         Set<ReviewAssignment> reviewAssignments = new HashSet<>();
 
         memberProfileRepository.findAll().forEach(memberProfile -> {

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodController.java

@@ -33,9 +33,11 @@
 public class ReviewPeriodController {
 
     private final ReviewPeriodServices reviewPeriodServices;
+    private final ReviewAssignmentServices reviewAssignmentServices;
 
-    public ReviewPeriodController(ReviewPeriodServices reviewPeriodServices) {
+    public ReviewPeriodController(ReviewPeriodServices reviewPeriodServices, ReviewAssignmentServices reviewAssignmentServices) {
         this.reviewPeriodServices = reviewPeriodServices;
+        this.reviewAssignmentServices = reviewAssignmentServices;
     }
 
     /**
@@ -47,11 +49,17 @@ public ReviewPeriodController(ReviewPeriodServices reviewPeriodServices) {
     @Post
     @RequiredPermission(Permission.CAN_CREATE_REVIEW_PERIOD)
     public HttpResponse<ReviewPeriod> createReviewPeriod(@Body @Valid ReviewPeriodCreateDTO period, HttpRequest<?> request) {
+        HttpResponse httpResponse;
+        Set<ReviewAssignment> reviewAssignments;
+
         ReviewPeriod reviewPeriod = reviewPeriodServices.save(period.convertToEntity());
-        return HttpResponse.created(reviewPeriod)
+        httpResponse = HttpResponse.created(reviewPeriod)
                         .headers(headers -> headers
                                 .location(URI.create(String.format("%s/%s", request.getPath(), reviewPeriod.getId())))
                         );
+        reviewAssignments = reviewAssignmentServices.defaultReviewAssignments(reviewPeriod.getId());
+        reviewAssignmentServices.saveAll(reviewPeriod.getId(), reviewAssignments.stream().toList(), true);
+        return httpResponse;
     }
 
     /**