From c176a7764e8ee75fd4d7e5ab1299c71c9664d46a Mon Sep 17 00:00:00 2001 From: bikooju Date: Sun, 12 Jan 2025 05:57:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B8=8D=EC=A0=95=EB=B6=80=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springboot/web/dto/response/NewsResponseDTO.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/banban/springboot/web/dto/response/NewsResponseDTO.java b/src/main/java/banban/springboot/web/dto/response/NewsResponseDTO.java index d8847d0..e4105f7 100644 --- a/src/main/java/banban/springboot/web/dto/response/NewsResponseDTO.java +++ b/src/main/java/banban/springboot/web/dto/response/NewsResponseDTO.java @@ -1,6 +1,7 @@ package banban.springboot.web.dto.response; import banban.springboot.domain.entity.News; +import banban.springboot.domain.enums.NewsCategories; import lombok.*; import org.springframework.web.multipart.MultipartFile; @@ -22,6 +23,7 @@ public static class NewsCreateResponseDTO { private LocalDateTime createdAt; //private List images; private boolean isBreakingNews; + private NewsCategories newsCategories; public static NewsCreateResponseDTO from(News news) { return NewsCreateResponseDTO.builder() @@ -30,6 +32,7 @@ public static NewsCreateResponseDTO from(News news) { .content(news.getContent()) .isBreakingNews(news.isBreakingNews()) .createdAt(news.getCreatedAt()) + .newsCategories(news.getNewsCategories()) .build(); } } @@ -46,6 +49,7 @@ public static class NewsTodayResponseDTO { private boolean isBreakingNews; private int likes; private LocalDateTime createdAt; + private NewsCategories newsCategories; public static NewsTodayResponseDTO from(News news) { return NewsTodayResponseDTO.builder() @@ -55,6 +59,7 @@ public static NewsTodayResponseDTO from(News news) { .isBreakingNews(news.isBreakingNews()) .likes(news.getLikes()) .createdAt(news.getCreatedAt()) + .newsCategories(news.getNewsCategories()) .build(); } } @@ -71,6 +76,7 @@ public static class NewsYesterdayResponseDTO { private boolean isBreakingNews; private int likes; private LocalDateTime createdAt; + private NewsCategories newsCategories; public static NewsYesterdayResponseDTO from(News news) { return NewsYesterdayResponseDTO.builder() @@ -79,6 +85,7 @@ public static NewsYesterdayResponseDTO from(News news) { .content(news.getContent()) .isBreakingNews(news.isBreakingNews()) .likes(news.getLikes()) + .newsCategories(news.getNewsCategories()) .createdAt(news.getCreatedAt()) .build(); } @@ -94,6 +101,7 @@ public static class NewsReadResponseDTO { private String headline; private String content; private String username; + private NewsCategories newsCategories; private boolean isBreakingNews; public static NewsReadResponseDTO from(News news) { @@ -103,6 +111,7 @@ public static NewsReadResponseDTO from(News news) { .content(news.getContent()) .username(news.getMember().getUsername()) .isBreakingNews(news.isBreakingNews()) + .newsCategories(news.getNewsCategories()) .build(); } } From 5bb98caf5fba0451ba17722c1c7217cd27a51893 Mon Sep 17 00:00:00 2001 From: bikooju Date: Sun, 12 Jan 2025 06:41:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B5=9C=EC=A2=85=EC=A0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/banban/springboot/service/NewsService.java | 2 +- .../java/banban/springboot/web/dto/request/NewsRequestDTO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/banban/springboot/service/NewsService.java b/src/main/java/banban/springboot/service/NewsService.java index b433dc9..c3f2ef4 100644 --- a/src/main/java/banban/springboot/service/NewsService.java +++ b/src/main/java/banban/springboot/service/NewsService.java @@ -61,8 +61,8 @@ public NewsResponseDTO.NewsCreateResponseDTO createNews(String groupKey, Long me .isBreakingNews(newsRequestDTO.isBreakingNews()) .likes(0) .newsCategories(newsRequestDTO.getNewsCategories()) - .createdAt(newsRequestDTO.getCreatedAt()) .thumbnail_URL(pictureUrl) + .createdAt(getCurrentTime()) .build(); news = newsRepository.save(news); diff --git a/src/main/java/banban/springboot/web/dto/request/NewsRequestDTO.java b/src/main/java/banban/springboot/web/dto/request/NewsRequestDTO.java index 11ef1a6..7e0dc32 100644 --- a/src/main/java/banban/springboot/web/dto/request/NewsRequestDTO.java +++ b/src/main/java/banban/springboot/web/dto/request/NewsRequestDTO.java @@ -31,5 +31,5 @@ public class NewsRequestDTO { @NotNull(message = "긍정인지 부정인지 작성해주세요") private NewsCategories newsCategories; - private LocalDateTime createdAt = LocalDateTime.now(); +// private LocalDateTime createdAt = LocalDateTime.now(); }