diff --git a/src/main/java/ru/soune/nocopy/adminpanel/client/DashBoardAppClient.java b/src/main/java/ru/soune/nocopy/adminpanel/client/DashBoardAppClient.java index 2935a9c..ffad958 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/client/DashBoardAppClient.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/client/DashBoardAppClient.java @@ -13,6 +13,9 @@ public interface DashBoardAppClient { @PostMapping("/api/v1/data") Map getUsersWithPagination(@RequestBody BaseRequest request); - @PostMapping("api/internal/data") - Map internalData(@RequestBody BaseRequest request); + @PostMapping("api/internal/data-info") + Map internalDataInfo(@RequestBody BaseRequest request); + + @PostMapping("api/internal/data-control") + Map internalDataControl(@RequestBody BaseRequest request); } diff --git a/src/main/java/ru/soune/nocopy/adminpanel/controller/AdminController.java b/src/main/java/ru/soune/nocopy/adminpanel/controller/AdminController.java index 6243091..975c8a0 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/controller/AdminController.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/controller/AdminController.java @@ -79,7 +79,7 @@ public class AdminController { .build()); } - Map response = dashBoardAppClient.internalData(request); + Map response = dashBoardAppClient.internalDataInfo(request); return ResponseEntity.ok( BaseResponse.builder() @@ -94,7 +94,7 @@ public class AdminController { public ResponseEntity handleControl(@RequestBody BaseRequest request) { Long currentUserId = (Long) httpServletRequest.getAttribute("userId"); - if (!adminSectionPermissionService.canWrite(currentUserId, + if (!adminSectionPermissionService.canRead(currentUserId, AdminSection.USERS)) { return ResponseEntity.ok(BaseResponse.builder() .msgId(request.getMsgId()) @@ -103,7 +103,7 @@ public class AdminController { .build()); } - Map response = dashBoardAppClient.getUsersWithPagination(request); + Map response = dashBoardAppClient.internalDataControl(request); return ResponseEntity.ok( BaseResponse.builder()