Skip to content

Add permission for viewing review periods #2476

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 2 commits into from
Jun 5, 2024
Merged

Add permission for viewing review periods #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6049e0
Add permission for viewing review periods
mkimberlin Jun 4, 2024
6c3a948
Merge branch 'develop' into feature-2475/add-view-review-period-permi…
mkimberlin Jun 4, 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
11 changes: 6 additions & 5 deletions server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ public enum Permission {
CAN_VIEW_REVIEW_ASSIGNMENTS("View review assignments", "Reviews"),
CAN_UPDATE_REVIEW_ASSIGNMENTS("Update review assignments", "Reviews"),
CAN_DELETE_REVIEW_ASSIGNMENTS("Delete review assignments", "Reviews"),
CAN_CREATE_REVIEW_PERIOD("Create review period", "Review Period"),
CAN_UPDATE_REVIEW_PERIOD("Update review period", "Review Period"),
CAN_LAUNCH_REVIEW_PERIOD("Launch review period", "Review Period"),
CAN_CLOSE_REVIEW_PERIOD("Close review period", "Review Period"),
CAN_DELETE_REVIEW_PERIOD("Delete review period", "Review Period"),
CAN_VIEW_REVIEW_PERIOD("View review periods", "Review Periods"),
CAN_CREATE_REVIEW_PERIOD("Create review periods", "Review Periods"),
CAN_UPDATE_REVIEW_PERIOD("Update review periods", "Review Periods"),
CAN_LAUNCH_REVIEW_PERIOD("Launch review periods", "Review Periods"),
CAN_CLOSE_REVIEW_PERIOD("Close review periods", "Review Periods"),
CAN_DELETE_REVIEW_PERIOD("Delete review periods", "Review Periods"),
CAN_ADMINISTER_SETTINGS("Add or edit settings", "Settings"),
CAN_VIEW_SETTINGS("View settings", "Settings"),
CAN_VIEW_ALL_PULSE_RESPONSES("View all pulse responses", "Pulse");
Expand Down
4 changes: 3 additions & 1 deletion ...r/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public Mono<HttpResponse<ReviewPeriod>> createReviewPeriod(@Body @Valid ReviewPe
*/

@Get("/{id}")
@RequiredPermission(Permission.CAN_VIEW_REVIEW_PERIOD)
public Mono<HttpResponse<ReviewPeriod>> getById(@NotNull UUID id) {
return Mono.fromCallable(() -> {
ReviewPeriod result = reviewPeriodServices.findById(id);
Expand All @@ -83,6 +84,7 @@ public Mono<HttpResponse<ReviewPeriod>> getById(@NotNull UUID id) {
*/

@Get("/{?name,reviewStatus}")
@RequiredPermission(Permission.CAN_VIEW_REVIEW_PERIOD)
public Mono<HttpResponse<Set<ReviewPeriod>>> findByValue(@Nullable String name, @Nullable ReviewStatus reviewStatus) {
return Mono.fromCallable(() -> reviewPeriodServices.findByValue(name, reviewStatus))
.map(HttpResponse::ok);
Expand Down Expand Up @@ -116,4 +118,4 @@ public Mono<HttpResponse<?>> deleteReviewPeriod(@NotNull UUID id) {
.thenReturn(HttpResponse.ok());
}

}
}
16 changes: 15 additions & 1 deletion server/src/main/resources/db/dev/R__Load_testing_data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,11 @@ insert into role_permissions
values
('e8a4fff8-e984-4e59-be84-a713c9fa8d23', 'CAN_VIEW_SETTINGS');

insert into role_permissions
(roleid, permission)
values
('e8a4fff8-e984-4e59-be84-a713c9fa8d23', 'CAN_VIEW_REVIEW_PERIOD');

insert into role_permissions
(roleid, permission)
values
Expand Down Expand Up @@ -961,7 +966,12 @@ values
insert into role_permissions
(roleid, permission)
values
('d03f5f0b-e29c-4cf4-9ea4-6baa09405c56', 'CAN_UPDATE_CHECKIN_DOCUMENT');
('d03f5f0b-e29c-4cf4-9ea4-6baa09405c56', 'CAN_UPDATE_CHECKIN_DOCUMENT');

insert into role_permissions
(roleid, permission)
values
('d03f5f0b-e29c-4cf4-9ea4-6baa09405c56', 'CAN_VIEW_REVIEW_PERIOD');


-- Member permissions
Expand Down Expand Up @@ -1005,6 +1015,10 @@ insert into role_permissions
values
('8bda2ae9-58c1-4843-a0d5-d0952621f9df', 'CAN_UPDATE_CHECKINS');

insert into role_permissions
(roleid, permission)
values
('8bda2ae9-58c1-4843-a0d5-d0952621f9df', 'CAN_VIEW_REVIEW_PERIOD');


-- Feedback Templates
Expand Down
8 changes: 5 additions & 3 deletions server/src/test/java/com/objectcomputing/checkins/services/fixture/PermissionFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ public interface PermissionFixture extends RolePermissionFixture {
Permission.CAN_CREATE_CHECKINS,
Permission.CAN_UPDATE_CHECKINS,
Permission.CAN_ADMINISTER_SETTINGS,
Permission.CAN_VIEW_SETTINGS
Permission.CAN_VIEW_SETTINGS,
Permission.CAN_VIEW_REVIEW_PERIOD
);

// Add PDL Permissions here
Expand All @@ -38,8 +39,8 @@ public interface PermissionFixture extends RolePermissionFixture {
Permission.CAN_VIEW_CHECKIN_DOCUMENT,
Permission.CAN_UPDATE_CHECKIN_DOCUMENT,
Permission.CAN_ADMINISTER_SETTINGS,
Permission.CAN_VIEW_SETTINGS

Permission.CAN_VIEW_SETTINGS,
Permission.CAN_VIEW_REVIEW_PERIOD
);

// Add ADMIN Permissions here
Expand Down Expand Up @@ -78,6 +79,7 @@ public interface PermissionFixture extends RolePermissionFixture {
Permission.CAN_DELETE_REVIEW_ASSIGNMENTS,
Permission.CAN_ADMINISTER_SETTINGS,
Permission.CAN_VIEW_SETTINGS,
Permission.CAN_VIEW_REVIEW_PERIOD,
Permission.CAN_CREATE_REVIEW_PERIOD,
Permission.CAN_UPDATE_REVIEW_PERIOD,
Permission.CAN_LAUNCH_REVIEW_PERIOD,
Expand Down