Merge branch 'feature/62-1'

Author: k3vin7

.gitignore

@@ -1,6 +1,7 @@
 HELP.md
 .gradle
 build/
+.kotlin
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/

src/main/generated/com/daramg/server/post/domain/QCurationPost.java

@@ -35,6 +35,9 @@ public class QCurationPost extends EntityPathBase<CurationPost> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt;
 
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> deletedAt;
+
     //inherited
     public final ListPath<String, StringPath> hashtags;
 
@@ -47,6 +50,9 @@ public class QCurationPost extends EntityPathBase<CurationPost> {
     //inherited
     public final BooleanPath isBlocked;
 
+    //inherited
+    public final BooleanPath isDeleted;
+
     //inherited
     public final NumberPath<Integer> likeCount;
 
@@ -89,10 +95,12 @@ public QCurationPost(Class<? extends CurationPost> type, PathMetadata metadata,
         this.commentCount = _super.commentCount;
         this.content = _super.content;
         this.createdAt = _super.createdAt;
+        this.deletedAt = _super.deletedAt;
         this.hashtags = _super.hashtags;
         this.id = _super.id;
         this.images = _super.images;
         this.isBlocked = _super.isBlocked;
+        this.isDeleted = _super.isDeleted;
         this.likeCount = _super.likeCount;
         this.postStatus = _super.postStatus;
         this.primaryComposer = inits.isInitialized("primaryComposer") ? new com.daramg.server.composer.domain.QComposer(forProperty("primaryComposer")) : null;

src/main/generated/com/daramg/server/post/domain/QFreePost.java

@@ -33,6 +33,9 @@ public class QFreePost extends EntityPathBase<FreePost> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt;
 
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> deletedAt;
+
     //inherited
     public final ListPath<String, StringPath> hashtags;
 
@@ -45,6 +48,9 @@ public class QFreePost extends EntityPathBase<FreePost> {
     //inherited
     public final BooleanPath isBlocked;
 
+    //inherited
+    public final BooleanPath isDeleted;
+
     //inherited
     public final NumberPath<Integer> likeCount;
 
@@ -85,10 +91,12 @@ public QFreePost(Class<? extends FreePost> type, PathMetadata metadata, PathInit
         this.commentCount = _super.commentCount;
         this.content = _super.content;
         this.createdAt = _super.createdAt;
+        this.deletedAt = _super.deletedAt;
         this.hashtags = _super.hashtags;
         this.id = _super.id;
         this.images = _super.images;
         this.isBlocked = _super.isBlocked;
+        this.isDeleted = _super.isDeleted;
         this.likeCount = _super.likeCount;
         this.postStatus = _super.postStatus;
         this.title = _super.title;

src/main/generated/com/daramg/server/post/domain/QPost.java

@@ -31,6 +31,8 @@ public class QPost extends EntityPathBase<Post> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
+    public final DateTimePath<java.time.LocalDateTime> deletedAt = createDateTime("deletedAt", java.time.LocalDateTime.class);
+
     public final ListPath<String, StringPath> hashtags = this.<String, StringPath>createList("hashtags", String.class, StringPath.class, PathInits.DIRECT2);
 
     //inherited
@@ -40,6 +42,8 @@ public class QPost extends EntityPathBase<Post> {
 
     public final BooleanPath isBlocked = createBoolean("isBlocked");
 
+    public final BooleanPath isDeleted = createBoolean("isDeleted");
+
     public final NumberPath<Integer> likeCount = createNumber("likeCount", Integer.class);
 
     public final EnumPath<PostStatus> postStatus = createEnum("postStatus", PostStatus.class);

src/main/generated/com/daramg/server/post/domain/QStoryPost.java

@@ -33,6 +33,9 @@ public class QStoryPost extends EntityPathBase<StoryPost> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt;
 
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> deletedAt;
+
     //inherited
     public final ListPath<String, StringPath> hashtags;
 
@@ -45,6 +48,9 @@ public class QStoryPost extends EntityPathBase<StoryPost> {
     //inherited
     public final BooleanPath isBlocked;
 
+    //inherited
+    public final BooleanPath isDeleted;
+
     //inherited
     public final NumberPath<Integer> likeCount;
 
@@ -87,10 +93,12 @@ public QStoryPost(Class<? extends StoryPost> type, PathMetadata metadata, PathIn
         this.commentCount = _super.commentCount;
         this.content = _super.content;
         this.createdAt = _super.createdAt;
+        this.deletedAt = _super.deletedAt;
         this.hashtags = _super.hashtags;
         this.id = _super.id;
         this.images = _super.images;
         this.isBlocked = _super.isBlocked;
+        this.isDeleted = _super.isDeleted;
         this.likeCount = _super.likeCount;
         this.postStatus = _super.postStatus;
         this.primaryComposer = inits.isInitialized("primaryComposer") ? new com.daramg.server.composer.domain.QComposer(forProperty("primaryComposer")) : null;

src/main/java/com/daramg/server/auth/config/SecurityConfig.java

@@ -32,6 +32,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
                 .cors(cors -> cors.configurationSource(corsConfigurationSource()))
                 .csrf(AbstractHttpConfigurer::disable)
+                .headers(headers -> headers.frameOptions(frame -> frame.sameOrigin()))  // 추가: h2 db 접근
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
                         /**
@@ -47,6 +48,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
                         .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll()
                         .requestMatchers("/docs/**").permitAll()
+                        .requestMatchers("/h2-console/**").permitAll() // 추가: h2 db 접근
 
                         /**
                          * 위에서 등록되지 않은 모든 경로는 인증 필요

src/main/java/com/daramg/server/notice/application/NoticeQueryService.java

@@ -0,0 +1,40 @@
+package com.daramg.server.notice.application;
+
+import com.daramg.server.common.application.EntityUtils;
+import com.daramg.server.common.dto.PageRequestDto;
+import com.daramg.server.common.dto.PageResponseDto;
+import com.daramg.server.common.util.PagingUtils;
+import com.daramg.server.notice.domain.Notice;
+import com.daramg.server.notice.dto.NoticeResponseDto;
+import com.daramg.server.notice.repository.NoticeQueryRepository;
+import com.daramg.server.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class NoticeQueryService {
+
+    private final NoticeQueryRepository noticeQueryRepository;
+    private final PagingUtils pagingUtils;
+
+    public PageResponseDto<NoticeResponseDto> getAllPublishedNotices(PageRequestDto pageRequest, User user) {
+        List<Notice> notices = noticeQueryRepository.getPublished(pageRequest);
+
+        return pagingUtils.createPageResponse(
+                notices,
+                pageRequest.getValidatedSize(),
+                notice -> toNoticeResponseDto(notice, user),
+                Notice::getCreatedAt,
+                Notice::getId
+        );
+    }
+
+    private NoticeResponseDto toNoticeResponseDto(Notice notice, User user) {
+        return NoticeResponseDto.from(notice);
+    }
+}

src/main/java/com/daramg/server/notice/application/NoticeService.java

@@ -0,0 +1,62 @@
+package com.daramg.server.notice.application;
+
+import com.daramg.server.common.application.EntityUtils;
+import com.daramg.server.notice.domain.Notice;
+import com.daramg.server.notice.domain.vo.NoticeCreateVo;
+import com.daramg.server.notice.domain.vo.NoticeUpdateVo;
+import com.daramg.server.notice.dto.NoticeCreateDto;
+import com.daramg.server.notice.dto.NoticeUpdateDto;
+import com.daramg.server.notice.repository.NoticeRepository;
+import com.daramg.server.notice.utils.NoticeUserValidator;
+import com.daramg.server.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class NoticeService {
+
+    private final NoticeRepository noticeRepository;
+    private final EntityUtils entityUtils;
+
+    @Transactional
+    public void create(NoticeCreateDto dto, User user) {
+
+        NoticeCreateVo vo = new NoticeCreateVo(
+                user,
+                dto.getTitle(),
+                dto.getContent(),
+                dto.getImages()
+        );
+
+        Notice notice = Notice.from(vo);
+        noticeRepository.save(notice);
+    }
+
+    @Transactional
+    public void updateNotice(Long noticeId, NoticeUpdateDto dto, User user) {
+        Notice notice = entityUtils.getEntity(noticeId, Notice.class);
+        NoticeUserValidator.check(notice, user);
+
+        NoticeUpdateVo vo = toUpdateVo(dto);
+        notice.update(vo);
+    }
+
+    @Transactional
+    public void delete(Long noticeId, User user) {
+        Notice notice = entityUtils.getEntity(noticeId, Notice.class);
+        NoticeUserValidator.check(notice, user);
+        notice.softDelete();
+    }
+
+    private NoticeUpdateVo toUpdateVo(NoticeUpdateDto dto) {
+        return new NoticeUpdateVo(
+                dto.getTitle(),
+                dto.getContent(),
+                dto.getImages()
+        );
+    }
+}

src/main/java/com/daramg/server/notice/domain/Notice.java

@@ -0,0 +1,100 @@
+package com.daramg.server.notice.domain;
+
+import com.daramg.server.common.converter.JsonArrayConverter;
+import com.daramg.server.common.domain.BaseEntity;
+import com.daramg.server.common.exception.BusinessException;
+import com.daramg.server.notice.domain.vo.NoticeCreateVo;
+import com.daramg.server.notice.domain.vo.NoticeUpdateVo;
+import com.daramg.server.user.domain.User;
+import jakarta.persistence.*;
+import lombok.*;
+import org.hibernate.annotations.SQLRestriction;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter
+@Table(name = "notices")
+@SQLRestriction("is_deleted = false")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Notice extends BaseEntity<Notice> {
+
+    private static final String EMPTY_UPDATE_REQUEST = "수정 사항이 없습니다.";
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @Column(name = "title", nullable = false, columnDefinition = "TEXT")
+    private String title;
+
+    @Column(name = "content", nullable = false, columnDefinition = "TEXT")
+    private String content;
+
+    @Convert(converter = JsonArrayConverter.class)
+    @Column(name = "images", columnDefinition = "JSON")
+    private List<String> images = new ArrayList<>();
+
+    @Column(name = "is_deleted", nullable = false)
+    private boolean isDeleted = false;
+
+    @Column(name = "deleted_at")
+    private LocalDateTime deletedAt;
+
+    public void update(NoticeUpdateVo vo) {
+        if (vo.getTitle() == null && vo.getContent() == null
+                && vo.getImages() == null) {
+            throw new BusinessException(EMPTY_UPDATE_REQUEST);
+        }
+
+        if (vo.getTitle() != null) {
+            updateTitle(vo.getTitle());
+        }
+
+        if (vo.getContent() != null) {
+            updateContent(vo.getContent());
+        }
+
+        if (vo.getImages() != null) {
+            updateImages(vo.getImages());
+        }
+    }
+
+    @Builder(access = AccessLevel.PRIVATE)
+    private Notice(String title, String content, List<String> images, User user) {
+        this.title = title;
+        this.content = content;
+        this.images = (images != null) ? images : new ArrayList<>();
+        this.user = user;
+    }
+
+    public static Notice from(NoticeCreateVo vo) {
+        return Notice.builder()
+                .title(vo.getTitle())
+                .content(vo.getContent())
+                .images(vo.getImages())
+                .user(vo.getUser())
+                .build();
+    }
+
+    protected void updateTitle(String title) {
+        this.title = title;
+    }
+
+    protected void updateContent(String content) {
+        this.content = content;
+    }
+
+    protected void updateImages(List<String> images) {
+        this.images = (images != null) ? images : new ArrayList<>();
+    }
+
+    public void softDelete() {
+        if (this.isDeleted) return;
+
+        this.isDeleted = true;
+        this.deletedAt = LocalDateTime.now();
+    }
+}

src/main/java/com/daramg/server/notice/domain/vo/NoticeCreateVo.kt

@@ -0,0 +1,11 @@
+package com.daramg.server.notice.domain.vo
+
+import com.daramg.server.user.domain.User
+
+class NoticeCreateVo (
+
+    val user: User,
+    val title: String,
+    val content: String,
+    val images: List<String> = emptyList(),
+)