Merge branch 'develop'

src/main/java/the_monitor/application/service/ArticleService.java

@@ -16,4 +16,7 @@ public interface ArticleService {
     PageResponse<ArticleResponse> getArticlesByKeyword(CategoryType categoryType, Long keywordId, int page);
 
     Article findArticleById(Long articleId);
+
+    String readArticle(Long articleId);
+
 }

src/main/java/the_monitor/application/serviceImpl/ArticleServiceImpl.java

@@ -110,6 +110,17 @@ public PageResponse<ArticleResponse> getArticlesByKeyword(CategoryType categoryT
         return getArticleResponsePageResponse(articlePage);
     }
 
+    @Override
+    @Transactional
+    public String readArticle(Long articleId) {
+
+        Article article = findArticleById(articleId);
+        article.setReadStatus(true);
+
+        return "기사 읽기 변경";
+
+    }
+
     private PageResponse<ArticleResponse> getArticleResponsePageResponse(Page<Article> articlePage) {
         List<ArticleGoogleDto> articleDtos = articlePage.getContent().stream()
                 .map(article -> ArticleGoogleDto.builder()

src/main/java/the_monitor/application/serviceImpl/ReportServiceImpl.java

@@ -14,6 +14,7 @@
 import the_monitor.common.ErrorStatus;
 import the_monitor.domain.enums.CategoryType;
 import the_monitor.domain.model.*;
+import the_monitor.domain.repository.ArticleRepository;
 import the_monitor.domain.repository.ReportArticleRepository;
 import the_monitor.domain.repository.ReportCategoryRepository;
 import the_monitor.domain.repository.ReportRepository;
@@ -42,6 +43,7 @@ public class ReportServiceImpl implements ReportService {
     private final S3Service s3Service;
 
     private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private final ArticleRepository articleRepository;
 
     @Override
     public List<ReportListResponse> getReports() {
@@ -77,6 +79,8 @@ public ReportCreateResponse createReports(ReportCreateRequest request, Multipart
 
         unScrapArticles(request, clientId);
 
+        updateAdded(request);
+
         return ReportCreateResponse.builder()
                 .reportId(report.getId())
                 .build();
@@ -571,10 +575,7 @@ private void setReportArticleDefaultCategory(Report report, ReportArticle report
 
     private void unScrapArticles(ReportCreateRequest request, Long clientId) {
 
-        List<Long> articleIds = request.getReportCategoryTypeRequest().getReportCategorySelfRequests().stream()
-                .map(ReportCategoryRequest::getArticleId)
-                .flatMap(Collection::stream)
-                .toList();
+        List<Long> articleIds = getArticleIdsByReportCreateRequest(request);
 
         for (Long articleId : articleIds) {
             Article article = articleService.findArticleById(articleId);
@@ -591,4 +592,26 @@ private void unScrapArticles(ReportCreateRequest request, Long clientId) {
 
 
     }
+
+    private void updateAdded(ReportCreateRequest request) {
+
+        List<Long> articleIds = getArticleIdsByReportCreateRequest(request);
+
+        for (Long articleId : articleIds) {
+            Article article = articleService.findArticleById(articleId);
+            article.setAddedStatus(true);
+            articleRepository.save(article);
+        }
+
+    }
+
+    private List<Long> getArticleIdsByReportCreateRequest(ReportCreateRequest request) {
+
+        return request.getReportCategoryTypeRequest().getReportCategorySelfRequests().stream()
+                .map(ReportCategoryRequest::getArticleId)
+                .flatMap(Collection::stream)
+                .toList();
+
+    }
+
 }

src/main/java/the_monitor/domain/model/Article.java

@@ -77,7 +77,17 @@ public Article(String title,
         this.keyword = keyword;
 
     }
+
     public void setScrapStatus(boolean scrapped) {
         this.scrapped = scrapped;
     }
+
+    public void setAddedStatus(boolean added) {
+        this.added = added;
+    }
+
+    public void setReadStatus(boolean read) {
+        this.read = read;
+    }
+
 }

src/main/java/the_monitor/presentation/ArticleController.java

@@ -35,4 +35,11 @@ public ApiResponse<PageResponse<ArticleResponse>> getArticlesByKeyword(@RequestP
 
     }
 
+    @PatchMapping("/read")
+    public ApiResponse<String> readArticle(@RequestParam("articleId") Long articleId) {
+
+        return ApiResponse.onSuccess(articleService.readArticle(articleId));
+
+    }
+
 }