Skip to content
This repository has been archived by the owner on May 22, 2021. It is now read-only.

Commit

Permalink
Merge pull request #286 from E-Edu/issue/285
Browse files Browse the repository at this point in the history
Bugfix (#285)
  • Loading branch information
PAException authored May 26, 2020
2 parents 272d4d4 + 939c29d commit 49aa386
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ public Object createTask(@RequestBody @Valid CreateTaskRequestDTO dto) {
public Object getAllTasksFromLecture(@PathVariable @Min(1) int lectureId,
@RequestParam(required = false) boolean showBanned,
@RequestParam(required = false, defaultValue = "0") int skip,
@RequestParam(required = false, defaultValue = "0") int max) {
@RequestParam(required = false, defaultValue = "1") int max) {
return this.taskController.getTasksByLectureId(lectureId, showBanned, skip, max).getHttpResponse();
}

@GetMapping("/lecture/{lectureNameKey:[a-zäöüA-ZÄÖÜ0-9_]*[a-zA-Z][a-zäöüA-ZÄÖÜ0-9_]*}/task")
public Object getAllTasksFromLectureByLectureNameKey(@PathVariable @NotBlank String lectureNameKey,
@RequestParam(required = false) boolean showBanned,
@RequestParam(required = false, defaultValue = "0") int skip,
@RequestParam(required = false, defaultValue = "0") int max) {
@RequestParam(required = false, defaultValue = "1") int max) {
return this.taskController.getTasksByLectureNameKey(lectureNameKey, showBanned, skip, max).getHttpResponse();
}

Expand Down Expand Up @@ -90,13 +90,13 @@ public Object getTask(@PathVariable @Min(1) int taskId) {
@GetMapping("/task/user/{userId}")
public Object getTaskByUser(@PathVariable @NotNull UUID userId,
@RequestParam(required = false, defaultValue = "0") int skip,
@RequestParam(required = false, defaultValue = "0") int max) {
@RequestParam(required = false, defaultValue = "1") int max) {
return this.taskController.getTaskByUserId(userId, skip, max).getHttpResponse();
}

@GetMapping("/task/own")
public Object getOwnTasks(@RequestParam(required = false, defaultValue = "0") int skip,
@RequestParam(required = false, defaultValue = "0") int max) {
@RequestParam(required = false, defaultValue = "1") int max) {
return this.taskController.getTaskByUserId(Constants.UserId.TEST_UUID, skip, max).getHttpResponse();
}

Expand Down

0 comments on commit 49aa386

Please sign in to comment.