Merge remote-tracking branch 'origin/main'

Author: ssosee

.github/workflows/build.yml

@@ -54,7 +54,7 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build and Test with Gradle
-        run: ./gradlew bootJar -Pprofile=dev
+        run: ./gradlew bootJar -Pprofile=dev --info
 
 
 

build.gradle

@@ -89,6 +89,9 @@ dependencies {
     implementation 'org.opensearch.client:spring-data-opensearch:1.3.0'
     implementation 'org.opensearch.client:opensearch-java:2.9.1'
 
+    // mybatis
+    implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.4'
+
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'

src/docs/asciidoc/api/mypage/comment-get.adoc

@@ -0,0 +1,37 @@
+[[Comment-Get]]
+== 내가 썼어요 댓글/답글 조회 API(GET: /devdevdev/api/v1/mypage/comments)
+
+* 회원이 작성한 댓글/답글을 조회한다.
+* 최초 요청시 pickCommentId, techCommentId 는 가장 큰 숫자 값을 요청해야 합니다.
+
+=== 정상 요청/응답
+
+==== HTTP Request
+
+include::{snippets}/mypage-comments/http-request.adoc[]
+
+==== HTTP Request Header Fields
+
+include::{snippets}/mypage-comments/request-headers.adoc[]
+
+==== HTTP Request Query Parameters Fields
+
+include::{snippets}/mypage-comments/query-parameters.adoc[]
+
+==== HTTP Response
+
+include::{snippets}/mypage-comments/http-response.adoc[]
+
+==== HTTP Response Fields
+
+include::{snippets}/mypage-comments/response-fields.adoc[]
+
+=== 예외
+
+==== HTTP Response
+
+* `익명 회원은 사용할 수 없는 기능 입니다.`: 익명 회원인 경우
+* `회원을 찾을 수 없습니다.`: 회원이 존재하지 않는 경우
+* `유효하지 않은 회원 입니다.`: 회원이 유효하지 않은 경우
+
+include::{snippets}/mypage-comments-member-exception/response-body.adoc[]

src/docs/asciidoc/api/mypage/mypage.adoc

@@ -5,3 +5,4 @@ include::mypick-main.adoc[]
 include::exit-member.adoc[]
 include::exit-survey.adoc[]
 include::record-exit-survey.adoc[]
+include::comment-get.adoc[]

src/docs/asciidoc/api/tech-article/recommend.adoc

@@ -0,0 +1,22 @@
+[[TechArticleRecommend]]
+== 기술블로그 추천 API(POST: /devdevdev/api/v1/articles/{techArticleId}/recommend)
+* 회원과 익명회원은 기술블로그를 추천하거나 추천 취소할 수 있다.
+
+=== 정상 요청/응답
+==== HTTP Request
+include::{snippets}/tech-article-recommend/http-request.adoc[]
+==== HTTP Request Header Fields
+include::{snippets}/tech-article-recommend/request-headers.adoc[]
+==== HTTP Request Path Parameters Fields
+include::{snippets}/tech-article-recommend/path-parameters.adoc[]
+
+==== HTTP Response
+include::{snippets}/tech-article-recommend/http-response.adoc[]
+==== HTTP Response Fields
+include::{snippets}/tech-article-recommend/response-fields.adoc[]
+
+
+=== 예외
+==== HTTP Response
+include::{snippets}/not-found-tech-article-exception/response-body.adoc[]
+include::{snippets}/not-found-member-exception/response-body.adoc[]

src/docs/asciidoc/api/tech-article/tech-article.adoc

@@ -4,3 +4,4 @@ include::main.adoc[]
 include::detail.adoc[]
 include::bookmark.adoc[]
 include::keyword.adoc[]
+include::recommend.adoc[]

src/main/java/com/dreamypatisiel/devdevdev/LocalInitData.java

@@ -23,7 +23,7 @@
 import com.dreamypatisiel.devdevdev.domain.entity.enums.WordType;
 import com.dreamypatisiel.devdevdev.domain.policy.PickPopularScorePolicy;
 import com.dreamypatisiel.devdevdev.domain.repository.BlameTypeRepository;
-import com.dreamypatisiel.devdevdev.domain.repository.BookmarkRepository;
+import com.dreamypatisiel.devdevdev.domain.repository.techArticle.BookmarkRepository;
 import com.dreamypatisiel.devdevdev.domain.repository.CompanyRepository;
 import com.dreamypatisiel.devdevdev.domain.repository.member.MemberRepository;
 import com.dreamypatisiel.devdevdev.domain.repository.member.memberNicknameDictionary.MemberNicknameDictionaryRepository;

src/main/java/com/dreamypatisiel/devdevdev/domain/entity/Pick.java

@@ -88,7 +88,7 @@ public class Pick extends BasicTime {
     private List<String> embeddings;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id")
+    @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
     @OneToMany(mappedBy = "pick")
@@ -125,12 +125,13 @@ public static Pick create(Title title, String author, Member member) {
         pick.popularScore = Count.defaultCount();
         pick.blameTotalCount = Count.defaultCount();
         pick.author = author;
-        pick.contentStatus = getDefaultContentStatusByMemberRole(member);
+        pick.contentStatus = ContentStatus.APPROVAL;
         pick.member = member;
 
         return pick;
     }
 
+    @Deprecated // 신고 기능 추가로 인한 삭제
     private static ContentStatus getDefaultContentStatusByMemberRole(Member member) {
         if (member.isAdmin()) {
             return ContentStatus.APPROVAL;

src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticle.java

@@ -1,6 +1,7 @@
 package com.dreamypatisiel.devdevdev.domain.entity;
 
 import com.dreamypatisiel.devdevdev.domain.entity.embedded.Count;
+import com.dreamypatisiel.devdevdev.domain.entity.embedded.Title;
 import com.dreamypatisiel.devdevdev.domain.entity.embedded.Url;
 import com.dreamypatisiel.devdevdev.domain.policy.TechArticlePopularScorePolicy;
 import com.dreamypatisiel.devdevdev.elastic.domain.document.ElasticTechArticle;
@@ -35,6 +36,8 @@ public class TechArticle extends BasicTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    private Title title;
+
     @Embedded
     @AttributeOverride(name = "count",
             column = @Column(name = "view_total_count")
@@ -75,9 +78,14 @@ public class TechArticle extends BasicTime {
     @OneToMany(mappedBy = "techArticle")
     private List<Bookmark> bookmarks = new ArrayList<>();
 
+    @OneToMany(mappedBy = "techArticle")
+    private List<TechArticleRecommend> recommends = new ArrayList<>();
+
     @Builder
-    private TechArticle(Count viewTotalCount, Count recommendTotalCount, Count commentTotalCount, Count popularScore,
+    private TechArticle(Title title, Count viewTotalCount, Count recommendTotalCount, Count commentTotalCount,
+                        Count popularScore,
                         Url techArticleUrl, Company company, String elasticId) {
+        this.title = title;
         this.techArticleUrl = techArticleUrl;
         this.viewTotalCount = viewTotalCount;
         this.recommendTotalCount = recommendTotalCount;
@@ -89,6 +97,7 @@ private TechArticle(Count viewTotalCount, Count recommendTotalCount, Count comme
 
     public static TechArticle createTechArticle(ElasticTechArticle elasticTechArticle, Company company) {
         TechArticle techArticle = TechArticle.builder()
+                .title(new Title(elasticTechArticle.getTitle()))
                 .techArticleUrl(new Url(elasticTechArticle.getTechArticleUrl()))
                 .viewTotalCount(new Count(elasticTechArticle.getViewTotalCount()))
                 .recommendTotalCount(new Count(elasticTechArticle.getRecommendTotalCount()))
@@ -102,10 +111,11 @@ public static TechArticle createTechArticle(ElasticTechArticle elasticTechArticl
         return techArticle;
     }
 
-    public static TechArticle createTechArticle(Url techArticleUrl, Count viewTotalCount, Count recommendTotalCount,
-                                                Count commentTotalCount,
-                                                Count popularScore, String elasticId, Company company) {
+    public static TechArticle createTechArticle(Title title, Url techArticleUrl, Count viewTotalCount,
+                                                Count recommendTotalCount, Count commentTotalCount, Count popularScore,
+                                                String elasticId, Company company) {
         return TechArticle.builder()
+                .title(title)
                 .techArticleUrl(techArticleUrl)
                 .viewTotalCount(viewTotalCount)
                 .recommendTotalCount(recommendTotalCount)
@@ -127,6 +137,10 @@ public void changePopularScore(TechArticlePopularScorePolicy policy) {
         this.popularScore = this.calculatePopularScore(policy);
     }
 
+    private Count calculatePopularScore(TechArticlePopularScorePolicy policy) {
+        return policy.calculatePopularScore(this);
+    }
+
     public void changeCompany(Company company) {
         company.getTechArticles().add(this);
         this.company = company;
@@ -136,15 +150,20 @@ public void incrementViewTotalCount() {
         this.viewTotalCount = Count.plusOne(this.viewTotalCount);
     }
 
-    private Count calculatePopularScore(TechArticlePopularScorePolicy policy) {
-        return policy.calculatePopularScore(this);
-    }
-
     public void incrementCommentCount() {
         this.commentTotalCount = Count.plusOne(this.commentTotalCount);
     }
 
     public void decrementCommentCount() {
         this.commentTotalCount = Count.minusOne(this.commentTotalCount);
     }
+
+
+    public void incrementRecommendTotalCount() {
+        this.recommendTotalCount = Count.plusOne(this.recommendTotalCount);
+    }
+
+    public void decrementRecommendTotalCount() {
+        this.recommendTotalCount = Count.minusOne(this.recommendTotalCount);
+    }
 }

src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticleRecommend.java

@@ -1,27 +1,81 @@
 package com.dreamypatisiel.devdevdev.domain.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@Getter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class TechArticleRecommend extends BasicTime {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(nullable = false)
+    private boolean status;
+
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id", nullable = false)
+    @JoinColumn(name = "member_id")
     private Member member;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "anonymous_member_id")
+    private AnonymousMember anonymousMember;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "tech_article_id", nullable = false)
     private TechArticle techArticle;
+
+    @Builder
+    private TechArticleRecommend(boolean status, Member member, AnonymousMember anonymousMember, TechArticle techArticle) {
+        this.status = status;
+        this.member = member;
+        this.anonymousMember = anonymousMember;
+        this.techArticle = techArticle;
+    }
+
+
+    public static TechArticleRecommend create(Member member, TechArticle techArticle) {
+        return TechArticleRecommend.builder()
+                .member(member)
+                .techArticle(techArticle)
+                .status(true)
+                .build();
+    }
+
+    public static TechArticleRecommend create(AnonymousMember anonymousMember, TechArticle techArticle) {
+        return TechArticleRecommend.builder()
+                .anonymousMember(anonymousMember)
+                .techArticle(techArticle)
+                .status(true)
+                .build();
+    }
+
+    public void changeTechArticle(TechArticle techArticle) {
+        this.techArticle = techArticle;
+        techArticle.getRecommends().add(this);
+    }
+
+    public void cancelRecommend() {
+        this.status = false;
+    }
+
+    public void registerRecommend() {
+        this.status = true;
+    }
+
+    public boolean isRecommended() {
+        return this.status;
+    }
+
+    public boolean isAnonymousMemberNotNull() {
+        return this.anonymousMember != null;
+    }
+    public boolean isMemberNotNull() {
+        return this.member != null;
+    }
+
 }