Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<PermissionSummaryResponse> permissions = mapPermissions(queryService.listPermissions());
return new AdminPermissionListResponse(permissions);
}

@PostMapping
@PreAuthorize("@perm.has('ADMIN_ROLE_WRITE')")
@Operation(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.devkor.apu.saerok_server.domain.admin.role.api.dto.response;

import java.util.List;

public record AdminPermissionListResponse(
List<PermissionSummaryResponse> permissions
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ public List<RoleWithPermissions> listRoles() {
.toList();
}

public List<Permission> listPermissions() {
return permissionRepository.findAll();
}

public record MyRoleInfo(List<Role> roles, List<Permission> permissions) {
}

Expand Down