Merge pull request Clubber2024#818 from Clubber2024/refactor/Clubber2024#817-refactor-recruit-implement-분리

refactor : recruit Service 로직 implement 분리

Author: mjKim1229

src/main/java/com/clubber/ClubberServer/domain/recruit/controller/adminRecruitController.java

@@ -29,8 +29,8 @@ public PageResponse<GetOneRecruitInListResponse> getAllAdminRecruits(@PageableDe
 
     @PostMapping("/admins/recruits")
     @Operation(summary = "동아리 계정 모집글 작성")
-    public PostRecruitResponse postRecruitsPage(@RequestBody @Valid PostRecruitRequest request){
-        return recruitService.postRecruitsPage(request);
+    public PostRecruitResponse createRecruit(@RequestBody @Valid PostRecruitRequest request){
+        return recruitService.createRecruit(request);
     }
 
     //관리자 권한으로 모집글 삭제

src/main/java/com/clubber/ClubberServer/domain/recruit/domain/Recruit.java

@@ -2,21 +2,19 @@
 
 import com.clubber.ClubberServer.domain.club.domain.Club;
 import com.clubber.ClubberServer.domain.common.BaseEntity;
-import com.clubber.ClubberServer.domain.recruit.dto.PostRecruitRequest;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -53,7 +51,7 @@ public class Recruit extends BaseEntity {
 
     private String everytimeUrl;
 
-    private Long totalView;
+    private Long totalView = 0L;
 
     private boolean isDeleted = false;
 
@@ -97,14 +95,4 @@ private Recruit(Long id, LocalDateTime startAt, LocalDateTime endAt, Semester se
         this.club = club;
         this.recruitImages = recruitImages;
     }
-
-    public static Recruit of(Club club, PostRecruitRequest request) {
-        return Recruit.builder()
-                .title(request.getTitle())
-                .content(request.getContent())
-                .everytimeUrl(request.getEverytimeUrl())
-                .totalView(0L)
-                .club(club)
-                .build();
-    }
 }

src/main/java/com/clubber/ClubberServer/domain/recruit/domain/RecruitImage.java

@@ -29,7 +29,7 @@ public class RecruitImage extends BaseEntity {
     private boolean isDeleted=false;
 
     @Builder
-    private RecruitImage(Long id, ImageVO imageUrl,Recruit recruit){
+    private RecruitImage(Long id, ImageVO imageUrl,Recruit recruit, Long orderNum) {
         this.id=id;
         this.imageUrl=imageUrl;
         this.recruit=recruit;
@@ -42,7 +42,15 @@ public static RecruitImage of(ImageVO imageUrl,Recruit recruit){
                 .build();
     }
 
-    public void updateStatus(){this.isDeleted=true;}
+    public static RecruitImage of(ImageVO imageUrl,Recruit recruit, Long orderNum){
+        return RecruitImage.builder()
+                .imageUrl(imageUrl)
+                .recruit(recruit)
+                .orderNum(orderNum)
+                .build();
+    }
+
+    public void delete(){this.isDeleted=true;}
 
     public void updateOrderNum(Long orderNum){this.orderNum=orderNum;}
 

src/main/java/com/clubber/ClubberServer/domain/recruit/dto/PostRecruitRequest.java

@@ -1,5 +1,7 @@
 package com.clubber.ClubberServer.domain.recruit.dto;
 
+import com.clubber.ClubberServer.domain.club.domain.Club;
+import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import java.util.List;
@@ -27,4 +29,12 @@ public class PostRecruitRequest {
     @Schema(description = "모집글 이미지 목록", example = "[\"image1\",\"image2\"]")
     private List<String> imageKey;
 
+    public Recruit toEntity(Club club) {
+        return Recruit.builder()
+                .title(title)
+                .content(content)
+                .everytimeUrl(everytimeUrl)
+                .club(club)
+                .build();
+    }
 }

src/main/java/com/clubber/ClubberServer/domain/recruit/dto/recruitComment/PostRecruitCommentRequest.java

@@ -1,5 +1,8 @@
 package com.clubber.ClubberServer.domain.recruit.dto.recruitComment;
 
+import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
+import com.clubber.ClubberServer.domain.recruit.domain.RecruitComment;
+import com.clubber.ClubberServer.domain.user.domain.User;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -20,4 +23,12 @@ public class PostRecruitCommentRequest {
     @Schema(description = "부모 댓글 id", example = "1")
     private Long parentId;
 
+    public RecruitComment toEntity(Recruit recruit, User user, RecruitComment parentComment) {
+        return RecruitComment.builder()
+                .content(content)
+                .recruit(recruit)
+                .user(user)
+                .parentComment(parentComment)
+                .build();
+    }
 }

src/main/java/com/clubber/ClubberServer/domain/recruit/implement/RecruitAppender.java

@@ -0,0 +1,23 @@
+package com.clubber.ClubberServer.domain.recruit.implement;
+
+import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
+import com.clubber.ClubberServer.domain.recruit.repository.RecruitRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class RecruitAppender {
+    private final RecruitRepository recruitRepository;
+    public void delete(Recruit recruit) {
+        recruit.delete();
+    }
+
+    public void increaseTotalView(Recruit recruit) {
+        recruit.increaseTotalview();
+    }
+
+    public Recruit append(Recruit recruit) {
+        return recruitRepository.save(recruit);
+    }
+}

src/main/java/com/clubber/ClubberServer/domain/recruit/implement/RecruitCommentAppender.java

@@ -18,7 +18,7 @@ public class RecruitCommentAppender {
 
     public RecruitComment append(PostRecruitCommentRequest request, Recruit recruit, User user) {
         RecruitComment parentComment = recruitCommentReader.findParentComment(request.getParentId());
-        RecruitComment newComment = RecruitComment.of(recruit, user, request.getContent(), parentComment);
+        RecruitComment newComment = request.toEntity(recruit, user, parentComment);
         return recruitCommentRepository.save(newComment);
     }
 

src/main/java/com/clubber/ClubberServer/domain/recruit/implement/RecruitImageAppender.java

@@ -0,0 +1,36 @@
+package com.clubber.ClubberServer.domain.recruit.implement;
+
+import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
+import com.clubber.ClubberServer.domain.recruit.domain.RecruitImage;
+import com.clubber.ClubberServer.domain.recruit.repository.RecruitImageRepository;
+import com.clubber.ClubberServer.global.vo.image.ImageVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Component
+@RequiredArgsConstructor
+public class RecruitImageAppender {
+
+    private final RecruitImageRepository recruitImageRepository;
+
+    public void deleteRecruitImages(List<RecruitImage> recruitImages) {
+        recruitImages.stream()
+                .filter(recruitImage -> !recruitImage.isDeleted())
+                .forEach(RecruitImage::delete);
+    }
+
+    public List<RecruitImage> appendRecruitImages(List<String> imageKeys, Recruit recruit) {
+        AtomicLong order = new AtomicLong(1L);
+
+        return imageKeys.stream()
+                .map(imageUrl -> {
+                    ImageVO imageVO = ImageVO.valueOf(imageUrl);
+                    RecruitImage recruitImage = RecruitImage.of(imageVO, recruit, order.getAndIncrement());
+                    return recruitImageRepository.save(recruitImage);
+                })
+                .toList();
+    }
+}

src/main/java/com/clubber/ClubberServer/domain/recruit/implement/RecruitReader.java

@@ -1,12 +1,17 @@
 package com.clubber.ClubberServer.domain.recruit.implement;
 
+import com.clubber.ClubberServer.domain.club.domain.Club;
 import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
 import com.clubber.ClubberServer.domain.recruit.exception.RecruitNotFoundException;
 import com.clubber.ClubberServer.domain.recruit.repository.RecruitRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Component
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -18,4 +23,21 @@ public Recruit findRecruitById(Long id) {
         return recruitRepository.queryRecruitsById(id)
                 .orElseThrow(() -> RecruitNotFoundException.EXCEPTION);
     }
+
+    public Page<Recruit> findRecruitPagesByClub(Club club, Pageable pageable) {
+        return recruitRepository.queryRecruitsByClub(club, pageable);
+    }
+
+    public List<Recruit> findTop5Recruits() {
+        List<Recruit> recruits = recruitRepository.queryTop5Recruits();
+
+        if (recruits.isEmpty()) {
+            throw RecruitNotFoundException.EXCEPTION;
+        }
+        return recruits;
+    }
+
+    public Page<Recruit> findAllRecruits(Pageable pageable) {
+        return recruitRepository.queryAllRecruits(pageable);
+    }
 }

src/main/java/com/clubber/ClubberServer/domain/recruit/implement/RecruitValidator.java

@@ -1,7 +1,10 @@
 package com.clubber.ClubberServer.domain.recruit.implement;
 
+import com.clubber.ClubberServer.domain.admin.domain.Admin;
+import com.clubber.ClubberServer.domain.recruit.domain.Recruit;
 import com.clubber.ClubberServer.domain.recruit.domain.RecruitComment;
 import com.clubber.ClubberServer.domain.recruit.exception.RecruitCommentUserUnauthorizedException;
+import com.clubber.ClubberServer.domain.recruit.exception.RecruitDeleteUnauthorizedException;
 import com.clubber.ClubberServer.domain.user.domain.User;
 import org.springframework.stereotype.Component;
 
@@ -13,4 +16,10 @@ public void validateCommentUser(RecruitComment recruitComment, User currentUser)
             throw RecruitCommentUserUnauthorizedException.EXCEPTION;
         }
     }
+
+    public void validateRecruitClub(Recruit recruit, Admin admin) {
+        if (recruit.getClub() != admin.getClub()) {
+            throw RecruitDeleteUnauthorizedException.EXCEPTION;
+        }
+    }
 }