feat: principal 감사와 배너 poster URL 지원

bottlenote-admin-api/src/test/kotlin/app/docs/banner/AdminBannerControllerDocsTest.kt

@@ -91,6 +91,7 @@ class AdminBannerControllerDocsTest {
 							fieldWithPath("data[].id").type(JsonFieldType.NUMBER).description("배너 ID"),
 							fieldWithPath("data[].name").type(JsonFieldType.STRING).description("배너명"),
 							fieldWithPath("data[].mediaType").type(JsonFieldType.STRING).description("미디어 유형 (IMAGE, VIDEO). 프론트엔드에서 img/video 태그 분기용"),
+							fieldWithPath("data[].posterUrl").type(JsonFieldType.STRING).description("동영상 배너 대표 이미지 URL").optional(),
 							fieldWithPath("data[].bannerType").type(JsonFieldType.STRING).description("배너 유형"),
 							fieldWithPath("data[].sortOrder").type(JsonFieldType.NUMBER).description("정렬 순서"),
 							fieldWithPath("data[].isActive").type(JsonFieldType.BOOLEAN).description("활성화 상태"),
@@ -148,6 +149,7 @@ class AdminBannerControllerDocsTest {
 							fieldWithPath("data.descriptionB").type(JsonFieldType.STRING).description("배너 설명B").optional(),
 							fieldWithPath("data.descriptionFontColor").type(JsonFieldType.STRING).description("설명 폰트 색상 (HEX)"),
 							fieldWithPath("data.imageUrl").type(JsonFieldType.STRING).description("이미지 URL. [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다"),
+							fieldWithPath("data.posterUrl").type(JsonFieldType.STRING).description("동영상 배너 대표 이미지 URL").optional(),
 							fieldWithPath("data.textPosition").type(JsonFieldType.STRING).description("텍스트 위치 (RT/CENTER/LB 등)"),
 							fieldWithPath("data.isExternalUrl").type(JsonFieldType.BOOLEAN).description("외부 URL 여부"),
 							fieldWithPath("data.targetUrl").type(JsonFieldType.VARIES).description("이동 URL. [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다").optional(),
@@ -204,6 +206,7 @@ class AdminBannerControllerDocsTest {
 							fieldWithPath("descriptionB").type(JsonFieldType.STRING).description("배너 설명B (최대 50자)").optional(),
 							fieldWithPath("descriptionFontColor").type(JsonFieldType.STRING).description("설명 폰트 색상 (HEX, 기본값: #ffffff)").optional(),
 							fieldWithPath("imageUrl").type(JsonFieldType.STRING).description("이미지 URL (필수). [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다"),
+							fieldWithPath("posterUrl").type(JsonFieldType.STRING).description("동영상 배너 대표 이미지 URL (최대 500자)").optional(),
 							fieldWithPath("textPosition").type(JsonFieldType.STRING).description("텍스트 위치 (RT/CENTER/LB 등, 기본값: RT)").optional(),
 							fieldWithPath("isExternalUrl").type(JsonFieldType.BOOLEAN).description("외부 URL 여부 (기본값: false)").optional(),
 							fieldWithPath("targetUrl").type(JsonFieldType.VARIES).description("이동 URL (isExternalUrl=true 시 필수). [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다").optional(),
@@ -269,6 +272,7 @@ class AdminBannerControllerDocsTest {
 							fieldWithPath("descriptionB").type(JsonFieldType.STRING).description("배너 설명B (최대 50자)").optional(),
 							fieldWithPath("descriptionFontColor").type(JsonFieldType.STRING).description("설명 폰트 색상 (HEX)"),
 							fieldWithPath("imageUrl").type(JsonFieldType.STRING).description("이미지 URL (필수). [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다"),
+							fieldWithPath("posterUrl").type(JsonFieldType.STRING).description("동영상 배너 대표 이미지 URL (최대 500자)").optional(),
 							fieldWithPath("textPosition").type(JsonFieldType.STRING).description("텍스트 위치 (RT/CENTER/LB 등)"),
 							fieldWithPath("isExternalUrl").type(JsonFieldType.BOOLEAN).description("외부 URL 여부"),
 							fieldWithPath("targetUrl").type(JsonFieldType.VARIES).description("이동 URL (isExternalUrl=true 시 필수). [주의] URL 형식 검증을 수행하지 않으므로 클라이언트에서 유효한 URL을 전달해야 합니다").optional(),

bottlenote-admin-api/src/test/kotlin/app/helper/banner/BannerHelper.kt

@@ -13,6 +13,7 @@ object BannerHelper {
 		id: Long = 1L,
 		name: String = "테스트 배너",
 		mediaType: MediaType = MediaType.IMAGE,
+		posterUrl: String? = "https://example.com/poster.jpg",
 		bannerType: BannerType = BannerType.CURATION,
 		sortOrder: Int = 0,
 		isActive: Boolean = true,
@@ -23,6 +24,7 @@ object BannerHelper {
 		id,
 		name,
 		mediaType,
+		posterUrl,
 		bannerType,
 		sortOrder,
 		isActive,
@@ -48,6 +50,7 @@ object BannerHelper {
 		descriptionB: String? = "배너 설명B",
 		descriptionFontColor: String = "#ffffff",
 		imageUrl: String = "https://example.com/banner.jpg",
+		posterUrl: String? = "https://example.com/poster.jpg",
 		textPosition: TextPosition = TextPosition.RT,
 		isExternalUrl: Boolean = false,
 		targetUrl: String? = null,
@@ -67,6 +70,7 @@ object BannerHelper {
 		descriptionB,
 		descriptionFontColor,
 		imageUrl,
+		posterUrl,
 		textPosition,
 		isExternalUrl,
 		targetUrl,
@@ -87,6 +91,7 @@ object BannerHelper {
 		descriptionB: String? = "배너 설명B",
 		descriptionFontColor: String = "#ffffff",
 		imageUrl: String = "https://example.com/banner.jpg",
+		posterUrl: String? = "https://example.com/poster.jpg",
 		textPosition: String = "RT",
 		isExternalUrl: Boolean = false,
 		targetUrl: String? = null,
@@ -102,6 +107,7 @@ object BannerHelper {
 		"descriptionB" to descriptionB,
 		"descriptionFontColor" to descriptionFontColor,
 		"imageUrl" to imageUrl,
+		"posterUrl" to posterUrl,
 		"textPosition" to textPosition,
 		"isExternalUrl" to isExternalUrl,
 		"targetUrl" to targetUrl,
@@ -119,6 +125,7 @@ object BannerHelper {
 		descriptionB: String? = "수정된 설명B",
 		descriptionFontColor: String = "#000000",
 		imageUrl: String = "https://example.com/updated.jpg",
+		posterUrl: String? = "https://example.com/poster.jpg",
 		textPosition: String = "CENTER",
 		isExternalUrl: Boolean = false,
 		targetUrl: String? = null,
@@ -135,6 +142,7 @@ object BannerHelper {
 		"descriptionB" to descriptionB,
 		"descriptionFontColor" to descriptionFontColor,
 		"imageUrl" to imageUrl,
+		"posterUrl" to posterUrl,
 		"textPosition" to textPosition,
 		"isExternalUrl" to isExternalUrl,
 		"targetUrl" to targetUrl,

bottlenote-batch/src/main/java/app/batch/bottlenote/curation/CurationExpirationStatusJob.java

@@ -14,7 +14,10 @@ public class CurationExpirationStatusJob extends QuartzJobBean {
 
   private static final String DEACTIVATE_EXPIRED_CURATIONS_SQL =
       "UPDATE curation "
-          + "SET is_active = false, last_modify_at = NOW(), last_modify_by = 'batch-curation-expiration' "
+          + "SET is_active = false, last_modify_at = NOW(), "
+          + "last_modify_principal_email = 'batch-curation-expiration', "
+          + "last_modify_principal_type = 'SYSTEM', "
+          + "last_modify_principal_id = NULL "
           + "WHERE is_active = true "
           + "AND exposure_end_date IS NOT NULL "
           + "AND exposure_end_date < CURDATE()";

bottlenote-batch/src/test/java/app/batch/bottlenote/curation/CurationExpirationStatusJobTest.java

@@ -44,6 +44,10 @@ private ArgumentMatcher<String> nativeExpirationUpdateSql() {
     return sql ->
         sql.contains("UPDATE curation")
             && sql.contains("is_active = false")
+            && sql.contains("last_modify_principal_email = 'batch-curation-expiration'")
+            && sql.contains("last_modify_principal_type = 'SYSTEM'")
+            && sql.contains("last_modify_principal_id = NULL")
+            && !sql.contains("last_modify_by")
             && sql.contains("is_active = true")
             && sql.contains("exposure_end_date < CURDATE()");
   }

bottlenote-mono/src/main/java/app/bottlenote/banner/domain/Banner.java

@@ -59,6 +59,10 @@ public class Banner extends BaseEntity {
   @Column(name = "image_url", nullable = false)
   private String imageUrl;
 
+  @Comment("동영상 배너 대표 이미지 URL")
+  @Column(name = "poster_url", length = 500)
+  private String posterUrl;
+
   @Comment("텍스트 위치")
   @Column(name = "text_position", nullable = false)
   @Enumerated(EnumType.STRING)
@@ -110,6 +114,7 @@ public void update(
       String descriptionB,
       String descriptionFontColor,
       String imageUrl,
+      String posterUrl,
       TextPosition textPosition,
       Boolean isExternalUrl,
       String targetUrl,
@@ -125,6 +130,7 @@ public void update(
     this.descriptionB = descriptionB;
     this.descriptionFontColor = descriptionFontColor;
     this.imageUrl = imageUrl;
+    this.posterUrl = posterUrl;
     this.textPosition = textPosition;
     this.isExternalUrl = isExternalUrl;
     this.targetUrl = targetUrl;

bottlenote-mono/src/main/java/app/bottlenote/banner/dto/request/AdminBannerCreateRequest.java

@@ -20,6 +20,7 @@ public record AdminBannerCreateRequest(
     @Pattern(regexp = "^#[0-9a-fA-F]{6}$", message = "INVALID_HEX_COLOR_FORMAT")
         String descriptionFontColor,
     @NotBlank(message = "BANNER_IMAGE_URL_REQUIRED") String imageUrl,
+    @Size(max = 500, message = "BANNER_POSTER_URL_MAX_SIZE") String posterUrl,
     TextPosition textPosition,
     Boolean isExternalUrl,
     String targetUrl,

bottlenote-mono/src/main/java/app/bottlenote/banner/dto/request/AdminBannerUpdateRequest.java

@@ -19,6 +19,7 @@ public record AdminBannerUpdateRequest(
     @Pattern(regexp = "^#[0-9a-fA-F]{6}$", message = "INVALID_HEX_COLOR_FORMAT")
         String descriptionFontColor,
     @NotBlank(message = "BANNER_IMAGE_URL_REQUIRED") String imageUrl,
+    @Size(max = 500, message = "BANNER_POSTER_URL_MAX_SIZE") String posterUrl,
     TextPosition textPosition,
     Boolean isExternalUrl,
     String targetUrl,

bottlenote-mono/src/main/java/app/bottlenote/banner/dto/response/AdminBannerDetailResponse.java

@@ -13,6 +13,7 @@ public record AdminBannerDetailResponse(
     String descriptionB,
     String descriptionFontColor,
     String imageUrl,
+    String posterUrl,
     TextPosition textPosition,
     Boolean isExternalUrl,
     String targetUrl,

bottlenote-mono/src/main/java/app/bottlenote/banner/dto/response/AdminBannerListResponse.java

@@ -8,6 +8,7 @@ public record AdminBannerListResponse(
     Long id,
     String name,
     MediaType mediaType,
+    String posterUrl,
     BannerType bannerType,
     Integer sortOrder,
     Boolean isActive,

bottlenote-mono/src/main/java/app/bottlenote/banner/dto/response/BannerResponse.java

@@ -22,6 +22,7 @@ public class BannerResponse {
   private String descriptionB;
   private String descriptionFontColor;
   private String imageUrl;
+  private String posterUrl;
   private TextPosition textPosition;
   private String targetUrl;
   private Boolean isExternalUrl;

bottlenote-mono/src/main/java/app/bottlenote/banner/repository/CustomBannerRepositoryImpl.java

@@ -33,6 +33,7 @@ public Page<AdminBannerListResponse> searchForAdmin(
                     banner.id,
                     banner.name,
                     banner.mediaType,
+                    banner.posterUrl,
                     banner.bannerType,
                     banner.sortOrder,
                     banner.isActive,

bottlenote-mono/src/main/java/app/bottlenote/banner/service/AdminBannerService.java

@@ -65,6 +65,7 @@ public AdminBannerDetailResponse getDetail(Long bannerId) {
         banner.getDescriptionB(),
         banner.getDescriptionFontColor(),
         banner.getImageUrl(),
+        banner.getPosterUrl(),
         banner.getTextPosition(),
         banner.getIsExternalUrl(),
         banner.getTargetUrl(),
@@ -99,6 +100,7 @@ public AdminResultResponse create(AdminBannerCreateRequest request) {
             .descriptionB(request.descriptionB())
             .descriptionFontColor(request.descriptionFontColor())
             .imageUrl(request.imageUrl())
+            .posterUrl(request.posterUrl())
             .textPosition(request.textPosition())
             .isExternalUrl(request.isExternalUrl())
             .targetUrl(request.targetUrl())
@@ -137,6 +139,7 @@ public AdminResultResponse update(Long bannerId, AdminBannerUpdateRequest reques
         request.descriptionB(),
         request.descriptionFontColor(),
         request.imageUrl(),
+        request.posterUrl(),
         request.textPosition(),
         request.isExternalUrl(),
         request.targetUrl(),

bottlenote-mono/src/main/java/app/bottlenote/banner/service/BannerQueryService.java

@@ -31,6 +31,7 @@ public List<BannerResponse> getActiveBanners(Integer limit) {
                     .descriptionB(banner.getDescriptionB())
                     .descriptionFontColor(banner.getDescriptionFontColor())
                     .imageUrl(banner.getImageUrl())
+                    .posterUrl(banner.getPosterUrl())
                     .textPosition(banner.getTextPosition())
                     .targetUrl(banner.getTargetUrl())
                     .isExternalUrl(banner.getIsExternalUrl())

bottlenote-mono/src/main/java/app/bottlenote/common/constant/AuditPrincipalType.java

@@ -0,0 +1,9 @@
+package app.bottlenote.common.constant;
+
+public enum AuditPrincipalType {
+  USER,
+  ADMIN,
+  AGENT,
+  SYSTEM,
+  ANONYMOUS
+}

bottlenote-mono/src/main/java/app/bottlenote/common/domain/AuditPrincipal.java

@@ -0,0 +1,28 @@
+package app.bottlenote.common.domain;
+
+import app.bottlenote.common.constant.AuditPrincipalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Embeddable
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class AuditPrincipal {
+
+  @Column(name = "principal_id")
+  private Long id;
+
+  @Enumerated(EnumType.STRING)
+  @Column(name = "principal_type", length = 30)
+  private AuditPrincipalType type;
+
+  @Column(name = "principal_email")
+  private String email;
+}

bottlenote-mono/src/main/java/app/bottlenote/common/domain/BaseEntity.java

@@ -1,27 +1,7 @@
 package app.bottlenote.common.domain;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
-import lombok.Getter;
-import org.hibernate.annotations.Comment;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-/** 생성자 , 수정자 정보가 존재하는 entity의 경우 사용 */
-@Getter
+/** 생성자와 수정자 정보가 존재하는 기존 entity의 호환용 공통 클래스 */
 @MappedSuperclass
-@EntityListeners(AuditingEntityListener.class)
-public class BaseEntity extends BaseTimeEntity {
-
-  @Comment("최초 생성자")
-  @CreatedBy
-  @Column(updatable = false, name = "create_by")
-  private String createBy;
-
-  @Comment("최종 수정자")
-  @LastModifiedBy
-  @Column(name = "last_modify_by")
-  private String lastModifyBy;
-}
+public class BaseEntity extends BaseTimeEntity {}

bottlenote-mono/src/main/java/app/bottlenote/common/domain/BaseTimeEntity.java

@@ -1,17 +1,22 @@
 package app.bottlenote.common.domain;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import java.time.LocalDateTime;
 import lombok.Getter;
 import org.hibernate.annotations.Comment;
+import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.domain.AbstractAggregateRoot;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-/** 생성일, 수정일이 필요한 entity의 경우 사용 */
+/** 생성일, 수정일과 감사 주체가 필요한 entity의 공통 클래스 */
 @Getter
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
@@ -26,4 +31,30 @@ public class BaseTimeEntity extends AbstractAggregateRoot<BaseEntity> {
   @LastModifiedDate
   @Column(name = "last_modify_at")
   private LocalDateTime lastModifyAt;
+
+  @CreatedBy
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(
+        name = "id",
+        column = @Column(name = "create_principal_id", updatable = false)),
+    @AttributeOverride(
+        name = "type",
+        column = @Column(name = "create_principal_type", length = 30, updatable = false)),
+    @AttributeOverride(
+        name = "email",
+        column = @Column(name = "create_principal_email", updatable = false))
+  })
+  private AuditPrincipal createPrincipal;
+
+  @LastModifiedBy
+  @Embedded
+  @AttributeOverrides({
+    @AttributeOverride(name = "id", column = @Column(name = "last_modify_principal_id")),
+    @AttributeOverride(
+        name = "type",
+        column = @Column(name = "last_modify_principal_type", length = 30)),
+    @AttributeOverride(name = "email", column = @Column(name = "last_modify_principal_email"))
+  })
+  private AuditPrincipal lastModifyPrincipal;
 }

bottlenote-mono/src/main/java/app/bottlenote/global/config/jpa/AuditorAwareImpl.java

@@ -1,26 +1,33 @@
 package app.bottlenote.global.config.jpa;
 
+import app.bottlenote.common.constant.AuditPrincipalType;
+import app.bottlenote.common.domain.AuditPrincipal;
+import app.bottlenote.global.security.CustomAdminUserContext;
+import app.bottlenote.global.security.CustomUserContext;
 import java.util.Optional;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
 
-@Slf4j
-public class AuditorAwareImpl implements AuditorAware<String> {
+public class AuditorAwareImpl implements AuditorAware<AuditPrincipal> {
 
   @Override
-  public Optional<String> getCurrentAuditor() {
-
+  public Optional<AuditPrincipal> getCurrentAuditor() {
     Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+    if (authentication == null || !authentication.isAuthenticated()) {
+      return Optional.empty();
+    }
 
-    if (authentication != null && authentication.isAuthenticated()) {
-      if ("[ROLE_ANONYMOUS]".equals(authentication.getAuthorities().toString())) {
-        return Optional.of("anonymousUser");
-      }
-      UserDetails userDetails = (UserDetails) authentication.getPrincipal();
-      return Optional.ofNullable(userDetails.getUsername());
+    Object principal = authentication.getPrincipal();
+    if (principal instanceof CustomAdminUserContext admin) {
+      return Optional.of(
+          new AuditPrincipal(admin.getId(), AuditPrincipalType.ADMIN, admin.getUsername()));
+    }
+    if (principal instanceof CustomUserContext user) {
+      AuditPrincipalType type =
+          user.getId().equals(-4L) ? AuditPrincipalType.ANONYMOUS : AuditPrincipalType.USER;
+      Long id = type == AuditPrincipalType.ANONYMOUS ? null : user.getId();
+      return Optional.of(new AuditPrincipal(id, type, user.getUsername()));
     }
     return Optional.empty();
   }