Merge: Main Merge 36차

src/main/java/com/codez4/meetfolio/domain/admin/dto/DatasetResponse.java

@@ -5,14 +5,15 @@
 import com.codez4.meetfolio.domain.model.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.domain.Page;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 public class DatasetResponse {
 
     @Schema(description = "관리자 - 학습 데이터 리스트 응답 DTO")

src/main/java/com/codez4/meetfolio/domain/admin/service/AdminCommandService.java

@@ -4,7 +4,6 @@
 import com.codez4.meetfolio.domain.admin.dto.DatasetResponse;
 import com.codez4.meetfolio.domain.admin.dto.ModelResponse;
 import com.codez4.meetfolio.domain.dataset.repository.DatasetRepository;
-import com.codez4.meetfolio.domain.enums.Status;
 import com.codez4.meetfolio.domain.model.Model;
 import com.codez4.meetfolio.domain.model.repository.ModelRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/com/codez4/meetfolio/domain/analysis/service/AnalysisQueryService.java

@@ -4,7 +4,6 @@
 import com.codez4.meetfolio.domain.analysis.dto.AnalysisResponse;
 import com.codez4.meetfolio.domain.analysis.dto.AnalysisResponse.AnalysisInfo;
 import com.codez4.meetfolio.domain.analysis.repository.AnalysisRepository;
-import java.util.Optional;
 import com.codez4.meetfolio.global.exception.ApiException;
 import com.codez4.meetfolio.global.response.code.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;

src/main/java/com/codez4/meetfolio/domain/board/dto/BoardQueryItem.java

@@ -5,6 +5,7 @@
 import com.codez4.meetfolio.domain.board.GroupBoard;
 import com.codez4.meetfolio.domain.enums.GroupCategory;
 import com.codez4.meetfolio.domain.enums.JobKeyword;
+import com.codez4.meetfolio.domain.enums.ProfileEmoji;
 import com.codez4.meetfolio.domain.enums.Status;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -21,6 +22,8 @@ public class BoardQueryItem {
 
     private String email;
 
+    private String profile;
+
     private String title;
 
     private String content;
@@ -41,31 +44,24 @@ public class BoardQueryItem {
 
     private LocalDateTime createdAt;
 
-    public BoardQueryItem(Board board, String email, Status status) {
+    public BoardQueryItem(Board board, String email, ProfileEmoji profile, Status status) {
+        this.id = board.getId();
+        this.email = email;
+        this.profile = profile.name();
+        this.title = board.getTitle();
+        this.content = board.getContent();
+        this.likeCount = board.getLikeCount();
+        this.status = status == null ? Status.INACTIVE : status ;
+        this.commentCount = board.getCommentCount();
+        this.createdAt = board.getCreatedAt();
         if (board instanceof EmploymentBoard employmentBoard){
-            this.id = employmentBoard.getId();
-            this.email = email;
-            this.title = employmentBoard.getTitle();
-            this.content = employmentBoard.getContent();
-            this.likeCount = employmentBoard.getLikeCount();
-            this.status = status == null ? Status.INACTIVE : status ;
-            this.commentCount = employmentBoard.getCommentCount();
             this.jobKeyword = employmentBoard.getJobKeyword();
-            this.createdAt = employmentBoard.getCreatedAt();
             this.groupCategory = null;
             this.peopleNumber = null;
             this.recruitment = null;
         }
         else if (board instanceof GroupBoard groupBoard){
-            this.id = groupBoard.getId();
-            this.email = email;
-            this.title = groupBoard.getTitle();
-            this.content = groupBoard.getContent();
-            this.likeCount = groupBoard.getLikeCount();
-            this.status = status == null ? Status.INACTIVE : Status.ACTIVE ;
-            this.commentCount = board.getCommentCount();
             this.jobKeyword = null;
-            this.createdAt = groupBoard.getCreatedAt();
             this.groupCategory = groupBoard.getGroupCategory();
             this.peopleNumber = groupBoard.getPeopleNumber();
             this.recruitment = groupBoard.getRecruitment();

src/main/java/com/codez4/meetfolio/domain/board/dto/BoardResponse.java

@@ -183,6 +183,7 @@ public static class BoardProc {
     public static BoardItem toBoardItem(BoardQueryItem board) {
         BoardItemBuilder boardItemBuilder = BoardItem.builder()
                 .memberName(board.getEmail().split("@")[0])
+                .profile(board.getProfile())
                 .boardId(board.getId())
                 .title(board.getTitle())
                 .content(board.getContent())

src/main/java/com/codez4/meetfolio/domain/board/repository/BoardRepository.java

@@ -16,7 +16,7 @@ public interface BoardRepository extends JpaRepository<Board, Long> {
     Page<Board> queryFindBoardsByKeyword(String keyword, Pageable pageable);
 
     @Query(value = "SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(b, b.member.email, (SELECT l.status from Like l WHERE l.member = :member AND l.board = b)) FROM Board b WHERE b.member = :member")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(b, b.member.email, b.member.profile, (SELECT l.status from Like l WHERE l.member = :member AND l.board = b)) FROM Board b WHERE b.member = :member")
     Page<BoardQueryItem> queryFindAllMyBoards(Member member, Pageable pageable);
 
 }

src/main/java/com/codez4/meetfolio/domain/board/repository/EmploymentBoardRepository.java

@@ -12,18 +12,18 @@
 public interface EmploymentBoardRepository extends JpaRepository<EmploymentBoard, Long> {
 
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email,(SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.id = :boardId AND eb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, eb.member.profile, (SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.id = :boardId AND eb.member.status = 'ACTIVE'")
     BoardQueryItem queryFindEmploymentBoard(Member member,Long boardId);
 
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email,(SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, eb.member.profile, (SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindAllEmploymentBoards(Member member, Pageable pageable);
 
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, (SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.jobKeyword = :jobKeyword AND eb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, eb.member.profile, (SELECT l.status FROM Like l WHERE l.member = :member AND eb = l.board)) FROM EmploymentBoard eb WHERE eb.jobKeyword = :jobKeyword AND eb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindAllEmploymentBoardsByJobKeyword(Member member, JobKeyword jobKeyword, Pageable pageable);
 
     @Query(value = "SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, (SELECT l.status from Like l WHERE l.member = :member AND l.board = eb)) FROM EmploymentBoard eb WHERE eb.title LIKE CONCAT('%', :keyword , '%') AND eb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(eb, eb.member.email, eb.member.profile, (SELECT l.status from Like l WHERE l.member = :member AND l.board = eb)) FROM EmploymentBoard eb WHERE eb.title LIKE CONCAT('%', :keyword , '%') AND eb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindBoardsByKeyword(Member member, String keyword, Pageable pageable);
 }

src/main/java/com/codez4/meetfolio/domain/board/repository/GroupBoardRepository.java

@@ -11,18 +11,18 @@
 
 public interface GroupBoardRepository extends JpaRepository<GroupBoard, Long> {
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email,(SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.id = :boardId AND gb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, gb.member.profile, (SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.id = :boardId AND gb.member.status = 'ACTIVE'")
     BoardQueryItem queryFindBoard(Member member, Long boardId);
 
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email,(SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, gb.member.profile,(SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindAllBoards(Member member, Pageable pageable);
 
     @Query("SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, (SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.groupCategory = :groupCategory AND gb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, gb.member.profile,(SELECT l.status FROM Like l WHERE l.member = :member AND gb = l.board)) FROM GroupBoard gb WHERE gb.groupCategory = :groupCategory AND gb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindAllBoardsByGroupCategory(Member member, GroupCategory groupCategory, Pageable pageable);
 
     @Query(value = "SELECT " +
-            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, (SELECT l.status from Like l WHERE l.member = :member AND l.board = gb)) FROM GroupBoard gb WHERE gb.title LIKE CONCAT('%', :keyword , '%') AND gb.member.status = 'ACTIVE'")
+            "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(gb, gb.member.email, gb.member.profile, (SELECT l.status from Like l WHERE l.member = :member AND l.board = gb)) FROM GroupBoard gb WHERE gb.title LIKE CONCAT('%', :keyword , '%') AND gb.member.status = 'ACTIVE'")
     Page<BoardQueryItem> queryFindBoardsByKeyword(Member member, String keyword, Pageable pageable);
 }

src/main/java/com/codez4/meetfolio/domain/comment/dto/CommentResponse.java

@@ -15,9 +15,7 @@
 import org.springframework.data.domain.Slice;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class CommentResponse {
 

src/main/java/com/codez4/meetfolio/domain/comment/service/CommentCommandService.java

@@ -1,16 +1,13 @@
 package com.codez4.meetfolio.domain.comment.service;
 
 import com.codez4.meetfolio.domain.board.Board;
-import com.codez4.meetfolio.domain.board.repository.BoardRepository;
 import com.codez4.meetfolio.domain.board.service.BoardQueryService;
 import com.codez4.meetfolio.domain.comment.Comment;
 import com.codez4.meetfolio.domain.comment.dto.CommentResponse;
 import com.codez4.meetfolio.domain.comment.dto.CommentResponse.CommentProc;
 import com.codez4.meetfolio.domain.comment.dto.CommentVO;
 import com.codez4.meetfolio.domain.comment.repository.CommentRepository;
 import com.codez4.meetfolio.domain.member.Member;
-import com.codez4.meetfolio.global.exception.ApiException;
-import com.codez4.meetfolio.global.response.code.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,18 +24,17 @@ public class CommentCommandService {
     public CommentProc write(CommentVO commentVO) {
 
         Comment comment = commentRepository.save(createComment(commentVO));
-        comment.getBoard().changeComment(true);
-
+        Board board = boardQueryService.findById(commentVO.boardId());
+        board.changeComment(true);
         return CommentResponse.toCommentProc(comment.getId());
     }
 
     private Comment createComment(CommentVO commentVO) {
 
         Member member = commentVO.member();
-        Board board = boardQueryService.findById(commentVO.boardId());
-        board.changeComment(true);
         String content = commentVO.content();
         Long parentId = commentVO.parentId();
+        Board board = boardQueryService.findById(commentVO.boardId());
 
         if (parentId != null) {
             Comment parentComment = getParentComment(parentId);

src/main/java/com/codez4/meetfolio/domain/coverLetter/dto/CoverLetterRequest.java

@@ -1,7 +1,6 @@
 package com.codez4.meetfolio.domain.coverLetter.dto;
 
 import com.codez4.meetfolio.domain.coverLetter.CoverLetter;
-import com.codez4.meetfolio.domain.enums.JobKeyword;
 import com.codez4.meetfolio.domain.enums.ShareType;
 import com.codez4.meetfolio.domain.member.Member;
 import com.codez4.meetfolio.global.annotation.EnumValid;

src/main/java/com/codez4/meetfolio/domain/enums/PointType.java

@@ -8,6 +8,7 @@
 @RequiredArgsConstructor
 public enum PointType {
     USE_COVER_LETTER("자소서 조회"),
+    SHARE_COVER_LETTER("자소서 공유"),
     USE_AI_ANALYSIS("AI 직무 역량 분석"),
     CHARGE("충전");
     private final String description;

src/main/java/com/codez4/meetfolio/domain/feedback/service/FeedbackCommandService.java

@@ -1,9 +1,6 @@
 package com.codez4.meetfolio.domain.feedback.service;
 
-import com.codez4.meetfolio.domain.analysis.Analysis;
 import com.codez4.meetfolio.domain.feedback.Feedback;
-import com.codez4.meetfolio.global.exception.ApiException;
-import com.codez4.meetfolio.global.response.code.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/codez4/meetfolio/domain/feedback/service/FeedbackQueryService.java

@@ -8,7 +8,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.Optional;
+
 import static com.codez4.meetfolio.global.response.code.status.ErrorStatus._FEEDBACK_NOT_FOUND;
 
 @Service

src/main/java/com/codez4/meetfolio/domain/like/repository/LikeRepository.java

@@ -19,7 +19,7 @@ public interface LikeRepository extends JpaRepository<Like, Long> {
     void deleteByMember(Member member);
 
     @Query("SELECT " +
-        "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(lb, lb.member.email, l.status) FROM Like l JOIN fetch Board lb ON l.board = lb  WHERE l.member = :member AND l.status = :status")
+        "NEW com.codez4.meetfolio.domain.board.dto.BoardQueryItem(lb, lb.member.email, lb.member.profile, l.status) FROM Like l JOIN fetch Board lb ON l.board = lb  WHERE l.member = :member AND l.status = :status")
     Page<BoardQueryItem> findAllByMemberAndStatus(@Param("member") Member member,
                                                   @Param("status") Status status, PageRequest pageRequest);
 

src/main/java/com/codez4/meetfolio/domain/member/dto/MemberResponse.java

@@ -1,7 +1,6 @@
 package com.codez4.meetfolio.domain.member.dto;
 
 import com.codez4.meetfolio.domain.enums.Authority;
-import com.codez4.meetfolio.domain.enums.Status;
 import com.codez4.meetfolio.domain.member.Member;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,7 +15,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 
 public class MemberResponse {
 

src/main/java/com/codez4/meetfolio/domain/payment/service/PaymentCommandService.java

@@ -11,8 +11,6 @@
 import com.codez4.meetfolio.domain.payment.repository.PaymentRepository;
 import com.codez4.meetfolio.domain.point.dto.PointRequest;
 import com.codez4.meetfolio.domain.point.repository.PointRepository;
-import com.codez4.meetfolio.global.exception.ApiException;
-import com.codez4.meetfolio.global.response.code.status.ErrorStatus;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/codez4/meetfolio/domain/payment/service/PaymentQueryService.java

@@ -18,7 +18,8 @@
 
 import java.util.List;
 
-import static com.codez4.meetfolio.domain.payment.dto.PaymentResponse.*;
+import static com.codez4.meetfolio.domain.payment.dto.PaymentResponse.toPaymentItem;
+import static com.codez4.meetfolio.domain.payment.dto.PaymentResponse.toPaymentResult;
 
 @Service
 @AllArgsConstructor

src/main/java/com/codez4/meetfolio/domain/point/Point.java

@@ -37,7 +37,7 @@ public class Point extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private PointType pointType;
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "coverletter_id", nullable = true)
     private CoverLetter coverLetter;
 }

src/main/java/com/codez4/meetfolio/domain/point/dto/PointRequest.java

@@ -12,9 +12,10 @@
 import lombok.Getter;
 
 public class PointRequest {
+
     @Schema(description = "포인트 사용 요청 dto")
     @Getter
-    public static class PointUseRequest{
+    public static class PointUseRequest {
 
         @Schema(description = "포인트 사용 타입, USE_COVER_LETTER/USE_AI_ANALYSIS")
         @EnumValid(enumClass = PointType.class)
@@ -31,7 +32,8 @@ public static class PointUseRequest{
     @Getter
     @AllArgsConstructor
     @Builder
-    public static class Post{
+    public static class Post {
+
         int point;
         PointType pointType;
         int totalPoint;
@@ -40,7 +42,7 @@ public static class Post{
         CoverLetter coverLetter;
     }
 
-    public static Point toEntity(Post post){
+    public static Point toEntity(Post post) {
         return Point.builder()
                 .point(post.getPoint())
                 .pointType(post.getPointType())
@@ -50,4 +52,16 @@ public static Point toEntity(Post post){
                 .coverLetter(post.coverLetter)
                 .build();
     }
+
+    public static Point toSharePoint(int point, PointType pointType, int totalPoint, Member member,
+            CoverLetter coverLetter) {
+
+        return Point.builder()
+                .point(point)
+                .pointType(pointType)
+                .totalPoint(totalPoint)
+                .member(member)
+                .coverLetter(coverLetter)
+                .build();
+    }
 }

src/main/java/com/codez4/meetfolio/domain/point/repository/PointRepository.java

@@ -16,6 +16,7 @@ public interface PointRepository extends JpaRepository<Point, Long> {
 
     Page<Point> findByMemberAndPointType(Member member, PointType pointType, Pageable pageable);
 
+    @Query("SELECT p FROM Point p WHERE p.member = :member AND p.pointType <> 'CHARGE'")
     Page<Point> getPointByMember(Member member, Pageable pageable);
 
     Optional<Point> getPointByPayment(Payment payment);

src/main/java/com/codez4/meetfolio/domain/point/service/PointCommandService.java

@@ -1,5 +1,11 @@
 package com.codez4.meetfolio.domain.point.service;
 
+import static com.codez4.meetfolio.domain.point.dto.PointRequest.toEntity;
+import static com.codez4.meetfolio.domain.point.dto.PointRequest.toSharePoint;
+import static com.codez4.meetfolio.domain.point.dto.PointResponse.toPointProc;
+
+import com.codez4.meetfolio.domain.coverLetter.CoverLetter;
+import com.codez4.meetfolio.domain.enums.PointType;
 import com.codez4.meetfolio.domain.member.Member;
 import com.codez4.meetfolio.domain.point.Point;
 import com.codez4.meetfolio.domain.point.dto.PointRequest;
@@ -9,9 +15,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.codez4.meetfolio.domain.point.dto.PointRequest.toEntity;
-import static com.codez4.meetfolio.domain.point.dto.PointResponse.toPointProc;
-
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -30,8 +33,25 @@ public Point post(PointRequest.Post post) {
     public PointResponse.PointProc usePoint(PointRequest.Post post, Member member) {
         Point point = post(post);
         member.setPoint(post.getTotalPoint());
+
+        if (post.getPointType() == PointType.USE_COVER_LETTER) {
+            shareCoverLetter(post);
+        }
         return toPointProc(point);
     }
 
+    public void shareCoverLetter(PointRequest.Post post) {
+
+        CoverLetter coverLetter = post.getCoverLetter();
+        Member owner = coverLetter.getMember();
+        PointType pointType = PointType.SHARE_COVER_LETTER;
+        int point = 100;
+        int totalPoint = owner.getPoint() + point;
+
+        Point sharePoint = toSharePoint(point, pointType, totalPoint, owner, coverLetter);
+        save(sharePoint);
+        owner.setPoint(totalPoint);
+    }
+
 
 }