Skip to content

Commit 2a9c559

Browse files
mkimberlinmkimberlin
authored
Merge branch 'develop' into dependabot/npm_and_yarn/web-ui/vitest-1.6.1
2 parents 5410804 + 75bfc34 commit 2a9c559

File tree

163 files changed

+769
-3972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+769
-3972
lines changed

‎server/src/main/java/com/objectcomputing/checkins/services/action_item/ActionItemController.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.objectcomputing.checkins.services.action_item;
22

3-
import com.objectcomputing.checkins.services.permissions.Permission;
4-
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
53
import io.micronaut.core.annotation.Nullable;
64
import io.micronaut.http.HttpRequest;
75
import io.micronaut.http.HttpResponse;
@@ -35,7 +33,6 @@ public ActionItemController(ActionItemServices actionItemServices) {
3533
* @return {@link HttpResponse <ActionItem>}
3634
*/
3735
@Post
38-
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
3936
public HttpResponse<ActionItem> createActionItem(@Body @Valid ActionItemCreateDTO actionItem,
4037
HttpRequest<?> request) {
4138
ActionItem newActionItem = actionItemServices.save(new ActionItem(actionItem.getCheckinid(),
@@ -53,7 +50,6 @@ public HttpResponse<ActionItem> createActionItem(@Body @Valid ActionItemCreateDT
5350
* @return {@link HttpResponse< ActionItem >}
5451
*/
5552
@Put
56-
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
5753
public HttpResponse<?> updateActionItem(@Body @Valid ActionItem actionItem, HttpRequest<?> request) {
5854
ActionItem updatedActionItem = actionItemServices.update(actionItem);
5955
return HttpResponse
@@ -70,7 +66,6 @@ public HttpResponse<?> updateActionItem(@Body @Valid ActionItem actionItem, Http
7066
* @param id, id of {@link ActionItem} to delete
7167
*/
7268
@Delete("/{id}")
73-
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
7469
public HttpResponse<?> deleteActionItem(UUID id) {
7570
actionItemServices.delete(id);
7671
return HttpResponse
@@ -84,7 +79,6 @@ public HttpResponse<?> deleteActionItem(UUID id) {
8479
* @return {@link ActionItem}
8580
*/
8681
@Get("/{id}")
87-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
8882
public ActionItem readActionItem(UUID id) {
8983
return actionItemServices.read(id);
9084
}
@@ -97,7 +91,6 @@ public ActionItem readActionItem(UUID id) {
9791
* @return {@link List < CheckIn > list of checkins}
9892
*/
9993
@Get("/{?checkinid,createdbyid}")
100-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
10194
public Set<ActionItem> findActionItems(@Nullable UUID checkinid,
10295
@Nullable UUID createdbyid) {
10396
return actionItemServices.findByFields(checkinid, createdbyid);

‎server/src/main/java/com/objectcomputing/checkins/services/action_item/ActionItemServicesImpl.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.objectcomputing.checkins.services.action_item;
22

3+
import com.objectcomputing.checkins.services.permissions.Permission;
4+
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
35
import com.objectcomputing.checkins.services.validate.crud.CRUDValidator;
46
import jakarta.inject.Named;
57
import jakarta.inject.Singleton;
@@ -24,6 +26,7 @@ public ActionItemServicesImpl(ActionItemRepository actionItemRepo,
2426
this.crudValidator = crudValidator;
2527
}
2628

29+
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
2730
public ActionItem save(@Valid @NotNull ActionItem actionItem) {
2831
ActionItem actionItemRet;
2932

@@ -45,6 +48,7 @@ public ActionItem save(@Valid @NotNull ActionItem actionItem) {
4548

4649
}
4750

51+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
4852
public ActionItem read(@NotNull UUID id) {
4953

5054
ActionItem actionItemResult = actionItemRepo.findById(id).orElse(null);
@@ -56,6 +60,7 @@ public ActionItem read(@NotNull UUID id) {
5660

5761
}
5862

63+
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
5964
public ActionItem update(@Valid @NotNull ActionItem actionItem) {
6065
ActionItem actionItemRet = null;
6166

@@ -68,6 +73,7 @@ public ActionItem update(@Valid @NotNull ActionItem actionItem) {
6873

6974
}
7075

76+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
7177
public Set<ActionItem> findByFields(UUID checkinid, UUID createdbyid) {
7278

7379
crudValidator.validatePermissionsFindByFields(checkinid, createdbyid);
@@ -79,6 +85,7 @@ public Set<ActionItem> findByFields(UUID checkinid, UUID createdbyid) {
7985

8086
}
8187

88+
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
8289
public void delete(@NotNull UUID id) {
8390
ActionItem actionItemResult = actionItemRepo.findById(id).orElse(null);
8491

‎server/src/main/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemController.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.objectcomputing.checkins.exceptions.NotFoundException;
44
import com.objectcomputing.checkins.services.checkins.CheckIn;
5-
import com.objectcomputing.checkins.services.permissions.Permission;
6-
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
75
import io.micronaut.core.annotation.Nullable;
86
import io.micronaut.http.HttpResponse;
97
import io.micronaut.http.HttpStatus;
@@ -46,7 +44,6 @@ class AgendaItemController {
4644
* @return {@link HttpResponse <AgendaItem>}
4745
*/
4846
@Post("/")
49-
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
5047
HttpResponse<AgendaItem> createAgendaItem(@Body @Valid AgendaItemCreateDTO agendaItem) {
5148
AgendaItem createAgendaItem = agendaItemServices.save(new AgendaItem(agendaItem.getCheckinid(), agendaItem.getCreatedbyid(), agendaItem.getDescription()));
5249
URI location = UriBuilder.of(PATH).path(createAgendaItem.getId().toString()).build();
@@ -61,7 +58,6 @@ HttpResponse<AgendaItem> createAgendaItem(@Body @Valid AgendaItemCreateDTO agend
6158
* @return {@link HttpResponse<AgendaItem>}
6259
*/
6360
@Put("/")
64-
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
6561
HttpResponse<?> updateAgendaItem(@Body @Valid AgendaItem agendaItem) {
6662
if (agendaItem == null) {
6763
return HttpResponse.ok();
@@ -81,7 +77,6 @@ HttpResponse<?> updateAgendaItem(@Body @Valid AgendaItem agendaItem) {
8177
* @return a Set of {@link CheckIn}
8278
*/
8379
@Get("/{?checkinid,createdbyid}")
84-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
8580
Set<AgendaItem> findAgendaItems(@Nullable UUID checkinid, @Nullable UUID createdbyid) {
8681
return agendaItemServices.findByFields(checkinid, createdbyid);
8782
}
@@ -93,7 +88,6 @@ Set<AgendaItem> findAgendaItems(@Nullable UUID checkinid, @Nullable UUID created
9388
* @return {@link AgendaItem}
9489
*/
9590
@Get("/{id}")
96-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
9791
AgendaItem readAgendaItem(UUID id) {
9892
AgendaItem read = agendaItemServices.read(id);
9993
if (read == null) {
@@ -112,4 +106,4 @@ AgendaItem readAgendaItem(UUID id) {
112106
void deleteAgendaItem(UUID id) {
113107
agendaItemServices.delete(id);
114108
}
115-
}
109+
}

‎server/src/main/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemServicesImpl.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.objectcomputing.checkins.services.agenda_item;
22

3+
import com.objectcomputing.checkins.services.permissions.Permission;
4+
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
35
import com.objectcomputing.checkins.exceptions.BadArgException;
46
import com.objectcomputing.checkins.exceptions.PermissionException;
57
import com.objectcomputing.checkins.services.checkins.CheckIn;
@@ -44,6 +46,7 @@ public AgendaItemServicesImpl(CheckInRepository checkinRepo,
4446
}
4547
// todo remove manual validations throughout class in favor of jakarta validations at api level.
4648
@Override
49+
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
4750
public AgendaItem save(AgendaItem agendaItem) {
4851
AgendaItem agendaItemRet = null;
4952
if (agendaItem != null) {
@@ -82,6 +85,7 @@ public AgendaItem save(AgendaItem agendaItem) {
8285
}
8386

8487
@Override
88+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
8589
public AgendaItem read(@NotNull UUID id) {
8690
final UUID currentUserId = currentUserServices.getCurrentUser().getId();
8791
boolean canViewAllCheckins = checkInServices.canViewAllCheckins(currentUserId);
@@ -102,6 +106,7 @@ public AgendaItem read(@NotNull UUID id) {
102106

103107

104108
@Override
109+
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
105110
public AgendaItem update(AgendaItem agendaItem) {
106111
AgendaItem agendaItemRet = null;
107112

@@ -138,6 +143,7 @@ public AgendaItem update(AgendaItem agendaItem) {
138143
}
139144

140145
@Override
146+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
141147
public Set<AgendaItem> findByFields(@Nullable UUID checkinId, @Nullable UUID createdById) {
142148
MemberProfile currentUser = currentUserServices.getCurrentUser();
143149
if(!checkInServices.doesUserHaveViewAccess(currentUser.getId(), checkinId, createdById)){
@@ -174,4 +180,4 @@ private void validate(boolean isError, String message, Object... args) {
174180
throw new BadArgException(String.format(message, args));
175181
}
176182
}
177-
}
183+
}

‎server/src/main/java/com/objectcomputing/checkins/services/certification/CertificationController.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.objectcomputing.checkins.services.certification;
22

3-
import com.objectcomputing.checkins.services.permissions.Permission;
4-
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
53
import io.micronaut.http.HttpStatus;
64
import io.micronaut.http.annotation.Body;
75
import io.micronaut.http.annotation.Controller;
@@ -68,7 +66,6 @@ Certification create(@Body @Valid CertificationDTO certification) {
6866
* @return the updated {@link Certification}
6967
*/
7068
@Put("/{id}")
71-
@RequiredPermission(Permission.CAN_MANAGE_CERTIFICATIONS)
7269
Certification update(@NotNull UUID id, @Body @Valid CertificationDTO certification) {
7370
return certificationService.updateCertification(new Certification(
7471
id,
@@ -86,7 +83,6 @@ Certification update(@NotNull UUID id, @Body @Valid CertificationDTO certificati
8683
* @return the merged {@link Certification}
8784
*/
8885
@Post("/merge")
89-
@RequiredPermission(Permission.CAN_MANAGE_CERTIFICATIONS)
9086
Certification mergeCertifications(@Valid @Body CertificationMergeDTO certificationMergeDTO) {
9187
return certificationService.mergeCertifications(certificationMergeDTO.getSourceId(), certificationMergeDTO.getTargetId());
9288
}

‎server/src/main/java/com/objectcomputing/checkins/services/certification/CertificationServiceImpl.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.objectcomputing.checkins.services.memberprofile.MemberProfileRepository;
55
import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
66
import com.objectcomputing.checkins.services.permissions.Permission;
7+
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
78
import com.objectcomputing.checkins.services.role.role_permissions.RolePermissionServices;
89
import io.micronaut.core.annotation.Nullable;
910
import jakarta.transaction.Transactional;
@@ -59,6 +60,7 @@ public Certification saveCertification(Certification certification) {
5960
}
6061

6162
@Override
63+
@RequiredPermission(Permission.CAN_MANAGE_CERTIFICATIONS)
6264
public Certification updateCertification(Certification certification) {
6365
// Fail if a certification with the same name already exists (but it's not this one)
6466
validate(certificationRepository.getByName(certification.getName())
@@ -109,6 +111,7 @@ public void deleteEarnedCertification(UUID id) {
109111

110112
@Override
111113
@Transactional
114+
@RequiredPermission(Permission.CAN_MANAGE_CERTIFICATIONS)
112115
public Certification mergeCertifications(UUID sourceId, UUID targetId) {
113116
Optional<Certification> target = certificationRepository.findById(targetId);
114117
Optional<Certification> source = certificationRepository.findById(sourceId);

‎server/src/main/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteController.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.objectcomputing.checkins.services.checkin_notes;
22

3-
import com.objectcomputing.checkins.services.permissions.Permission;
4-
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
53
import io.micronaut.core.annotation.Nullable;
64
import io.micronaut.http.HttpRequest;
75
import io.micronaut.http.HttpResponse;
@@ -38,7 +36,6 @@ public CheckinNoteController(CheckinNoteServices checkinNoteServices) {
3836
* @return
3937
*/
4038
@Post
41-
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
4239
public HttpResponse<CheckinNote> createCheckinNote(@Body @Valid CheckinNoteCreateDTO checkinNote, HttpRequest<?> request) {
4340
CheckinNote newCheckinNote = checkinNoteServices.save(new CheckinNote(checkinNote.getCheckinid(), checkinNote.getCreatedbyid()
4441
, checkinNote.getDescription()));
@@ -55,7 +52,6 @@ public HttpResponse<CheckinNote> createCheckinNote(@Body @Valid CheckinNoteCreat
5552
* @return
5653
*/
5754
@Put
58-
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
5955
public HttpResponse<CheckinNote> updateCheckinNote(@Body @Valid CheckinNote checkinNote, HttpRequest<?> request) {
6056
CheckinNote updateCheckinNote = checkinNoteServices.update(checkinNote);
6157
return HttpResponse.ok().headers(headers -> headers.location(
@@ -72,7 +68,6 @@ public HttpResponse<CheckinNote> updateCheckinNote(@Body @Valid CheckinNote chec
7268
* @return
7369
*/
7470
@Get("/{?checkinid,createdbyid}")
75-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
7671
public Set<CheckinNote> findCheckinNote(@Nullable UUID checkinid, @Nullable UUID createdbyid) {
7772
return checkinNoteServices.findByFields(checkinid, createdbyid);
7873
}
@@ -84,9 +79,8 @@ public Set<CheckinNote> findCheckinNote(@Nullable UUID checkinid, @Nullable UUID
8479
* @return
8580
*/
8681
@Get("/{id}")
87-
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
8882
public CheckinNote readCheckinNote(@NotNull UUID id) {
8983
return checkinNoteServices.read(id);
9084
}
9185

92-
}
86+
}

‎server/src/main/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteServicesImpl.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.objectcomputing.checkins.services.checkin_notes;
22

3+
import com.objectcomputing.checkins.services.permissions.Permission;
4+
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
35
import com.objectcomputing.checkins.exceptions.BadArgException;
46
import com.objectcomputing.checkins.exceptions.NotFoundException;
57
import com.objectcomputing.checkins.exceptions.PermissionException;
@@ -42,6 +44,7 @@ public CheckinNoteServicesImpl(CheckInRepository checkinRepo, CheckInServices ch
4244
// todo remove manual validations throughout class in favor of jakarta validations at api level.
4345

4446
@Override
47+
@RequiredPermission(Permission.CAN_CREATE_CHECKINS)
4548
public CheckinNote save(@NotNull CheckinNote checkinNote) {
4649
validate(checkinNote.getId() != null, "Found unexpected id %s for check in note", checkinNote.getId());
4750

@@ -71,6 +74,7 @@ public CheckinNote save(@NotNull CheckinNote checkinNote) {
7174
}
7275

7376
@Override
77+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
7478
public CheckinNote read(@NotNull UUID id) {
7579
final UUID currentUserId = currentUserServices.getCurrentUser().getId();
7680
CheckinNote checkInNoteResult = checkinNoteRepository.findById(id).orElse(null);
@@ -90,6 +94,7 @@ public CheckinNote read(@NotNull UUID id) {
9094
}
9195

9296
@Override
97+
@RequiredPermission(Permission.CAN_UPDATE_CHECKINS)
9398
public CheckinNote update(@NotNull CheckinNote checkinNote) {
9499
final UUID id = checkinNote.getId();
95100
validate(id == null || checkinNoteRepository.findById(id).isEmpty(), "Unable to locate checkin note to update with id %s", checkinNote.getId());
@@ -124,6 +129,7 @@ public CheckinNote update(@NotNull CheckinNote checkinNote) {
124129
}
125130

126131
@Override
132+
@RequiredPermission(Permission.CAN_VIEW_CHECKINS)
127133
public Set<CheckinNote> findByFields(@Nullable UUID checkinId, @Nullable UUID createById) {
128134
final UUID currentUserId = currentUserServices.getCurrentUser().getId();
129135
if(!checkinServices.doesUserHaveViewAccess(currentUserId, checkinId, createById)){
@@ -138,4 +144,4 @@ private void validate(boolean isError, String message, Object... args) {
138144
throw new BadArgException(String.format(message, args));
139145
}
140146
}
141-
}
147+
}

‎server/src/main/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentController.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.objectcomputing.checkins.services.checkindocument;
22

3-
import com.objectcomputing.checkins.services.permissions.Permission;
4-
import com.objectcomputing.checkins.services.permissions.RequiredPermission;
53
import com.objectcomputing.checkins.services.role.RoleType;
64
import io.micronaut.core.annotation.Nullable;
75
import io.micronaut.http.HttpResponse;
@@ -38,7 +36,6 @@ class CheckinDocumentController {
3836
*/
3937

4038
@Get("/{?checkinsId}")
41-
@RequiredPermission(Permission.CAN_VIEW_CHECKIN_DOCUMENT)
4239
Set<CheckinDocument> findCheckinDocument(@Nullable UUID checkinsId) {
4340
return checkinDocumentService.read(checkinsId);
4441
}
@@ -51,7 +48,6 @@ Set<CheckinDocument> findCheckinDocument(@Nullable UUID checkinsId) {
5148
*/
5249

5350
@Post
54-
@RequiredPermission(Permission.CAN_CREATE_CHECKIN_DOCUMENT)
5551
HttpResponse<CheckinDocument> createCheckinDocument(@Body @Valid CheckinDocumentCreateDTO checkinDocument) {
5652
CheckinDocument createdCheckinDocument = checkinDocumentService.save(new CheckinDocument(checkinDocument.getCheckinsId(), checkinDocument.getUploadDocId()));
5753
URI location = UriBuilder.of(PATH).path(createdCheckinDocument.getId().toString()).build();
@@ -65,7 +61,6 @@ HttpResponse<CheckinDocument> createCheckinDocument(@Body @Valid CheckinDocument
6561
* @return {@link HttpResponse<CheckinDocument>}
6662
*/
6763
@Put
68-
@RequiredPermission(Permission.CAN_UPDATE_CHECKIN_DOCUMENT)
6964
HttpResponse<?> update(@Body @Valid CheckinDocument checkinDocument) {
7065
if (checkinDocument == null) {
7166
return HttpResponse.ok();
@@ -83,9 +78,8 @@ HttpResponse<?> update(@Body @Valid CheckinDocument checkinDocument) {
8378
* @param checkinsId, id of the checkins record you wish to delete
8479
*/
8580
@Delete("/{checkinsId}")
86-
@RequiredPermission(Permission.CAN_DELETE_CHECKIN_DOCUMENT)
8781
@Status(HttpStatus.NO_CONTENT)
8882
void delete(UUID checkinsId) {
8983
checkinDocumentService.deleteByCheckinId(checkinsId);
9084
}
91-
}
85+
}

0 commit comments

Comments
 (0)