diff --git a/README.md b/README.md new file mode 100644 index 0000000..102688a --- /dev/null +++ b/README.md @@ -0,0 +1,73 @@ +# 뉴닉 클론 코딩 + + NewNeek + +최신 기사를 읽고, 뉴스레터를 구독해서 뉴스레터를 이메일로 받아볼 수 있는 사이트입니다. + +### 팀원 +#### Front-end ++ 이도영 ++ 손규리 ++ 김혜경 + +#### Back-end +| 팀원 | github | +|:---:|:---:| +|최서림|https://github.com/Bebeqwer| +|김민규|https://github.com/kmg159753| +|김정빈|https://github.com/000vin000| +|권능현|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) + + + +#### 개발기간 +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 + + 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..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); 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);