diff --git a/api/useradminservice.yaml b/api/useradminservice.yaml index cff4f9a8c..20e9714ab 100644 --- a/api/useradminservice.yaml +++ b/api/useradminservice.yaml @@ -31,16 +31,17 @@ paths: parameters: - name: filter in: query - description: The filter parameters to search for + description: 'The filter parameters to search for. If no filter is set all sessions are + being returned. If more than one filter is set the first given filter is used only.' schema: type: object properties: - consultant: - type: string - asker: - type: string agency: type: integer + asker: + type: string + consultant: + type: string consultingType: type: integer - name: page diff --git a/src/main/java/de/caritas/cob/userservice/api/admin/controller/SessionAdminController.java b/src/main/java/de/caritas/cob/userservice/api/admin/controller/SessionAdminController.java index 40f5bcf36..03c891afd 100644 --- a/src/main/java/de/caritas/cob/userservice/api/admin/controller/SessionAdminController.java +++ b/src/main/java/de/caritas/cob/userservice/api/admin/controller/SessionAdminController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; /** - * Controller to handle all agency admin requests. + * Controller to handle all session admin requests. */ @RestController @RequiredArgsConstructor @@ -25,7 +25,7 @@ public class SessionAdminController implements UseradminApi { /** * Creates the root hal based navigation entity. * - * @return a entity containing the available navigation hal links + * @return an entity containing the available navigation hal links */ @Override public ResponseEntity getRoot() { @@ -39,7 +39,7 @@ public ResponseEntity getRoot() { * @param page Number of page where to start in the query (1 = first page) (required) * @param perPage Number of items which are being returned (required) * @param filter The filters to restrict results (optional) - * @return a entity conatining the filtered sessions + * @return an entity containing the filtered sessions */ @Override public ResponseEntity getSessions(@NotNull @Valid Integer page, diff --git a/src/main/java/de/caritas/cob/userservice/api/authorization/Authorities.java b/src/main/java/de/caritas/cob/userservice/api/authorization/Authorities.java index 8331b574c..195ec4762 100644 --- a/src/main/java/de/caritas/cob/userservice/api/authorization/Authorities.java +++ b/src/main/java/de/caritas/cob/userservice/api/authorization/Authorities.java @@ -31,14 +31,14 @@ public enum Authorities { USER_ADMIN(UserRole.USER_ADMIN, singletonList(Authority.USER_ADMIN)); private final UserRole userRole; - private final List auhorities; + private final List grantedAuthorities; public static List getAuthoritiesByUserRole(UserRole userRole) { Optional authorityByUserRole = Stream.of(values()) .filter(authority -> authority.userRole.equals(userRole)) .findFirst(); - return authorityByUserRole.isPresent() ? authorityByUserRole.get().getAuhorities() + return authorityByUserRole.isPresent() ? authorityByUserRole.get().getGrantedAuthorities() : emptyList(); } diff --git a/src/test/java/de/caritas/cob/userservice/api/admin/service/SessionAdminResultDTOBuilderTest.java b/src/test/java/de/caritas/cob/userservice/api/admin/service/SessionAdminResultDTOBuilderTest.java index 7d707c314..f9b7343f2 100644 --- a/src/test/java/de/caritas/cob/userservice/api/admin/service/SessionAdminResultDTOBuilderTest.java +++ b/src/test/java/de/caritas/cob/userservice/api/admin/service/SessionAdminResultDTOBuilderTest.java @@ -80,7 +80,7 @@ public void build_Should_returnSessionAdminResultDTOWithoutPreviousLink_When_par } @Test - public void build_Should_returnSessionAdminResultDTOWithoutNextLink_When_parametersPageIsTheFirst() { + public void build_Should_returnSessionAdminResultDTOWithoutNextLink_When_parametersPageIsTheLast() { when(this.resultPage.getTotalPages()).thenReturn(MOCKED_SESSIONS_SIZE / 2); SessionAdminResultDTO resultDTO = SessionAdminResultDTOBuilder.getInstance()