From 8de38855a95542405e1a8347fcca90008fd084b3 Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:02:31 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b109f18..a6028dd 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); From 1abd290ca2e2af4b729922881a8b14afaced19bd Mon Sep 17 00:00:00 2001 From: KIM MIN GYU <84438772+kmg159753@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:05:41 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=EC=84=B8=EB=AF=B8=EC=BD=9C=EB=A1=A0?= =?UTF-8?q?=20=EC=98=A4=ED=83=88=EC=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/newnique/news/service/NewsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a6028dd..7a4ad94 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); From 1445f6b6b55261e36db03e302f156fcc13335ca5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-LOH5O20\\rehit" Date: Thu, 27 Jul 2023 14:49:27 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20email=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newnique/newsletter/service/SubscriptionService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/newnique/newsletter/service/SubscriptionService.java b/src/main/java/com/example/newnique/newsletter/service/SubscriptionService.java index f61955b..bcd7ca5 100644 --- a/src/main/java/com/example/newnique/newsletter/service/SubscriptionService.java +++ b/src/main/java/com/example/newnique/newsletter/service/SubscriptionService.java @@ -1,5 +1,7 @@ package com.example.newnique.newsletter.service; +import com.example.newnique.news.entity.News; +import com.example.newnique.news.repository.NewsRepository; import com.example.newnique.newsletter.dto.Maildto; import com.example.newnique.newsletter.dto.SubscriptionRequestDto; import com.example.newnique.newsletter.entity.Subscription; @@ -14,13 +16,15 @@ public class SubscriptionService { private final SubscriptionRepository subscriptionRepository; + private final NewsRepository newsRepository; private final EmailSender emailSender; public Subscription createSub(SubscriptionRequestDto subscriptionRequestDto) throws MessagingException { Subscription subscription = new Subscription(subscriptionRequestDto); Subscription saveSubscription = subscriptionRepository.save(subscription); + News news = newsRepository.findTopByOrderByIdDesc(); Maildto maildto = Maildto.builder().title(subscriptionRequestDto.getNickName()+"님 환영합니다") - .message("뉴닉을 구독해주신걸 환영합니다 !") + .message("뉴닉을 구독해주신걸 환영합니다 !\n\n\n"+news.getTitle() + "\n\n\n"+news.getNewsSummary()) .toAddress(subscriptionRequestDto.getEmail()).build(); emailSender.sendMail(maildto); From 637c2926baa9c9c1fd89edf942bef29dfe194524 Mon Sep 17 00:00:00 2001 From: CountryGirl <65941341+dpwls8364@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:24:14 +0900 Subject: [PATCH 4/6] Create README.md --- README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..445bb21 --- /dev/null +++ b/README.md @@ -0,0 +1,63 @@ +# 뉴닉 클론 코딩 + + NewNeek + +최신 기사를 읽고, 뉴스레터를 구독해서 뉴스레터를 이메일로 받아볼 수 있는 사이트입니다. + +### 팀원 +#### Front-end ++ 이도영 ++ 손규리 ++ 김혜경 + +#### Back-end ++ 최서림 ++ 김민규 ++ 김정빈 ++ 권능현 ++ 김예진 + +# 프로젝트 설명 +![image](https://github.com/Team3-NEWNEEK-Clone-Coding/BE/assets/65941341/37553f5c-5a0f-45c5-a13a-000d5836674e) + + + +#### 개발기간 +2023-07-21 ~ 2023-07-27 + + +### 프로젝트 기능 +1. 회원가입 / 로그인 +3. 뉴스 기사 크롤링 +4. 뉴스 검색 +5. 뉴스 카테고리 분류 +6. 뉴스 해시태그 +7. 뉴스 해시태그 검색 +8. 뉴스 기사에 좋아요 누르기 +9. 이메일로 뉴스레터 구독하기 +10. 뉴스레터 받기 + + +# 기술 스택 +### Front-end + Front-end + +
+ +### Back-end +#### Environment + + + +#### Development + + + +#### Distribution - CI / CD + + +---- + +### ERD + + From 48c535e3ab476aa72a87917d497a3f0b03506455 Mon Sep 17 00:00:00 2001 From: CountryGirl <65941341+dpwls8364@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:35:33 +0900 Subject: [PATCH 5/6] Update README.md --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 445bb21..c6d4fa9 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,14 @@ + 김혜경 #### Back-end -+ 최서림 -+ 김민규 -+ 김정빈 -+ 권능현 -+ 김예진 +| 팀원 | github | +|:---:|:---:| +|최서림|https://github.com/Bebeqwer| +|김민규|https://github.com/kmg159753| +|김정빈|https://github.com/000vin000| +|권능현|https://github.com/NHclub| +|김예진|https://github.com/dpwls8364| + # 프로젝트 설명 ![image](https://github.com/Team3-NEWNEEK-Clone-Coding/BE/assets/65941341/37553f5c-5a0f-45c5-a13a-000d5836674e) From a61ef4fe1216cb74d6d4de911b48edd52c3bc7ed Mon Sep 17 00:00:00 2001 From: CountryGirl <65941341+dpwls8364@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:41:37 +0900 Subject: [PATCH 6/6] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index c6d4fa9..102688a 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,13 @@ |권능현|https://github.com/NHclub| |김예진|https://github.com/dpwls8364| +### Communication + + Notion : NewNeek Clone Coding Team3 + + Notion : Back-end + +---- # 프로젝트 설명 ![image](https://github.com/Team3-NEWNEEK-Clone-Coding/BE/assets/65941341/37553f5c-5a0f-45c5-a13a-000d5836674e)