unify access resource check in a service #1310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/java/alfio/controller/api/v1/admin/ConfigurationApiV1Controller.java
# Conflicts: # src/main/java/alfio/controller/api/v1/admin/ConfigurationApiV1Controller.java
…tUser which is equal to isOwner)
# Conflicts: # src/main/java/alfio/controller/api/v1/admin/OrganizationsApiV1Controller.java # src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java # src/main/java/alfio/manager/AdditionalServiceManager.java # src/main/java/alfio/repository/AdditionalServiceRepository.java # src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java
syjer
changed the title
cbellone
reviewed
Dec 20, 2023
| WaitingQueueSubscription.Status currentStatus) { | ||
| Principal principal, WaitingQueueSubscription.Status newStatus, | ||
| WaitingQueueSubscription.Status currentStatus) { | ||
| accessService.checkWaitingQueueSubscriberInEvent(subscriberId, eventName); |
There was a problem hiding this comment.
we should probably embed "checkEventOwnership" inside "checkWaitingQueueSubscriberInEvent", to avoid unnecessary calls
| @@ -145,6 +155,7 @@ public boolean revertCheckIn(@PathVariable("eventId") int eventId, | |||
| public ResponseEntity<Boolean> revertCheckIn(@PathVariable("eventName") String eventName, | |||
| @PathVariable("ticketIdentifier") String ticketIdentifier, | |||
| Principal principal) { | |||
| accessService.checkEventTicketIdentifierMembership(principal, eventName, ticketIdentifier, AccessService.CHECKIN_ROLES); | |||
There was a problem hiding this comment.
checkEventTicketIdentifierMembership could return an EventAndOrganizationId, so that we can reduce the number of queries
| validateIdList(ids); | ||
| return checkInManager.getAttendeesInformation(eventId, ids, principal.getName()); | ||
| } | ||
|
|
||
| @GetMapping("/check-in/{eventName}/label-layout") | ||
| public ResponseEntity<LabelLayout> getLabelLayoutForEvent(@PathVariable("eventName") String eventName, Principal principal) { | ||
| accessService.canAccessEvent(principal, eventName); |
There was a problem hiding this comment.
canAccessEvent returns a result of type "EventAndOrganizationId". We can use that
|
cbellone
approved these changes
Dec 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will be even more simplified in a future release.