From 228969efce3bf5b55c9e6684d2b69c25203ce102 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 5 Nov 2020 14:32:42 +0100 Subject: [PATCH] Error fix --- .../java/com/plannaplan/controllers/CommisionController.java | 4 ++-- .../main/java/com/plannaplan/controllers/GroupController.java | 2 +- .../main/java/com/plannaplan/controllers/TokenController.java | 2 +- .../main/java/com/plannaplan/controllers/UsersController.java | 2 +- .../java/com/plannaplan/controllers/UsersControllerTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java index bcdc56c..40101f4 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java @@ -49,9 +49,9 @@ public class CommisionController extends TokenBasedController { } @PostMapping("/user") - @ApiOperation("Create commision with assignents to given groups. If group doesn't exist error will be thrown") + @ApiOperation(value = "Create commision with assignents to given groups. If group doesn't exist error will be thrown") public ResponseEntity addCommision( - @RequestBody @ApiParam(value = "List of groups ids user want to assign to. If group doesnt exisit error will be thrown", example = "[12,7,3]") List groups) + @RequestBody @ApiParam(value = "List of groups ids user want to assign to. If group doesnt exisit error will be thrown") List groups) throws UserNotFoundException { User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException()); diff --git a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java index 0e5dca9..811f43a 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java @@ -36,7 +36,7 @@ public class GroupController { @GetMapping("/course/{id}") @ApiOperation(value = "Return list of lectures and classes (if present) given course") public ResponseEntity> getCourses( - @PathVariable(name = "id") @ApiParam(value = "Id of course") Long id, + @PathVariable(name = "id") Long id, @RequestParam(name = "capacity", defaultValue = "true") @ApiParam(value = "Boolean if we want to have capacity field in response") Boolean capacity) { List groups = this.groupService.getGroupsByCourse(id); if (capacity) { diff --git a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java index a66c9f7..29df59d 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java @@ -30,7 +30,7 @@ public class TokenController { @GetMapping("/token") @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system") public ResponseEntity getToken( - @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system", example = "ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.pl") final String ticket) { + @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.pl") final String ticket) { final CasValidator validator = new CasValidator(SERVICE_URL, ticket); try { diff --git a/restservice/src/main/java/com/plannaplan/controllers/UsersController.java b/restservice/src/main/java/com/plannaplan/controllers/UsersController.java index 51e27ce..4cbe585 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/UsersController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/UsersController.java @@ -33,7 +33,7 @@ public class UsersController { @Autowired private UserService userService; - @GetMapping("/search") + @GetMapping("/student/search") @PreAuthorize("hasRole('ROLE_DEANERY')") @ApiOperation(value = "Serch for user by providing query. If query is empty it will return all students. You need token with DEANERY role to call this") public ResponseEntity> configApp( diff --git a/restservice/src/test/java/com/plannaplan/controllers/UsersControllerTest.java b/restservice/src/test/java/com/plannaplan/controllers/UsersControllerTest.java index d5eee16..ce57111 100755 --- a/restservice/src/test/java/com/plannaplan/controllers/UsersControllerTest.java +++ b/restservice/src/test/java/com/plannaplan/controllers/UsersControllerTest.java @@ -22,7 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @SpringBootTest @ContextConfiguration public class UsersControllerTest { - private static final String ENDPOINT = "/api/v1/users/search"; + private static final String ENDPOINT = "/api/v1/users/student/search"; @Autowired private WebApplicationContext webApplicationContext;