Merge pull request #263 from DevKor-github/develop

#256 ~ #262 반영해 운영 배포

Author: soonduck-dreams

…ver/domain/ad/api/AdminAdController.java …main/admin/ad/api/AdminAdController.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/AdminAdController.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/AdminAdController.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/AdminAdController.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/AdminAdController.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api;
+package org.devkor.apu.saerok_server.domain.admin.ad.api;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -8,20 +8,20 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminAdImagePresignRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminCreateAdPlacementRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminCreateAdRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminCreateSlotRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminUpdateAdPlacementRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminUpdateAdRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.request.AdminUpdateSlotRequest;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.response.AdImagePresignResponse;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.response.AdminAdListResponse;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.response.AdminAdPlacementListResponse;
-import org.devkor.apu.saerok_server.domain.ad.api.dto.response.AdminSlotListResponse;
-import org.devkor.apu.saerok_server.domain.ad.application.AdminAdPlacementService;
-import org.devkor.apu.saerok_server.domain.ad.application.AdminAdService;
-import org.devkor.apu.saerok_server.domain.ad.application.AdminSlotService;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminAdImagePresignRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminCreateAdPlacementRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminCreateAdRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminCreateSlotRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminUpdateAdPlacementRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminUpdateAdRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request.AdminUpdateSlotRequest;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response.AdImagePresignResponse;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response.AdminAdListResponse;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response.AdminAdPlacementListResponse;
+import org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response.AdminSlotListResponse;
+import org.devkor.apu.saerok_server.domain.admin.ad.application.AdminAdPlacementService;
+import org.devkor.apu.saerok_server.domain.admin.ad.application.AdminAdService;
+import org.devkor.apu.saerok_server.domain.admin.ad.application.AdminSlotService;
 import org.devkor.apu.saerok_server.domain.ad.core.entity.Ad;
 import org.devkor.apu.saerok_server.domain.ad.core.entity.AdPlacement;
 import org.devkor.apu.saerok_server.domain.ad.core.entity.Slot;
@@ -47,7 +47,7 @@ public class AdminAdController {
     /* ───────────── 광고(Ad) 관리 ───────────── */
 
     @GetMapping("/list")
-    @PreAuthorize("hasAnyRole('ADMIN_VIEWER','ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_READ')")
     @Operation(
             summary = "광고 목록 조회",
             security = @SecurityRequirement(name = "bearerAuth"),
@@ -79,7 +79,7 @@ public AdminAdListResponse listAds() {
     }
 
     @PostMapping("/create")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 생성",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -112,7 +112,7 @@ public AdminAdListResponse.Item createAd(
     }
 
     @PutMapping("/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 수정",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -147,7 +147,7 @@ public AdminAdListResponse.Item updateAd(
     }
 
     @DeleteMapping("/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 삭제",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -160,7 +160,7 @@ public void deleteAd(@PathVariable Long id,
     /* ───────────── 광고 이미지 Presigned URL ───────────── */
 
     @PostMapping("/image/presign")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 이미지 Presigned URL 발급",
             security = @SecurityRequirement(name = "bearerAuth"),
@@ -181,7 +181,7 @@ public AdImagePresignResponse generateAdImagePresignUrl(
     /* ───────────── 슬롯(Slot) 관리 ───────────── */
 
     @GetMapping("/slot")
-    @PreAuthorize("hasAnyRole('ADMIN_VIEWER','ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_READ')")
     @Operation(
             summary = "슬롯 목록 조회",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -205,7 +205,7 @@ public AdminSlotListResponse listSlots() {
     }
 
     @PostMapping("/slot")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "슬롯 생성",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -234,7 +234,7 @@ public AdminSlotListResponse.Item createSlot(
     }
 
     @PutMapping("/slot/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "슬롯 수정",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -264,7 +264,7 @@ public AdminSlotListResponse.Item updateSlot(
     }
 
     @DeleteMapping("/slot/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_SLOT_DELETE')")
     @Operation(
             summary = "슬롯 삭제",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -277,7 +277,7 @@ public void deleteSlot(@PathVariable Long id,
     /* ───────────── 광고 배치(AdPlacement) 관리 ───────────── */
 
     @GetMapping("/placement")
-    @PreAuthorize("hasAnyRole('ADMIN_VIEWER','ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_READ')")
     @Operation(
             summary = "광고 배치 목록 조회",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -306,7 +306,7 @@ public AdminAdPlacementListResponse listPlacements() {
     }
 
     @PostMapping("/placement")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 배치 생성",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -346,7 +346,7 @@ public AdminAdPlacementListResponse.Item createPlacement(
     }
 
     @PutMapping("/placement/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 배치 수정",
             security = @SecurityRequirement(name = "bearerAuth")
@@ -387,7 +387,7 @@ public AdminAdPlacementListResponse.Item updatePlacement(
     }
 
     @DeleteMapping("/placement/{id}")
-    @PreAuthorize("hasRole('ADMIN_EDITOR')")
+    @PreAuthorize("@perm.has('ADMIN_AD_WRITE')")
     @Operation(
             summary = "광고 배치 삭제",
             security = @SecurityRequirement(name = "bearerAuth")

…/request/AdminAdImagePresignRequest.java …/request/AdminAdImagePresignRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminAdImagePresignRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminAdImagePresignRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminAdImagePresignRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminAdImagePresignRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

…quest/AdminCreateAdPlacementRequest.java …quest/AdminCreateAdPlacementRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateAdPlacementRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateAdPlacementRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateAdPlacementRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateAdPlacementRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;

…pi/dto/request/AdminCreateAdRequest.java …pi/dto/request/AdminCreateAdRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateAdRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateAdRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateAdRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateAdRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

…/dto/request/AdminCreateSlotRequest.java …/dto/request/AdminCreateSlotRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateSlotRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateSlotRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminCreateSlotRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminCreateSlotRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

…quest/AdminUpdateAdPlacementRequest.java …quest/AdminUpdateAdPlacementRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateAdPlacementRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateAdPlacementRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateAdPlacementRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateAdPlacementRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

…pi/dto/request/AdminUpdateAdRequest.java …pi/dto/request/AdminUpdateAdRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateAdRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateAdRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateAdRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateAdRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

…/dto/request/AdminUpdateSlotRequest.java …/dto/request/AdminUpdateSlotRequest.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateSlotRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateSlotRequest.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/request/AdminUpdateSlotRequest.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/request/AdminUpdateSlotRequest.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.request;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

…dto/response/AdImagePresignResponse.java …dto/response/AdImagePresignResponse.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/response/AdImagePresignResponse.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/response/AdImagePresignResponse.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/response/AdImagePresignResponse.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/response/AdImagePresignResponse.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.response;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

…pi/dto/response/AdminAdListResponse.java …pi/dto/response/AdminAdListResponse.javasrc/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/response/AdminAdListResponse.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/response/AdminAdListResponse.java src/main/java/org/devkor/apu/saerok_server/domain/ad/api/dto/response/AdminAdListResponse.java renamed to src/main/java/org/devkor/apu/saerok_server/domain/admin/ad/api/dto/response/AdminAdListResponse.java

@@ -1,4 +1,4 @@
-package org.devkor.apu.saerok_server.domain.ad.api.dto.response;
+package org.devkor.apu.saerok_server.domain.admin.ad.api.dto.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;