Skip to content

Commit

Permalink
2024-10-22 - feedback - external reviewer - server-side
Browse files Browse the repository at this point in the history
  • Loading branch information
@Luch76
Luch76 committed Oct 22, 2024
1 parent f8cee94 commit 2eb6270
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 23 deletions.
1 change: 1 addition & 0 deletions ...ava/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public void delete(@NotNull UUID id) {
* @param id {@link UUID} ID of the request
* @return {@link FeedbackRequestResponseDTO}
*/
//@Secured(SecurityRule.IS_ANONYMOUS)
@Get("/{id}")
@RequiredPermission(Permission.CAN_VIEW_FEEDBACK_REQUEST)
public HttpResponse<FeedbackRequestResponseDTO> getById(UUID id) {
Expand Down
14 changes: 10 additions & 4 deletions ...a/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,16 @@ public FeedbackRequest getById(UUID id) {
}
final LocalDate sendDate = feedbackReq.get().getSendDate();
final UUID requesteeId = feedbackReq.get().getRequesteeId();
final UUID recipientId;
recipientId = feedbackReq.get().getRecipientId() != null ? feedbackReq.get().getRecipientId() : feedbackReq.get().getExternalRecipientId();
if (!getIsPermitted(requesteeId, recipientId, sendDate)) {
throw new PermissionException(NOT_AUTHORIZED_MSG);
final UUID recipientId = feedbackReq.get().getRecipientId();
final UUID externalRecipientId = feedbackReq.get().getExternalRecipientId();
if (recipientId != null) {
if (!getIsPermitted(requesteeId, recipientId, sendDate)) {
throw new PermissionException(NOT_AUTHORIZED_MSG);
}
} else {
if (externalRecipientId == null) {
throw new PermissionException(NOT_AUTHORIZED_MSG);
}
}

return feedbackReq.get();
Expand Down
122 changes: 111 additions & 11 deletions ...com/objectcomputing/checkins/services/feedback_request/FeedbackRequestControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,11 @@ void testGetFeedbackRequestByUnassignedPdlToExternalRecipient() {
//get feedback request
final HttpRequest<?> request = HttpRequest.GET(String.format("%s", feedbackRequest.getId()))
.basicAuth(unrelatedPdl.getWorkEmail(), RoleType.Constants.PDL_ROLE);
final HttpClientResponseException responseException = assertThrows(HttpClientResponseException.class, () ->
client.toBlocking().exchange(request, Map.class));
final HttpResponse<FeedbackRequestResponseDTO> response = client.toBlocking().exchange(request, FeedbackRequestResponseDTO.class);

assertUnauthorized(responseException);
assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertResponseEqualsEntity(feedbackRequest, response.getBody().get());
}

@Test
Expand Down Expand Up @@ -838,11 +839,11 @@ void testGetFeedbackRequestByRequesteeToExternalRecipient() {
//get feedback request
final HttpRequest<?> request = HttpRequest.GET(String.format("%s", feedbackRequest.getId()))
.basicAuth(memberProfile2.getWorkEmail(), RoleType.Constants.MEMBER_ROLE);
final HttpClientResponseException responseException = assertThrows(HttpClientResponseException.class, () ->
client.toBlocking().exchange(request, Map.class));
final HttpResponse<FeedbackRequestResponseDTO> response = client.toBlocking().exchange(request, FeedbackRequestResponseDTO.class);

// requestee should not be able to get the feedback request about them
assertUnauthorized(responseException);
assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertResponseEqualsEntity(feedbackRequest, response.getBody().get());
}

@Test
Expand Down Expand Up @@ -884,7 +885,7 @@ void testGetFeedbackRequestByExternalRecipient() {
}

@Test
void testGetFeedbackRequestByReviewPeriodId() {
void testGetFeedbackRequestByReviewPeriodIdToRecipient() {
ReviewPeriod reviewPeriod = createADefaultReviewPeriod();
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignAdminRole(pdlMemberProfile);
Expand All @@ -906,7 +907,28 @@ void testGetFeedbackRequestByReviewPeriodId() {
}

@Test
void testGetFeedbackRequestByUnrelatedUser() {
void testGetFeedbackRequestByReviewPeriodIdToExternalRecipient() {
ReviewPeriod reviewPeriod = createADefaultReviewPeriod();
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignAdminRole(pdlMemberProfile);
MemberProfile requestee = createADefaultMemberProfileForPdl(pdlMemberProfile);
final FeedbackExternalRecipient externalRecipient = createADefaultFeedbackExternalRecipient();
FeedbackRequest feedbackRequest = saveFeedbackRequest(pdlMemberProfile, requestee, externalRecipient, reviewPeriod);

//search for feedback requests by a specific creator
final HttpRequest<?> request = HttpRequest.GET(String.format("/?reviewPeriodId=%s", reviewPeriod.getId()))
.basicAuth(pdlMemberProfile.getWorkEmail(), RoleType.Constants.ADMIN_ROLE);
final HttpResponse<List<FeedbackRequestResponseDTO>> response = client.toBlocking()
.exchange(request, Argument.listOf(FeedbackRequestResponseDTO.class));

assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertEquals(1, response.getBody().get().size());
assertResponseEqualsEntity(feedbackRequest, response.getBody().get().get(0));
}

@Test
void testGetFeedbackRequestByUnrelatedUserToRecipient() {
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
MemberProfile requestee = createADefaultMemberProfileForPdl(pdlMemberProfile);
Expand All @@ -924,7 +946,26 @@ void testGetFeedbackRequestByUnrelatedUser() {
}

@Test
void testGetByCreatorIdPermitted() {
void testGetFeedbackRequestByUnrelatedUserToExternalRecipient() {
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
MemberProfile requestee = createADefaultMemberProfileForPdl(pdlMemberProfile);
final FeedbackExternalRecipient externalRecipient = createADefaultFeedbackExternalRecipient();
MemberProfile unrelatedUser = createAnUnrelatedUser();
FeedbackRequest feedbackRequest = saveFeedbackRequest(pdlMemberProfile, requestee, externalRecipient);

//get feedback request
final HttpRequest<?> request = HttpRequest.GET(String.format("%s", feedbackRequest.getId()))
.basicAuth(unrelatedUser.getWorkEmail(), RoleType.Constants.MEMBER_ROLE);
final HttpResponse<FeedbackRequestResponseDTO> response = client.toBlocking().exchange(request, FeedbackRequestResponseDTO.class);

assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertResponseEqualsEntity(feedbackRequest, response.getBody().get());
}

@Test
void testGetByCreatorIdPermittedToRecipients() {
//create two employee-PDL relationships
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
Expand Down Expand Up @@ -953,7 +994,36 @@ void testGetByCreatorIdPermitted() {
}

@Test
void testGetByCreatorIdPermittedMultipleReqs() {
void testGetByCreatorIdPermittedToExternalRecipients() {
//create two employee-PDL relationships
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
MemberProfile memberOne = createADefaultMemberProfileForPdl(pdlMemberProfile);
MemberProfile pdlMemberProfileTwo = createASecondDefaultMemberProfile();
assignPdlRole(pdlMemberProfileTwo);
MemberProfile memberTwo = createASecondDefaultMemberProfileForPdl(pdlMemberProfileTwo);
final FeedbackExternalRecipient externalRecipient01 = createADefaultFeedbackExternalRecipient();
final FeedbackExternalRecipient externalRecipient02 = createASecondDefaultFeedbackExternalRecipient();

// Create a feedback request from a PDL
FeedbackRequest feedbackReq = saveFeedbackRequest(pdlMemberProfile, memberOne, externalRecipient01);
// Create a feedback request by a different PDL
saveFeedbackRequest(pdlMemberProfileTwo, memberTwo, externalRecipient02);

//search for feedback requests by a specific creator
final HttpRequest<?> request = HttpRequest.GET(String.format("/?creatorId=%s", feedbackReq.getCreatorId()))
.basicAuth(pdlMemberProfile.getWorkEmail(), RoleType.Constants.PDL_ROLE);
final HttpResponse<List<FeedbackRequestResponseDTO>> response = client.toBlocking()
.exchange(request, Argument.listOf(FeedbackRequestResponseDTO.class));

assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertEquals(1, response.getBody().get().size());
assertResponseEqualsEntity(feedbackReq, response.getBody().get().get(0));
}

@Test
void testGetByCreatorIdPermittedMultipleReqsToRecipients() {
//create two employee-PDL relationships
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
Expand Down Expand Up @@ -984,6 +1054,36 @@ void testGetByCreatorIdPermittedMultipleReqs() {
assertResponseEqualsEntity(feedbackReqTwo, response.getBody().get().get(1));
}

@Test
void testGetByCreatorIdPermittedMultipleReqsToExternalRecipients() {
//create two employee-PDL relationships
MemberProfile pdlMemberProfile = createADefaultMemberProfile();
assignPdlRole(pdlMemberProfile);
MemberProfile memberOne = createADefaultMemberProfileForPdl(pdlMemberProfile);
MemberProfile pdlMemberProfileTwo = createASecondDefaultMemberProfile();
assignPdlRole(pdlMemberProfileTwo);
MemberProfile memberTwo = createASecondDefaultMemberProfileForPdl(pdlMemberProfileTwo);
MemberProfile memberThree = createAThirdDefaultMemberProfileForPdl(pdlMemberProfileTwo);
final FeedbackExternalRecipient externalRecipient01 = createADefaultFeedbackExternalRecipient();

// Create two sample feedback requests by the same PDL
FeedbackRequest feedbackReq = saveFeedbackRequest(pdlMemberProfile, memberOne, externalRecipient01);
FeedbackRequest feedbackReqTwo = saveFeedbackRequest(pdlMemberProfile, memberTwo, externalRecipient01);
// Create a feedback request by a different PDL
saveFeedbackRequest(pdlMemberProfileTwo, memberThree, externalRecipient01);

final HttpRequest<?> request = HttpRequest.GET(String.format("/?creatorId=%s", feedbackReq.getCreatorId()))
.basicAuth(pdlMemberProfile.getWorkEmail(), RoleType.Constants.PDL_ROLE);
final HttpResponse<List<FeedbackRequestResponseDTO>> response = client.toBlocking()
.exchange(request, Argument.listOf(FeedbackRequestResponseDTO.class));

assertEquals(HttpStatus.OK, response.getStatus());
assertTrue(response.getBody().isPresent());
assertEquals(2, response.getBody().get().size());
assertResponseEqualsEntity(feedbackReq, response.getBody().get().get(0));
assertResponseEqualsEntity(feedbackReqTwo, response.getBody().get().get(1));
}

@Test
void testGetByCreatorRequesteeIdPermitted() {
//create two employee-PDL relationships
Expand Down
24 changes: 23 additions & 1 deletion .../java/com/objectcomputing/checkins/services/fixture/FeedbackExternalRecipientFixture.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public interface FeedbackExternalRecipientFixture extends RepositoryFixture {

default FeedbackExternalRecipient createADefaultFeedbackExternalRecipient() {
String email = "externalRecipient@example.com";
String email = "externalRecipient01@example.com";
String firstName = "External-01";
String lastName = "Recipient";
String companyName = "Company Name";
Expand All @@ -19,4 +19,26 @@ default FeedbackExternalRecipient createADefaultFeedbackExternalRecipient() {
));
}

default FeedbackExternalRecipient createASecondDefaultFeedbackExternalRecipient() {
String email = "externalRecipient02@example.com";
String firstName = "External-02";
String lastName = "Recipient";
String companyName = "Company Name";

return getFeedbackExternalRecipientRepository().save(new FeedbackExternalRecipient(
email, firstName, lastName, companyName
));
}

default FeedbackExternalRecipient createAThirdDefaultFeedbackExternalRecipient() {
String email = "externalRecipient03@example.com";
String firstName = "External-03";
String lastName = "Recipient";
String companyName = "Company Name";

return getFeedbackExternalRecipientRepository().save(new FeedbackExternalRecipient(
email, firstName, lastName, companyName
));
}

}
Loading

0 comments on commit 2eb6270

Please sign in to comment.