[deploy] release v1.1.3 on main

Dockerfile

@@ -12,4 +12,6 @@ ARG JAR_FILE=build/libs/HomePage-BE-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
 
 # JVM 시간대 설정을 포함한 애플리케이션 실행
-ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app.jar"]
+# -Xmx256m	최대 힙 메모리를 256MB로 제한
+# -Xms128m	초기 힙 메모리 크기를 128MB로 설정
+ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-Xmx256m", "-Xms128m", "-jar", "/app.jar"]

build.gradle

@@ -57,8 +57,9 @@ dependencies {
     //csv
     implementation 'org.apache.commons:commons-csv:1.10.0'
 
-    //spring cache
-    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    // kafka
+    implementation 'org.springframework.kafka:spring-kafka'
+
 }
 
 tasks.named('test') {

src/main/java/org/farmsystem/homepage/domain/news/dto/request/NewsRequestDTO.java

@@ -1,5 +1,24 @@
 package org.farmsystem.homepage.domain.news.dto.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.List;
 
-public record NewsRequestDTO(String title, String content, String thumbnailUrl, List<String> imageUrls) { }
+@Schema(description = "소식 작성 요청 DTO")
+public record NewsRequestDTO(
+        @Schema(description = "소식 제목", example = "파밍 시스템 리뉴얼 안내")
+        String title,
+
+        @Schema(description = "소식 본문", example = "파밍 시스템이 새롭게 리뉴얼되었습니다. 자세한 사항은 홈페이지를 참고하세요.")
+        String content,
+
+        @Schema(description = "썸네일 이미지 URL", example = "https://s3-bucket/thumbnail.jpg")
+        String thumbnailUrl,
+
+        @Schema(description = "본문에 첨부될 이미지 URL 목록", example = "[\"https://s3-bucket/image1.jpg\", \"https://s3-bucket/image2.jpg\"]")
+        List<String> imageUrls,
+
+        @Schema(description = "태그 목록", example = "[\"#활동\", \"#이벤트\"]")
+        List<String> tags
+) {}
+

src/main/java/org/farmsystem/homepage/domain/news/dto/response/NewsDetailResponseDTO.java

@@ -1,5 +1,47 @@
 package org.farmsystem.homepage.domain.news.dto.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.farmsystem.homepage.domain.news.entity.News;
+
+import java.time.LocalDateTime;
 import java.util.List;
 
-public record NewsDetailResponseDTO(Long newsId, String title, String thumbnailUrl, String content, List<String> imageUrls) { }
+@Schema(description = "소식 상세 응답 DTO")
+public record NewsDetailResponseDTO(
+        @Schema(description = "소식 ID", example = "1")
+        Long newsId,
+
+        @Schema(description = "소식 제목", example = "5월 활동 요약")
+        String title,
+
+        @Schema(description = "썸네일 이미지 URL", example = "https://s3-bucket/thumbnail.jpg")
+        String thumbnailUrl,
+
+        @Schema(description = "소식 본문", example = "이번 달 팜시스템은 다양한 활동을 진행했습니다...윤석이가 개발을 하는데...")
+        String content,
+
+        @Schema(description = "본문 이미지 URL 목록", example = "[\"https://s3/image1.jpg\", \"https://s3/image2.jpg\"]")
+        List<String> imageUrls,
+
+        @Schema(description = "태그 목록", example = "[\"#공지\", \"#활동\"]")
+        List<String> tags,
+
+        @Schema(description = "작성일", example = "2025-05-18T12:34:56")
+        LocalDateTime createdAt,
+
+        @Schema(description = "수정일", example = "2025-05-18T12:35:56")
+        LocalDateTime updatedAt
+) {
+    public static NewsDetailResponseDTO fromEntity(News news) {
+        return new NewsDetailResponseDTO(
+                news.getNewsId(),
+                news.getTitle(),
+                news.getThumbnailUrl(),
+                news.getContent(),
+                news.getImageUrls(),
+                news.getTags(),
+                news.getCreatedAt(),
+                news.getUpdatedAt()
+        );
+    }
+}

src/main/java/org/farmsystem/homepage/domain/news/dto/response/NewsListResponseDTO.java

@@ -1,3 +1,48 @@
 package org.farmsystem.homepage.domain.news.dto.response;
 
-public record NewsListResponseDTO(Long newsId, String title, String thumbnailUrl) { }
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.farmsystem.homepage.domain.news.entity.News;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "소식 목록 응답 DTO")
+public record NewsListResponseDTO(
+        @Schema(description = "소식 ID", example = "1")
+        Long newsId,
+
+        @Schema(description = "소식 제목", example = "5월 활동 요약")
+        String title,
+
+        @Schema(description = "썸네일 이미지 URL", example = "https://s3-bucket/thumbnail.jpg")
+        String thumbnailUrl,
+
+        @Schema(description = "본문 미리보기", example = "이번 달 팜시스템 활동은... (최대 50자)")
+        String contentPreview,
+
+        @Schema(description = "태그 목록", example = "[\"#공지\", \"#이벤트\"]")
+        List<String> tags,
+
+        @Schema(description = "작성일", example = "2025-05-18T12:34:56")
+        LocalDateTime createdAt,
+
+        @Schema(description = "수정일", example = "2025-05-18T12:35:56")
+        LocalDateTime updatedAt
+) {
+    public static NewsListResponseDTO fromEntity(News news) {
+        return new NewsListResponseDTO(
+                news.getNewsId(),
+                news.getTitle(),
+                news.getThumbnailUrl(),
+                extractPreview(news.getContent()),
+                news.getTags(),
+                news.getCreatedAt(),
+                news.getUpdatedAt()
+        );
+    }
+
+    private static String extractPreview(String content) {
+        if (content == null) return "";
+        return content.length() <= 50 ? content : content.substring(0, 50) + "...";
+    }
+}

