From e21b15946f3f0cd806065f05ca9f705be6b0a67e Mon Sep 17 00:00:00 2001 From: NHclub Date: Wed, 26 Jul 2023 14:46:32 +0900 Subject: [PATCH 01/10] Update Scheduler.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 오탈자 수정 --- src/main/java/com/example/newnique/global/Scheduler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/newnique/global/Scheduler.java b/src/main/java/com/example/newnique/global/Scheduler.java index 29ef599..cf8bf78 100644 --- a/src/main/java/com/example/newnique/global/Scheduler.java +++ b/src/main/java/com/example/newnique/global/Scheduler.java @@ -53,7 +53,7 @@ public void updateNews() throws InterruptedException { // 원하는 뉴스 사이트의 URL을 지정 String url = "https://www.sedaily.com/"; - List mainCategories = Arrays.asList("증권", "부동산", "경제 · 금융", "산업","정치","사회","국제","오피니언","문화 · 스포츠","서경");g + List mainCategories = Arrays.asList("증권", "부동산", "경제 · 금융", "산업","정치","사회","국제","오피니언","문화 · 스포츠","서경"); Document doc = Jsoup.connect(url).get(); @@ -285,4 +285,4 @@ public int countOccurrences(String text, String word) { } return count; } -} \ No newline at end of file +} From 111d1d00e9d94816d350096b618c2d34691689eb Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:17:18 +0900 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=EA=B2=80=EC=83=89=EB=90=9C=20?= =?UTF-8?q?=EB=89=B4=EC=8A=A4=20=EA=B0=9C=EC=88=98=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=98=A4=ED=83=88=EC=9E=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 테스트를 통해 완벽히 확인후 강제 푸시 진행 --- .../java/com/example/newnique/news/service/NewsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/newnique/news/service/NewsService.java b/src/main/java/com/example/newnique/news/service/NewsService.java index 2d85c99..077d5b7 100644 --- a/src/main/java/com/example/newnique/news/service/NewsService.java +++ b/src/main/java/com/example/newnique/news/service/NewsService.java @@ -106,7 +106,7 @@ public Map SearchNews(String keyword, int page, Map response = new HashMap<>(); List newsResponseDtoList = newsListByCategory.stream().map(NewsResponseDto::new).collect(Collectors.toList()); - int totalNewsCount = newsRepository.countSearchNewsByKeyWordNativeVer("+"+keyword); + int totalNewsCount = newsRepository.countSearchNewsByKeyWordNativeVer("+"+keyword+"*"); int totalPages = (int) Math.ceil((double) totalNewsCount / size); response.put("totalPages", totalPages); @@ -155,4 +155,4 @@ public NewsHeartResponseDto getNewsHeart(Long newsId, String userEmail) { return new NewsHeartResponseDto(news.getHeartCount()); } -} \ No newline at end of file +} From d8ae29b26a1a3f03bd963cc368dfe896c99fb8ab Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:04:00 +0900 Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=EA=B8=B0=EC=A4=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/newnique/news/service/NewsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/newnique/news/service/NewsService.java b/src/main/java/com/example/newnique/news/service/NewsService.java index 077d5b7..79345a1 100644 --- a/src/main/java/com/example/newnique/news/service/NewsService.java +++ b/src/main/java/com/example/newnique/news/service/NewsService.java @@ -39,7 +39,7 @@ public Map getNews(int page, int size, // 페이징 처리 Sort.Direction direction = isAsc ? Sort.Direction.ASC : Sort.Direction.DESC; - Sort sort = Sort.by(direction, sortBy); + Sort sort = Sort.by(direction, sortBy,"title"); Pageable pageable = PageRequest.of(page, size, sort); Page newsList = newsRepository.findAll(pageable); @@ -70,7 +70,7 @@ public Map getNewsByCategory(String category, int page, int size // 페이징 처리 Sort.Direction direction = isAsc ? Sort.Direction.ASC : Sort.Direction.DESC; - Sort sort = Sort.by(direction, sortBy); + Sort sort = Sort.by(direction, sortBy,"title"); Pageable pageable = PageRequest.of(page, size, sort); Page newsListByCategory = newsRepository.findAllByCategory(category, pageable); From bb5e68e82a28b2eeb920043399fcac6c071c02c5 Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:01:33 +0900 Subject: [PATCH 04/10] =?UTF-8?q?reafactor:=20=ED=81=AC=EB=A1=A4=EB=A7=81?= =?UTF-8?q?=20=EC=A0=84=EC=97=90=20=EC=98=A4=EB=8A=98=20=EB=89=B4=EC=8A=A4?= =?UTF-8?q?=20=EA=B8=B0=EC=82=AC=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20shffle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/newnique/global/Scheduler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/newnique/global/Scheduler.java b/src/main/java/com/example/newnique/global/Scheduler.java index cf8bf78..339f076 100644 --- a/src/main/java/com/example/newnique/global/Scheduler.java +++ b/src/main/java/com/example/newnique/global/Scheduler.java @@ -40,10 +40,10 @@ public String getLink() { } } -// @PostConstruct -// public void init() throws InterruptedException { -// updateNews(); // 프로그램 시작 시에 한 번 실행(테스트 용도) -// } + @PostConstruct + public void init() throws InterruptedException { + updateNews(); // 프로그램 시작 시에 한 번 실행(테스트 용도) + } @Scheduled(cron = "0 0 3 * * ?") public void updateNews() throws InterruptedException { @@ -130,6 +130,7 @@ public void updateNews() throws InterruptedException { } } + Collections.shuffle(todaysNewsLinkList); //오늘 올라온 기사 상세정보 저장 for(Category newsDetailsLinkPair : todaysNewsLinkList){ From c886fc9598b566d66a7cd0f203f37c34a890818b Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:04:48 +0900 Subject: [PATCH 05/10] =?UTF-8?q?fix:=20PostConstruct=20import=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/newnique/global/Scheduler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/newnique/global/Scheduler.java b/src/main/java/com/example/newnique/global/Scheduler.java index 339f076..fab695e 100644 --- a/src/main/java/com/example/newnique/global/Scheduler.java +++ b/src/main/java/com/example/newnique/global/Scheduler.java @@ -2,6 +2,7 @@ import com.example.newnique.news.entity.News; import com.example.newnique.news.repository.NewsRepository; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; From 746b645733e8e878a4c62cd04f9c7bcf0c080298 Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:11:50 +0900 Subject: [PATCH 06/10] =?UTF-8?q?style:=20=EC=A3=BC=EC=84=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/newnique/global/Scheduler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/newnique/global/Scheduler.java b/src/main/java/com/example/newnique/global/Scheduler.java index fab695e..da3d446 100644 --- a/src/main/java/com/example/newnique/global/Scheduler.java +++ b/src/main/java/com/example/newnique/global/Scheduler.java @@ -41,10 +41,10 @@ public String getLink() { } } - @PostConstruct - public void init() throws InterruptedException { - updateNews(); // 프로그램 시작 시에 한 번 실행(테스트 용도) - } + // @PostConstruct + // public void init() throws InterruptedException { + // updateNews(); // 프로그램 시작 시에 한 번 실행(테스트 용도) + // } @Scheduled(cron = "0 0 3 * * ?") public void updateNews() throws InterruptedException { From a563c5913594729e9cadbbb6de06281579b99d6e Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:20:33 +0900 Subject: [PATCH 07/10] =?UTF-8?q?update:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/newnique/auth/filter/JwtAuthenticationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java index 29e2a96..35a5809 100644 --- a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java @@ -64,7 +64,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR response.setCharacterEncoding("UTF-8"); // JSON 응답 생성 - String json = "{\"msg\": \"로그인이 완료 되었습니다.\"}"; + String json = "{\"msg\": \"로그인이 완료 되었습니다.\",\"emoji\": \"%s\",emoji}"; // JSON 응답 전송 PrintWriter writer = response.getWriter(); From 7f877a35734c90162d8057330ccd2088876b7002 Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:29:06 +0900 Subject: [PATCH 08/10] =?UTF-8?q?update:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/newnique/auth/filter/JwtAuthenticationFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java index 35a5809..631d644 100644 --- a/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/newnique/auth/filter/JwtAuthenticationFilter.java @@ -63,8 +63,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setCharacterEncoding("UTF-8"); - // JSON 응답 생성 - String json = "{\"msg\": \"로그인이 완료 되었습니다.\",\"emoji\": \"%s\",emoji}"; + String json = String.format("{\"msg\": \"로그인이 완료 되었습니다.\",\"emoji\": \"%s\"}",emoji); // JSON 응답 전송 PrintWriter writer = response.getWriter(); From d59be88407911cc099c888767b17e65e47e3175d Mon Sep 17 00:00:00 2001 From: Yejin Date: Thu, 27 Jul 2023 00:15:57 +0900 Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=EC=A2=8B=EC=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newnique/news/dto/NewsHeartResponseDto.java | 11 ++++++++--- .../example/newnique/news/service/NewsService.java | 7 ++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java b/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java index 6bbabab..4ed429b 100644 --- a/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java +++ b/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java @@ -1,12 +1,17 @@ package com.example.newnique.news.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; @Getter public class NewsHeartResponseDto { - private int NewsHeart; + @JsonProperty("newsHeart") + private int newsHeart; + @JsonProperty("isNewsHeart") + private boolean isNewsHeart; - public NewsHeartResponseDto(int heartCount) { - this.NewsHeart = heartCount; + public NewsHeartResponseDto(int heartCount, boolean isNewsHeart) { + this.newsHeart = heartCount; + this.isNewsHeart = isNewsHeart; } } diff --git a/src/main/java/com/example/newnique/news/service/NewsService.java b/src/main/java/com/example/newnique/news/service/NewsService.java index 79345a1..b109f18 100644 --- a/src/main/java/com/example/newnique/news/service/NewsService.java +++ b/src/main/java/com/example/newnique/news/service/NewsService.java @@ -144,15 +144,20 @@ public NewsHeartResponseDto getNewsHeart(Long newsId, String userEmail) { ); NewsHeart existHeart = newsHeartRepository.findByHeartUserAndHeartNews(loginUser, news); + boolean isNewsHeart; if (existHeart == null) { NewsHeart newsHeart = new NewsHeart(loginUser, news); news.increaseHeartCount(); newsHeartRepository.save(newsHeart); + isNewsHeart = true; } else { news.decreaseHeartCount(); newsHeartRepository.delete(existHeart); + isNewsHeart = false; } - return new NewsHeartResponseDto(news.getHeartCount()); + + return new NewsHeartResponseDto(news.getHeartCount(), isNewsHeart); } + } From 742d261d24b63c8f9d3e7fa5ad2e64304f6c1539 Mon Sep 17 00:00:00 2001 From: Yejin Date: Thu, 27 Jul 2023 11:43:34 +0900 Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=EC=A2=8B=EC=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20(=EB=B3=80=EC=88=98=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/newnique/news/dto/NewsHeartResponseDto.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java b/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java index 4ed429b..e6634c5 100644 --- a/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java +++ b/src/main/java/com/example/newnique/news/dto/NewsHeartResponseDto.java @@ -5,10 +5,9 @@ @Getter public class NewsHeartResponseDto { - @JsonProperty("newsHeart") + private int newsHeart; - @JsonProperty("isNewsHeart") - private boolean isNewsHeart; + private Boolean isNewsHeart ; public NewsHeartResponseDto(int heartCount, boolean isNewsHeart) { this.newsHeart = heartCount;