Skip to content

Make reviewerId a nullable field #2348

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
ZacharyKlein merged 3 commits into from
May 9, 2024
Merged

Make reviewerId a nullable field #2348

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
bf98061
Make reviewerId a nullable field
ZacharyKlein May 9, 2024
177ef5a
Merge branch 'develop' into bugfix-2282/fix-find-assignments
ZacharyKlein May 9, 2024
b4714c1
Skip persistence if no reviewAssignments
ZacharyKlein May 9, 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: 3 additions & 3 deletions server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ReviewAssignment {
@Schema(description = "The id of the review assignment", required = true)
private UUID id;

public ReviewAssignment(UUID revieweeId, UUID reviewerId, UUID reviewPeriodId, Boolean approved) {
public ReviewAssignment(UUID revieweeId, @Nullable UUID reviewerId, UUID reviewPeriodId, Boolean approved) {
this.revieweeId = revieweeId;
this.reviewerId = reviewerId;
this.reviewPeriodId = reviewPeriodId;
Expand All @@ -46,10 +46,10 @@ public ReviewAssignment(UUID revieweeId, UUID reviewerId, UUID reviewPeriodId, B
@Schema(required = true, description = "The ID of the employee being reviewed")
private UUID revieweeId;

@NotBlank
@Nullable
@Column(name = "reviewer_id")
@TypeDef(type = DataType.STRING)
@Schema(required = true, description = "The ID of the employee conducting the review")
@Schema(description = "The ID of the employee conducting the review")
private UUID reviewerId;

@NotBlank
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Mono<HttpResponse<ReviewAssignment>> createReviewAssignment(@Body @Valid
*/
@Post("/{reviewPeriodId}")
@RequiredPermission(Permission.CAN_CREATE_REVIEW_ASSIGNMENTS)
public Mono<HttpResponse<List<ReviewAssignment>>> createReviewAssignment(@NotNull UUID reviewPeriodId, @Body @Valid List<ReviewAssignmentDTO> assignments) {
public Mono<HttpResponse<List<ReviewAssignment>>> createReviewAssignment(@NotNull UUID reviewPeriodId, @Body List<@Valid ReviewAssignmentDTO> assignments) {

return Mono.fromCallable(() -> reviewAssignmentServices.saveAll(reviewPeriodId,
assignments.stream().map(ReviewAssignmentDTO::convertToEntity).collect(Collectors.toList()),
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class ReviewAssignmentDTO {
@Schema(required = true, description = "The ID of the employee being reviewed")
private UUID revieweeId;

@NotBlank
@Schema(required = true, description = "The ID of the employee conducting the review")
@Nullable
@Schema(description = "The ID of the employee conducting the review")
private UUID reviewerId;

@NotBlank
Expand Down
2 changes: 1 addition & 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 @@ -52,7 +52,7 @@ public List<ReviewAssignment> saveAll(UUID reviewPeriodId, List<ReviewAssignment
}

List<ReviewAssignment> newAssignments = new ArrayList<>();
if (reviewAssignments != null) {
if (reviewAssignments != null && !reviewAssignments.isEmpty()) {
for (ReviewAssignment reviewAssignment : reviewAssignments) {
if (reviewAssignment.getId() != null) {
throw new BadArgException(String.format("Found unexpected id %s for review assignment. New entities must not contain an id.",
Expand Down