|
3 | 3 | import ir.bigz.springbootreal.service.UserService; |
4 | 4 | import ir.bigz.springbootreal.viewmodel.UserModel; |
5 | 5 | import org.springframework.data.domain.Page; |
| 6 | +import org.springframework.data.domain.Sort; |
6 | 7 | import org.springframework.http.HttpStatus; |
7 | 8 | import org.springframework.http.MediaType; |
8 | 9 | import org.springframework.http.ResponseEntity; |
@@ -60,19 +61,22 @@ public ResponseEntity<?> getAllUser() { |
60 | 61 | } |
61 | 62 |
|
62 | 63 | @GetMapping(path = "/user/search", produces = MediaType.APPLICATION_JSON_VALUE) |
63 | | - public ResponseEntity<?> getPage(@RequestParam(name = "pagenumber") Integer pageNumber, |
64 | | - @RequestParam(name = "pagesize") Integer pageSize, |
65 | | - @RequestParam(name = "sortorder") String sortOrder) { |
66 | | - Page<UserModel> userPageResult = userService.getUserSearchResult(pageNumber, pageSize, sortOrder); |
| 64 | + public ResponseEntity<?> getUserWithSearch(@RequestParam(name = "searchfield") String searchField, |
| 65 | + @RequestParam(name = "sortorder") String sortOrder, |
| 66 | + @RequestParam(name = "direction") String direction, |
| 67 | + @RequestParam(name = "pagenumber") Integer pageNumber, |
| 68 | + @RequestParam(name = "pagesize") Integer pageSize) { |
| 69 | + Page<UserModel> userPageResult = userService.getUserSearchResult(searchField, sortOrder, Sort.Direction.fromString(direction), pageNumber, pageSize); |
67 | 70 | return ResponseEntity.ok(userPageResult); |
68 | 71 | } |
69 | 72 |
|
70 | 73 |
|
71 | | - @GetMapping(path = "/user/all", produces = MediaType.APPLICATION_JSON_VALUE) |
72 | | - public ResponseEntity<?> getAllUserPage(@RequestParam(name = "pagenumber") Integer pageNumber, |
73 | | - @RequestParam(name = "pagesize") Integer pageSize, |
74 | | - @RequestParam(name = "sortorder") String sortOrder) { |
75 | | - Page<UserModel> userPageResult = userService.getAllUserPagebale(pageNumber, pageSize, sortOrder); |
| 74 | + @GetMapping(path = "/user/all/pagerquest", produces = MediaType.APPLICATION_JSON_VALUE) |
| 75 | + public ResponseEntity<?> getAllUserPage(@RequestParam(name = "sortorder", required = false) String sortOrder, |
| 76 | + @RequestParam(name = "direction") String sortDirection, |
| 77 | + @RequestParam(name = "pagenumber") Integer pageNumber, |
| 78 | + @RequestParam(name = "pagesize") Integer pageSize) { |
| 79 | + Page<UserModel> userPageResult = userService.getAllUserPage(sortOrder, Sort.Direction.fromString(sortDirection), pageNumber, pageSize); |
76 | 80 | return ResponseEntity.ok(userPageResult); |
77 | 81 | } |
78 | 82 |
|
|
0 commit comments