From 2b59c181e5b3cd36cd82a100b5669628a731970f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Fri, 30 Oct 2020 16:42:57 +0100 Subject: [PATCH] Refactor part 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit {{url}}/api/v1/courses/getCourses => {{url}}/api/v1/courses/all {{url}}/api/v1/groups/getCourseGroups?id=13 => {{url}}/api/v1/groups/course/13 {{url}}/api/v1/courses/getCoursesWithGroups => {{url}}/api/v1/courses/all?groups=true {{url}}/api/v1/commisions/add => {{url}}/api/v1/commisions/user {{url}}/api/v1/commisions/getAllCommisions => {{url}}/api/v1/commisions/user {{url}}/api/v1/assignments/getCurrentAssignments =>{{url}}/api/v1/assignments/user {{url}}/api/v1/users/searchForStudents => {{url}}/api/v1/users/search Signed-off-by: Marcin Woźniak --- .../controllers/AssignmentsController.java | 2 +- .../controllers/CommisionController.java | 4 ++-- .../controllers/CoursesController.java | 21 ++++++++----------- .../controllers/GroupController.java | 7 +++++-- .../controllers/UsersController.java | 2 +- .../security/WebSecurityConfig.java | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java b/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java index 1ff8570..2158118 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/AssignmentsController.java @@ -32,7 +32,7 @@ public class AssignmentsController extends TokenBasedController { @Autowired private AssignmentService assignmentService; - @GetMapping("/getCurrentAssignments") + @GetMapping("/user") public ResponseEntity> getCurrentAssignments() throws Exception { User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException("User not found")); Optional com = this.commisionService.getNewestCommision(user); diff --git a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java index ea7d2aa..f3b88fa 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java @@ -42,7 +42,7 @@ public class CommisionController extends TokenBasedController { public CommisionController() { } - @PostMapping("/add") + @PostMapping("/user") public ResponseEntity addCommision(@RequestBody List groups) throws UserNotFoundException { User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException()); @@ -58,7 +58,7 @@ public class CommisionController extends TokenBasedController { return new ResponseEntity<>("Succes", HttpStatus.OK); } - @GetMapping("/getAllCommisions") + @GetMapping("/user") public ResponseEntity> getAlCommisions() throws UserNotFoundException { User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException()); List result = CommisionResponseMappers diff --git a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java index 204fbc3..03db837 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/CoursesController.java @@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import com.plannaplan.responses.models.abstracts.CoursesResponse; @RestController @CrossOrigin @@ -24,20 +26,15 @@ public class CoursesController { @Autowired private CourseService courseService; - @GetMapping("/getCourses") - public ResponseEntity> getMethodName() { + @GetMapping("/all") + public ResponseEntity> getMethodName(@RequestParam(name = "groups", defaultValue = "false") Boolean groups) { List courses = this.courseService.getAllCourses(); - List response = CoursesResponseMappers.mapToGetCoursesResponse(courses); - return new ResponseEntity<>(response, HttpStatus.OK); - } - - @GetMapping("/getCoursesWithGroups") - public ResponseEntity> getCoursesWithGroups() { - final List courses = this.courseService.getAllCourses(); - final List response = CoursesResponseMappers + if (groups) { + final List response = CoursesResponseMappers .mapToGetCoursesWithGroupsResponse(courses); + return new ResponseEntity<>(response, HttpStatus.OK); + } + final List response = CoursesResponseMappers.mapToGetCoursesResponse(courses); return new ResponseEntity<>(response, HttpStatus.OK); - } - } \ No newline at end of file diff --git a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java index 90cbdda..0d795ff 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java @@ -14,19 +14,22 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @CrossOrigin + @RequestMapping("/api/" + App.API_VERSION + "/groups") public class GroupController { @Autowired private GroupService groupService; - @GetMapping("/getCourseGroups") - public ResponseEntity> getCourses(@RequestParam("id") Long id, + @GetMapping("/course/{id}") + + public ResponseEntity> getCourses(@PathVariable(name = "id") Long id, @RequestParam(name = "capacity", defaultValue = "true") Boolean capacity) { List groups = this.groupService.getGroupsByCourse(id); if (capacity) { diff --git a/restservice/src/main/java/com/plannaplan/controllers/UsersController.java b/restservice/src/main/java/com/plannaplan/controllers/UsersController.java index d4a4ae1..ebfa06e 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/UsersController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/UsersController.java @@ -27,7 +27,7 @@ public class UsersController { @Autowired private UserService userService; - @GetMapping("/searchForStudents") + @GetMapping("/search") @PreAuthorize("hasRole('ROLE_DEANERY')") public ResponseEntity> configApp(@RequestParam("query") String query) { diff --git a/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java b/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java index 95b3785..4993630 100755 --- a/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java +++ b/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java @@ -36,8 +36,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(final WebSecurity webSecurity) { - webSecurity.ignoring().antMatchers("/token**").antMatchers("/api/v1/courses/getCourses") - .antMatchers("/api/v1/groups/getCourseGroups").antMatchers("/api/v1/courses/getCoursesWithGroups"); + webSecurity.ignoring().antMatchers("/token**").antMatchers("/api/v1/courses/all") + .antMatchers("/api/v1/groups/course/{id}"); } @Override