src/main/java/org/farmsystem/homepage/domain/news/entity/News.java

@@ -32,18 +32,26 @@ public class News extends BaseTimeEntity {
     @Column(name = "image_url")
     private List<String> imageUrls;
 
+    @ElementCollection
+    @CollectionTable(name = "news_tags", joinColumns = @JoinColumn(name = "news_id"))
+    @Column(name = "tag")
+    private List<String> tags;
+
     @Builder
-    public News(String title, String content, String thumbnailUrl, List<String> imageUrls) {
+    public News(String title, String content, String thumbnailUrl, List<String> imageUrls, List<String> tags) {
         this.title = title;
         this.content = content;
         this.thumbnailUrl = thumbnailUrl;
         this.imageUrls = imageUrls;
+        this.tags = tags;
     }
 
-    public void updateNews(String title, String content, String thumbnailUrl, List<String> imageUrls) {
+    public void updateNews(String title, String content, String thumbnailUrl, List<String> imageUrls, List<String> tags) {
         this.title = title;
         this.content = content;
         this.thumbnailUrl = thumbnailUrl;
         this.imageUrls = imageUrls;
+        this.tags = tags;
     }
+
 }

src/main/java/org/farmsystem/homepage/domain/news/service/NewsService.java

@@ -22,36 +22,42 @@ public class NewsService {
 
     public List<NewsListResponseDTO> getAllNews() {
         return newsRepository.findAll().stream()
-                .map(news -> new NewsListResponseDTO(news.getNewsId(), news.getTitle(), news.getThumbnailUrl()))
+                .map(NewsListResponseDTO::fromEntity)
                 .collect(Collectors.toList());
     }
 
     public NewsDetailResponseDTO getNewsById(Long newsId) {
         News news = newsRepository.findById(newsId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.NEWS_NOT_FOUND));
-        return new NewsDetailResponseDTO(news.getNewsId(), news.getTitle(), news.getThumbnailUrl(), news.getContent(), news.getImageUrls());
+        return NewsDetailResponseDTO.fromEntity(news);
     }
 
-    @Transactional
     public NewsDetailResponseDTO createNews(NewsRequestDTO request) {
-        News news = News.builder()
-                .title(request.title())
-                .content(request.content())
-                .thumbnailUrl(request.thumbnailUrl())
-                .imageUrls(request.imageUrls())
-                .build();
+        News news = new News(
+                request.title(),
+                request.content(),
+                request.thumbnailUrl(),
+                request.imageUrls(),
+                request.tags()
+        );
         newsRepository.save(news);
-        return new NewsDetailResponseDTO(news.getNewsId(), news.getTitle(), news.getThumbnailUrl(), news.getContent(), news.getImageUrls());
+        return NewsDetailResponseDTO.fromEntity(news);
     }
 
-    @Transactional
     public NewsDetailResponseDTO updateNews(Long newsId, NewsRequestDTO request) {
         News news = newsRepository.findById(newsId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.NEWS_NOT_FOUND));
-        news.updateNews(request.title(), request.content(), request.thumbnailUrl(), request.imageUrls());
-        return new NewsDetailResponseDTO(news.getNewsId(), news.getTitle(), news.getThumbnailUrl(), news.getContent(), news.getImageUrls());
+        news.updateNews(
+                request.title(),
+                request.content(),
+                request.thumbnailUrl(),
+                request.imageUrls(),
+                request.tags()
+        );
+        return NewsDetailResponseDTO.fromEntity(news);
     }
 
+
     @Transactional
     public void deleteNews(Long newsId) {
         if (!newsRepository.existsById(newsId)) {

src/main/java/org/farmsystem/homepage/domain/user/controller/AuthApi.java

@@ -12,6 +12,7 @@
 import org.farmsystem.homepage.domain.user.dto.request.UserTokenRequestDTO;
 import org.farmsystem.homepage.domain.user.dto.response.UserTokenResponseDTO;
 import org.farmsystem.homepage.global.common.SuccessResponse;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/org/farmsystem/homepage/domain/user/repository/DailySeedRepository.java

@@ -1,11 +1,14 @@
 package org.farmsystem.homepage.domain.user.repository;
 
+import jakarta.persistence.LockModeType;
 import org.farmsystem.homepage.domain.user.entity.DailySeed;
 import org.farmsystem.homepage.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
 
 import java.util.Optional;
 
 public interface DailySeedRepository extends JpaRepository<DailySeed, Long> {
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
     Optional<DailySeed> findByUser(User user);
 }

src/main/java/org/farmsystem/homepage/domain/user/service/DailySeedService.java

@@ -27,6 +27,7 @@ public class DailySeedService {
 
     private final DailySeedRepository dailySeedRepository;
     private final UserRepository userRepository;
+    private final SeedEventProducer seedEventProducer;
 
     //TODO : 적립 필요한 이벤트에 earnSeed 함수 호출 추가하기
     // 예 : dailySeedService.earnSeed(userId, SeedEventType.ATTENDANCE);
@@ -38,37 +39,46 @@ public void earnSeed(Long userId, SeedEventType eventType) {
         DailySeed dailySeed = dailySeedRepository.findByUser(user)
                 .orElseGet(() -> new DailySeed(user));
 
-        handleSeedEvent(dailySeed, eventType, user);
+        boolean success = handleSeedEvent(dailySeed, eventType, user);
 
         dailySeedRepository.save(dailySeed);
         userRepository.save(user);
+
+        // Kafka에 이벤트 전송 (중복 요청 시 메세지 전송 방지)
+        if (success) {
+            seedEventProducer.sendSeedEvent(userId, eventType);
+        }
     }
 
     // 중복 적립 방지
-    private void handleSeedEvent(DailySeed dailySeed, SeedEventType eventType, User user) {
+    private boolean handleSeedEvent(DailySeed dailySeed, SeedEventType eventType, User user) {
         switch (eventType) {
-            case ATTENDANCE:
-                // 중복 출석 방지
+            case ATTENDANCE: //중복 적립, 요청 불가
                 if (dailySeed.isAttendance()) {
                     throw new BusinessException(ALREADY_ATTENDANCE);
                 }
                 dailySeed.updateAttendance();
                 user.addTotalSeed(eventType.getSeedAmount());
-                break;
+                return true;
 
-            case CHEER:
-                if (dailySeed.isCheer()) return;
+            case CHEER: //중복 적립 불가, 요청은 가능
+                if (dailySeed.isCheer()) return false;
                 dailySeed.updateCheer();
                 user.addTotalSeed(eventType.getSeedAmount());
-                break;
+                return true;
+
             case FARMING_LOG:
-                if (dailySeed.isFarminglog()) return;
+                if (dailySeed.isFarminglog()) return false;
                 dailySeed.updateFarminglog();
                 user.addTotalSeed(eventType.getSeedAmount());
-                break;
+                return true;
+
+            default:
+                return false;
         }
     }
 
+    @Transactional
     public TodaySeedResponseDTO getTodaySeed(Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));