Merge pull request ChwitKey#116 from Cherrypickk/feature/27-article-attention-check

feat: 스크랩 기사 조회 api 기능구현 & 기사 상세조회 isScrapped, isLiked 필드 추가

Author: dangnak2

src/main/java/com/example/cherrypickserver/article/application/ArticleService.java

@@ -2,17 +2,19 @@
 
 import com.example.cherrypickserver.article.dto.request.CreateArticleReq;
 import com.example.cherrypickserver.article.dto.response.DetailArticleRes;
+import com.example.cherrypickserver.article.dto.response.ScrapArticleRes;
 import com.example.cherrypickserver.article.dto.response.SearchArticleRes;
 import com.example.cherrypickserver.article.dto.response.ShareArticleRes;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.text.ParseException;
+import java.util.List;
 
 
 public interface ArticleService {
 
-  DetailArticleRes detailArticle(Long articleIdx);
+  DetailArticleRes detailArticle(Long memberId, Long articleIdx);
 
   Page<SearchArticleRes> searchArticle(String cond, String sortType, Pageable pageable);
 
@@ -23,4 +25,6 @@ public interface ArticleService {
   Page<SearchArticleRes> searchArticleByKeyword(Long memberId, String keyword, String sortType, Pageable pageable);
 
   Page<SearchArticleRes> searchArticleByIndustry(Long memberId, String industry, String sortType, Pageable pageable);
+
+  List<ScrapArticleRes> getScrapArticle(Long memberId);
 }

src/main/java/com/example/cherrypickserver/article/application/ArticleServiceImpl.java

@@ -2,8 +2,8 @@
 
 import com.example.cherrypickserver.article.domain.*;
 import com.example.cherrypickserver.article.dto.assembler.ArticleAssembler;
-import com.example.cherrypickserver.article.dto.request.CreateArticleReq;
 import com.example.cherrypickserver.article.dto.response.DetailArticleRes;
+import com.example.cherrypickserver.article.dto.response.ScrapArticleRes;
 import com.example.cherrypickserver.article.dto.response.SearchArticleRes;
 import com.example.cherrypickserver.article.exception.AlreadyAttendArticleException;
 import com.example.cherrypickserver.article.exception.ArticleAttentionNotFoundException;
@@ -18,7 +18,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -32,9 +34,11 @@ public class ArticleServiceImpl implements ArticleService {
   private final ArticleAssembler articleAssembler;
 
   @Override
-  public DetailArticleRes detailArticle(Long articleId) {
+  public DetailArticleRes detailArticle(Long memberId, Long articleId) {
+    Member member = memberRepository.findByIdAndIsEnable(memberId, true).orElseThrow(MemberNotFoundException::new);
     Article article = articleRepository.findByIdAndIsEnable(articleId, true).orElseThrow(ArticleNotFoundException::new);
-    return DetailArticleRes.toDto(article, articleAssembler.calUploadedAt(article.getUploadedAt()));
+    List<ArticleAttention> attentionCheck = articleAttentionRepository.findByArticleAndMemberAndIsEnable(article, member, true);
+    return DetailArticleRes.toDto(article, attentionCheck, articleAssembler.calUploadedAt(article.getUploadedAt()));
   }
 
   @Override
@@ -87,4 +91,16 @@ public Page<SearchArticleRes> searchArticleByIndustry(Long memberId, String indu
     Page<Article> articles = articleRepository.findByIndustryOrTitleContainingOrContentsContainingAndIsEnable(Industry.fromValue(industry), industry, industry, true, pageable);
     return articles.map(m -> SearchArticleRes.toDto(m, articleAssembler.calUploadedAt(m.getUploadedAt())));
   }
+
+  @Override
+  public List<ScrapArticleRes> getScrapArticle(Long memberId) {
+    Member member = memberRepository.findByIdAndIsEnable(memberId, true).orElseThrow(MemberNotFoundException::new);
+    List<ArticleAttention> articleAttentions = articleAttentionRepository.findByMemberAndIsEnable(member, true);
+
+    List<Article> scrappedArticles = new ArrayList<>();
+    for (ArticleAttention articleAttention : articleAttentions) {
+      articleRepository.findByIdAndIsEnable(articleAttention.getArticle().getId(), true).ifPresent(scrappedArticles::add);
+    }
+    return  scrappedArticles.stream().map(m -> ScrapArticleRes.toDto(m, articleAssembler.calUploadedAt(m.getUploadedAt()))).collect(Collectors.toList());
+  }
 }

src/main/java/com/example/cherrypickserver/article/domain/ArticleAttentionRepository.java

@@ -1,9 +1,15 @@
 package com.example.cherrypickserver.article.domain;
 
+import com.example.cherrypickserver.member.domain.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface ArticleAttentionRepository extends JpaRepository<ArticleAttention, Long> {
   Optional<ArticleAttention> findByArticleIdAndMemberIdAndAttentionTypeAndIsEnable(Long articleId, Long memberId, AttentionType type, Boolean isEnable);
+
+  List<ArticleAttention> findByArticleAndMemberAndIsEnable(Article article, Member member, Boolean isEnable);
+
+  List<ArticleAttention> findByMemberAndIsEnable(Member member, Boolean isEnable);
 }

src/main/java/com/example/cherrypickserver/article/dto/response/DetailArticleRes.java

@@ -1,6 +1,8 @@
 package com.example.cherrypickserver.article.dto.response;
 
 import com.example.cherrypickserver.article.domain.Article;
+import com.example.cherrypickserver.article.domain.ArticleAttention;
+import com.example.cherrypickserver.article.domain.AttentionType;
 import lombok.Builder;
 import lombok.Data;
 
@@ -21,9 +23,11 @@ public class DetailArticleRes {
   private String reporter;
   private String industry;
   private String url;
+  private Boolean isLiked;
+  private Boolean isScrapped;
   private List<DetailArticlePhotoRes> articlePhoto;
 
-  public static DetailArticleRes toDto(Article article, String uploadedAt) {
+  public static DetailArticleRes toDto(Article article, List<ArticleAttention> articleAttentions, String uploadedAt) {
     return DetailArticleRes.builder()
             .articleId(article.getId())
             .title(article.getTitle())
@@ -33,7 +37,21 @@ public static DetailArticleRes toDto(Article article, String uploadedAt) {
             .reporter(article.getReporter())
             .industry(article.getIndustry().getValueGpt())
             .url(article.getUrl())
+            .isLiked(checkAttention(articleAttentions, AttentionType.LIKE))
+            .isScrapped(checkAttention(articleAttentions, AttentionType.SCRAP))
             .articlePhoto(article.getArticlePhoto().stream().map(DetailArticlePhotoRes::toDto).collect(Collectors.toList()))
             .build();
   }
+
+  private static Boolean checkAttention(List<ArticleAttention> articleAttentions, AttentionType like) {
+    if (articleAttentions.size() != 0) {
+      for (ArticleAttention articleAttention : articleAttentions) {
+        if (articleAttention.getAttentionType().equals(like)) {
+          return true;
+        }
+      }
+    }
+    return false;
+
+  }
 }

src/main/java/com/example/cherrypickserver/article/dto/response/ScrapArticleRes.java

@@ -0,0 +1,25 @@
+package com.example.cherrypickserver.article.dto.response;
+
+import com.example.cherrypickserver.article.domain.Article;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ScrapArticleRes {
+  private Long articleId;
+  private String title;
+  private String publisher;
+  private String uploadedAt;
+  private String thumbnailUrl;
+
+  public static ScrapArticleRes toDto(Article article, String uploadedAt) {
+    return ScrapArticleRes.builder()
+            .articleId(article.getId())
+            .title(article.getTitle())
+            .publisher(article.getPublisher())
+            .uploadedAt(uploadedAt)
+            .thumbnailUrl(article.getArticlePhoto().get(0).getArticleImgUrl())
+            .build();
+  }
+}

src/main/java/com/example/cherrypickserver/article/presentation/ArticleController.java

@@ -1,8 +1,8 @@
 package com.example.cherrypickserver.article.presentation;
 
 import com.example.cherrypickserver.article.application.ArticleService;
-import com.example.cherrypickserver.article.dto.request.CreateArticleReq;
 import com.example.cherrypickserver.article.dto.response.DetailArticleRes;
+import com.example.cherrypickserver.article.dto.response.ScrapArticleRes;
 import com.example.cherrypickserver.article.dto.response.SearchArticleRes;
 import com.example.cherrypickserver.global.dto.ResponseCustom;
 import com.example.cherrypickserver.global.resolver.Auth;
@@ -18,7 +18,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
+import java.util.List;
 
 @Tag(name = "Article Controller", description = "기사 관련 컨트롤러")
 @RequestMapping("/api/articles")
@@ -34,10 +34,15 @@ public class ArticleController {
           @ApiResponse(responseCode = "200", description = "기사 상세조회 성공"),
           @ApiResponse(responseCode = "404", description = "존재하지 않는 기사"),
   })
+  @Auth
   @ResponseBody
   @GetMapping("/detail/{articleId}")
-  public ResponseCustom<DetailArticleRes> detailArticle(@Parameter(description = "기사 id") @PathVariable Long articleId) {
-    return ResponseCustom.OK(articleService.detailArticle(articleId));
+  public ResponseCustom<DetailArticleRes> detailArticle(
+          @Parameter(description = "멤버 id") @IsLogin LoginStatus loginStatus,
+          @Parameter(description = "기사 id") @PathVariable Long articleId
+  )
+  {
+    return ResponseCustom.OK(articleService.detailArticle(loginStatus.getMemberId(), articleId));
   }
 
   //  // 기사 검색 (커맨드 + 정렬)
@@ -131,4 +136,19 @@ public ResponseCustom<Void> unAttendArticle(
     articleService.unAttendArticle(articleId, loginStatus.getMemberId(), type);
     return ResponseCustom.OK();
   }
+
+  // 스크랩 기사 조회
+  @Operation(summary = "스크랩 기사 조회", description = "스크랩한 기사를 조회합니다.")
+  @ApiResponses({
+          @ApiResponse(responseCode = "200", description = "스크랩 기사 조회 성공"),
+  })
+  @Auth
+  @ResponseBody
+  @GetMapping("/scrap")
+  public ResponseCustom<List<ScrapArticleRes>> getScrapArticle(
+          @Parameter(description = "멤버 id") @IsLogin LoginStatus loginStatus
+  )
+  {
+    return ResponseCustom.OK(articleService.getScrapArticle(loginStatus.getMemberId()));
+  }
 }