Skip to content

Bugfix 2282/fix find assignments #2344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkimberlin merged 3 commits into from
May 8, 2024
Merged

Bugfix 2282/fix find assignments #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a926518
Skip supervisor-less member profiles when generating default review a…
ZacharyKlein May 8, 2024
ca6640b
Skip supervisor-less member profiles when generating default review a…
ZacharyKlein May 8, 2024
9f2dfc5
Merge branch 'develop' into bugfix-2282/fix-find-assignments
ZacharyKlein May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public ReviewAssignment findById(@NotNull UUID id) {
@Override
public Set<ReviewAssignment> findAllByReviewPeriodIdAndReviewerId(UUID reviewPeriodId, @Nullable UUID reviewerId) {

Set<ReviewAssignment> reviewAssignments = null;
Set<ReviewAssignment> reviewAssignments;

if (reviewerId == null) {
reviewAssignments = reviewAssignmentRepository.findByReviewPeriodId(reviewPeriodId);
Expand Down Expand Up @@ -113,6 +113,10 @@ private Set<ReviewAssignment> defaultReviewAssignments(UUID reviewPeriodId) {
Set<ReviewAssignment> reviewAssignments = new HashSet<>();

memberProfileRepository.findAll().forEach(memberProfile -> {
if(memberProfile.getSupervisorid() == null) {
return;
}

ReviewAssignment reviewAssignment = new ReviewAssignment();
reviewAssignment.setReviewerId(memberProfile.getSupervisorid());
reviewAssignment.setRevieweeId(memberProfile.getId());
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void testGETFindAssignmentsByPeriodIdDefaultAssignments() {
final HttpResponse<Set<ReviewAssignment>> 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())));
Expand Down