diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/admin/announcement/application/AdminAnnouncementService.java b/src/main/java/org/devkor/apu/saerok_server/domain/admin/announcement/application/AdminAnnouncementService.java index 2cb4c13c..b0217a20 100644 --- a/src/main/java/org/devkor/apu/saerok_server/domain/admin/announcement/application/AdminAnnouncementService.java +++ b/src/main/java/org/devkor/apu/saerok_server/domain/admin/announcement/application/AdminAnnouncementService.java @@ -181,7 +181,7 @@ public AnnouncementImagePresignResponse generateImagePresignUrl(String contentTy } String fileName = UUID.randomUUID().toString(); - String objectKey = "announcements/" + fileName; + String objectKey = "announcement-images/" + fileName; String uploadUrl = imageService.generateUploadUrl(objectKey, contentType, 10); String imageUrl = imageDomainService.toUploadImageUrl(objectKey); diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/AdminRoleController.java b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/AdminRoleController.java index bb187a0a..f5c0c538 100644 --- a/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/AdminRoleController.java +++ b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/AdminRoleController.java @@ -14,6 +14,7 @@ import org.devkor.apu.saerok_server.domain.admin.role.api.dto.request.CreateRoleRequest; import org.devkor.apu.saerok_server.domain.admin.role.api.dto.request.UpdateRolePermissionsRequest; import org.devkor.apu.saerok_server.domain.admin.role.api.dto.response.AdminMyRoleResponse; +import org.devkor.apu.saerok_server.domain.admin.role.api.dto.response.AdminPermissionListResponse; import org.devkor.apu.saerok_server.domain.admin.role.api.dto.response.AdminRoleListResponse; import org.devkor.apu.saerok_server.domain.admin.role.api.dto.response.AdminRoleUserListResponse; import org.devkor.apu.saerok_server.domain.admin.role.api.dto.response.AdminUserRoleResponse; @@ -86,6 +87,18 @@ public AdminRoleListResponse listRoles() { return new AdminRoleListResponse(roles); } + @GetMapping("/permissions") + @PreAuthorize("@perm.has('ADMIN_ROLE_WRITE')") + @Operation( + summary = "권한 목록 조회", + security = @SecurityRequirement(name = "bearerAuth"), + responses = @ApiResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = AdminPermissionListResponse.class))) + ) + public AdminPermissionListResponse listPermissions() { + List permissions = mapPermissions(queryService.listPermissions()); + return new AdminPermissionListResponse(permissions); + } + @PostMapping @PreAuthorize("@perm.has('ADMIN_ROLE_WRITE')") @Operation( diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/dto/response/AdminPermissionListResponse.java b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/dto/response/AdminPermissionListResponse.java new file mode 100644 index 00000000..bdbbc4f5 --- /dev/null +++ b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/api/dto/response/AdminPermissionListResponse.java @@ -0,0 +1,8 @@ +package org.devkor.apu.saerok_server.domain.admin.role.api.dto.response; + +import java.util.List; + +public record AdminPermissionListResponse( + List permissions +) { +} diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/application/AdminRoleQueryService.java b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/application/AdminRoleQueryService.java index 68f82ad1..af7f291a 100644 --- a/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/application/AdminRoleQueryService.java +++ b/src/main/java/org/devkor/apu/saerok_server/domain/admin/role/application/AdminRoleQueryService.java @@ -88,6 +88,10 @@ public List listRoles() { .toList(); } + public List listPermissions() { + return permissionRepository.findAll(); + } + public record MyRoleInfo(List roles, List permissions) { }