Deploy 1.3.13

src/main/java/com/example/spot/api/code/status/ErrorStatus.java

@@ -75,6 +75,8 @@ public enum ErrorStatus implements BaseErrorCode {
     _ONLY_STUDY_MEMBER_CAN_ACCESS_SCHEDULE(HttpStatus.FORBIDDEN, "STUDY4015", "스터디 멤버만 일정에 접근할 수 있습니다."),
     _ONLY_STUDY_MEMBER_CAN_ACCESS_MEMBERS(HttpStatus.FORBIDDEN, "STUDY4016", "스터디 멤버만 회원 목록에 접근할 수 있습니다."),
     _ALREADY_STUDY_MEMBER(HttpStatus.BAD_REQUEST, "STUDY4017", "이미 스터디 멤버입니다."),
+    _STUDY_OWNER_ONLY_CAN_TERMINATE(HttpStatus.BAD_REQUEST, "STUDY4018", "스터디장만 스터디를 종료할 수 있습니다."),
+    _STUDY_ALREADY_TERMINATED(HttpStatus.BAD_REQUEST, "STUDY4019", "이미 종료된 스터디입니다."),
 
     //스터디 게시글 관련 에러
     _STUDY_POST_NOT_FOUND(HttpStatus.NOT_FOUND, "POST4001", "스터디 게시글을 찾을 수 없습니다."),
@@ -90,7 +92,7 @@ public enum ErrorStatus implements BaseErrorCode {
     _STUDY_POST_COMMENT_ALREADY_DISLIKED(HttpStatus.BAD_REQUEST, "POST4011", "이미 싫어요 한 댓글입니다."),
     _STUDY_LIKED_COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "POST4012", "좋아요를 누르지 않은 게시글의 좋아요를 취소할 수 없습니다."),
     _STUDY_DISLIKED_COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "POST4013", "싫어요를 누르지 않은 게시글의 싫어요를 취소할 수 없습니다."),
-    _STUDY_POST_DELETION_INVALID(HttpStatus.FORBIDDEN, "POST4014", "게시글 작성자만 삭제 가능합니다."),
+    _STUDY_POST_DELETION_INVALID(HttpStatus.FORBIDDEN, "POST4014", "게시글 작성자 및 스터디장만 삭제 가능합니다."),
     _STUDY_POST_NULL(HttpStatus.BAD_REQUEST, "POST4015", "게시글 아이디가 입력되지 않았습니다."),
     _STUDY_POST_COMMENT_NULL(HttpStatus.BAD_REQUEST, "POST4016", "댓글 아이디가 입력되지 않았습니다."),
     _STUDY_POST_COMMENT_REACTIOM_ID_NULL(HttpStatus.BAD_REQUEST, "POST4017", "댓글 반응 아이디가 입력되지 않았습니다."),

src/main/java/com/example/spot/domain/mapping/StudyLikedComment.java

@@ -10,8 +10,10 @@
 
 @Entity
 @Getter
+@Builder
 @DynamicUpdate
 @DynamicInsert
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class StudyLikedComment extends BaseEntity {
 
@@ -31,13 +33,4 @@ public class StudyLikedComment extends BaseEntity {
     @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
-/* ----------------------------- 생성자 ------------------------------------- */
-
-    @Builder
-    public StudyLikedComment(StudyPostComment studyPostComment, Member member, Boolean isLiked) {
-        this.studyPostComment = studyPostComment;
-        this.member = member;
-        this.isLiked = isLiked;
-    }
-
 }

src/main/java/com/example/spot/domain/mapping/StudyLikedPost.java

@@ -16,8 +16,10 @@
 
 @Entity
 @Getter
+@Builder
 @DynamicUpdate
 @DynamicInsert
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class StudyLikedPost extends BaseEntity {
 
@@ -35,11 +37,4 @@ public class StudyLikedPost extends BaseEntity {
     @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
-/* ----------------------------- 생성자 ------------------------------------- */
-
-    @Builder
-    public StudyLikedPost(Member member, StudyPost studyPost) {
-        this.member = member;
-        this.studyPost = studyPost;
-    }
 }

src/main/java/com/example/spot/domain/study/Study.java

@@ -28,8 +28,8 @@
 
 @Entity
 @Getter
-@DynamicUpdate
-@DynamicInsert
+@Builder
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Study extends BaseEntity {
 
@@ -62,7 +62,7 @@ public class Study extends BaseEntity {
     @Column(nullable = false)
     private Boolean isOnline;
 
-    @Column(nullable = false, columnDefinition = "BIGINT DEFAULT 0")
+    @Column(nullable = false, columnDefinition = "INTEGER DEFAULT 0")
     private Integer heartCount;
 
     @Column(nullable = false)
@@ -85,72 +85,46 @@ public class Study extends BaseEntity {
     @Column(nullable = false)
     private Long maxPeople;
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<Schedule> schedules = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<StudyPost> posts = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<Vote> votes = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<StudyTheme> studyThemes = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<MemberStudy> memberStudies = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<RegionStudy> regionStudies = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<PreferredStudy> preferredStudies = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<StudyPost> studyPosts = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<ToDoList> toDoLists = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "study", cascade = CascadeType.ALL)
     private List<Notification> notifications = new ArrayList<>();
 
-
-/* ----------------------------- 생성자 ------------------------------------- */
-
-    @Builder
-    public Study(Gender gender, Integer minAge, Integer maxAge, Integer fee,
-                 String profileImage, boolean hasFee,
-                 Boolean isOnline, String goal, String introduction,
-                 String title, Long maxPeople) {
-        this.gender = gender;
-        this.minAge = minAge;
-        this.maxAge = maxAge;
-        this.fee = fee;
-        this.profileImage = profileImage;
-        this.studyState = StudyState.RECRUITING;
-        this.isOnline = isOnline;
-        this.heartCount = 0;
-        this.hasFee = hasFee;
-        this.goal = goal;
-        this.introduction = introduction;
-        this.title = title;
-        this.status = Status.ON;
-        this.hitNum = 0L;
-        this.maxPeople = maxPeople;
-        this.schedules = new ArrayList<>();
-        this.posts = new ArrayList<>();
-        this.votes = new ArrayList<>();
-        this.studyThemes = new ArrayList<>();
-        this.preferredStudies = new ArrayList<>();
-        this.memberStudies = new ArrayList<>();
-        this.regionStudies = new ArrayList<>();
-        this.studyPosts = new ArrayList<>();
-        this.toDoLists = new ArrayList<>();
-        this.notifications = new ArrayList<>();
-
-    }
-
 /* ----------------------------- 연관관계 메소드 ------------------------------------- */
 
     public void addMemberStudy(MemberStudy memberStudy) {

src/main/java/com/example/spot/domain/study/StudyPost.java

@@ -12,13 +12,11 @@
 import java.util.List;
 
 import lombok.*;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 
 @Entity
 @Getter
-@DynamicUpdate
-@DynamicInsert
+@Builder
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class StudyPost extends BaseEntity {
 
@@ -50,47 +48,35 @@ public class StudyPost extends BaseEntity {
     @Column(nullable = false)
     private String title;
 
-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "text")
     private String content;
 
-    @Column(nullable = false)
+    @Column(columnDefinition = "INTEGER DEFAULT 0")
     private Integer likeNum;
 
-    @Column(nullable = false)
+    @Column(columnDefinition = "INTEGER DEFAULT 0")
     private Integer hitNum;
 
     @Setter
-    @Column(nullable = false)
+    @Column(columnDefinition = "INTEGER DEFAULT 0")
     private Integer commentNum;
 
+    @Builder.Default
     @OneToMany(mappedBy = "studyPost", cascade = CascadeType.ALL)
-    private List<StudyPostImage> images;
+    private List<StudyPostImage> images = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "studyPost", cascade = CascadeType.ALL)
-    private List<StudyPostComment> comments;
+    private List<StudyPostComment> comments = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "studyPost", cascade = CascadeType.ALL)
-    private List<StudyLikedPost> likedPosts;
+    private List<StudyLikedPost> likedPosts = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "studyPost", cascade = CascadeType.ALL)
-    private List<StudyPostReport> studyPostReports;
-
-/* ----------------------------- 생성자 ------------------------------------- */
-
-    @Builder
-    public StudyPost(Boolean isAnnouncement, Theme theme, String title, String content) {
-        this.isAnnouncement = isAnnouncement;
-        this.theme = theme;
-        this.title = title;
-        this.content = content;
-        this.likeNum = 0;
-        this.hitNum = 0;
-        this.commentNum = 0;
-        this.images = new ArrayList<>();
-        this.comments = new ArrayList<>();
-        this.likedPosts = new ArrayList<>();
-        this.studyPostReports = new ArrayList<>();
-    }
+    private List<StudyPostReport> studyPostReports = new ArrayList<>();
+
 /* ----------------------------- 연관관계 메소드 ------------------------------------- */
 
     public void addImage(StudyPostImage image) {

src/main/java/com/example/spot/domain/study/StudyPostComment.java

@@ -14,8 +14,8 @@
 
 @Entity
 @Getter
-@DynamicUpdate
-@DynamicInsert
+@Builder
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class StudyPostComment extends BaseEntity {
 
@@ -36,10 +36,10 @@ public class StudyPostComment extends BaseEntity {
     @Column(nullable = false)
     private String content;
 
-    @Column(nullable = false)
+    @Column(columnDefinition = "INTEGER DEFAULT 0")
     private Integer likeCount;
 
-    @Column(nullable = false)
+    @Column(columnDefinition = "INTEGER DEFAULT 0")
     private Integer dislikeCount;
 
     @Column(nullable = false, columnDefinition = "BIT DEFAULT 0")
@@ -56,29 +56,13 @@ public class StudyPostComment extends BaseEntity {
     @JoinColumn(name = "parent_comment_id")
     private StudyPostComment parentComment;
 
+    @Builder.Default
     @OneToMany(mappedBy = "parentComment", cascade = CascadeType.ALL)
-    private List<StudyPostComment> childrenComment;
+    private List<StudyPostComment> childrenComment = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(mappedBy = "studyPostComment", cascade = CascadeType.ALL)
-    private List<StudyLikedComment> likedComments;
-
-/* ----------------------------- 생성자 ------------------------------------- */
-
-    @Builder
-    public StudyPostComment(StudyPost studyPost, Member member, String content,
-                            Boolean isAnonymous, Integer anonymousNum, StudyPostComment parentComment) {
-        this.studyPost = studyPost;
-        this.member = member;
-        this.content = content;
-        this.likeCount = 0;
-        this.dislikeCount = 0;
-        this.isAnonymous = isAnonymous;
-        this.anonymousNum = anonymousNum;
-        this.isDeleted = Boolean.FALSE;
-        this.parentComment = parentComment;
-        this.childrenComment = new ArrayList<>();
-        this.likedComments = new ArrayList<>();
-    }
+    private List<StudyLikedComment> likedComments = new ArrayList<>();
 
 /* ----------------------------- 연관관계 메소드 ------------------------------------- */
 

src/main/java/com/example/spot/repository/querydsl/StudyRepositoryCustom.java

@@ -21,6 +21,7 @@ public interface StudyRepositoryCustom {
     List<Study> findByStudyTheme(List<StudyTheme> studyThemes);
 
     List<Study> findByStudyThemeAndNotInIds(List<StudyTheme> studyThemes, List<Long> studyIds);
+    List<Study> findByRegionStudyAndNotInIds(List<RegionStudy> regionStudies, List<Long> studyIds);
 
     // 모집중 스터디 조회
     List<Study> findRecruitingStudyByConditions(Map<String, Object> search, StudySortBy sortBy, Pageable pageable);

src/main/java/com/example/spot/repository/querydsl/impl/StudyRepositoryCustomImpl.java

@@ -76,7 +76,18 @@ public List<Study> findByStudyThemeAndNotInIds(List<StudyTheme> studyThemes,
         return queryFactory.selectFrom(study)
             .where(study.studyThemes.any().in(studyThemes))
             .where(study.id.notIn(studyIds))
-            .orderBy(study.createdAt.desc())
+            .orderBy(study.hitNum.desc())
+            .offset(0)
+            .limit(3)
+            .fetch();
+    }
+
+    @Override
+    public List<Study> findByRegionStudyAndNotInIds(List<RegionStudy> regionStudies, List<Long> studyIds) {
+        return queryFactory.selectFrom(study)
+            .where(study.regionStudies.any().in(regionStudies))
+            .where(study.id.notIn(studyIds))
+            .orderBy(study.heartCount.desc())
             .offset(0)
             .limit(3)
             .fetch();

src/main/java/com/example/spot/service/memberstudy/MemberStudyCommandServiceImpl.java

@@ -87,7 +87,7 @@ public StudyWithdrawalResponseDTO.WithdrawalDTO withdrawFromStudy(Long studyId)
                 .orElseThrow(() -> new StudyHandler(ErrorStatus._STUDY_MEMBER_NOT_FOUND));
 
         // 참여가 승인되지 않은 스터디는 탈퇴할 수 없음
-        if (memberStudy.getStatus().equals(ApplicationStatus.APPLIED)) {
+        if (!memberStudy.getStatus().equals(ApplicationStatus.APPROVED)) {
             throw new StudyHandler(ErrorStatus._STUDY_NOT_APPROVED);
         }
         // 스터디장은 스터디를 탈퇴할 수 없음
@@ -107,10 +107,24 @@ public StudyWithdrawalResponseDTO.WithdrawalDTO withdrawFromStudy(Long studyId)
      */
     public StudyTerminationResponseDTO.TerminationDTO terminateStudy(Long studyId) {
 
+        // Authorization
+        Long memberId = SecurityUtils.getCurrentUserId();
+        memberRepository.findById(memberId)
+                .orElseThrow(() -> new MemberHandler(ErrorStatus._MEMBER_NOT_FOUND));
         Study study = studyRepository.findById(studyId)
                 .orElseThrow(() -> new StudyHandler(ErrorStatus._STUDY_NOT_FOUND));
+        MemberStudy memberStudy = memberStudyRepository.findByMemberIdAndStudyIdAndStatus(memberId, studyId, ApplicationStatus.APPROVED)
+                .orElseThrow(() -> new StudyHandler(ErrorStatus._STUDY_MEMBER_NOT_FOUND));
+
+        // 스터디장이 아니면 스터디를 종료할 수 없음
+        if (memberStudy.getIsOwned().equals(false)) {
+            throw new StudyHandler(ErrorStatus._STUDY_OWNER_ONLY_CAN_TERMINATE);
+        }
 
-        // 스터디장 확인 로직 빠짐
+        // 이미 종료된 스터디는 종료할 수 없음
+        if (study.getStatus().equals(Status.OFF)) {
+            throw new StudyHandler(ErrorStatus._STUDY_ALREADY_TERMINATED);
+        }
 
         study.setStatus(Status.OFF);
         studyRepository.save(study);

src/main/java/com/example/spot/service/memberstudy/MemberStudyQueryServiceImpl.java

@@ -101,13 +101,14 @@ public StudyScheduleResponseDTO findStudySchedule(Long studyId, Pageable pageabl
 
         // 스터디 일정이 존재하지 않는 경우
         if (schedules.isEmpty())
-            throw  new GeneralException(ErrorStatus._STUDY_SCHEDULE_NOT_FOUND);
+            throw new GeneralException(ErrorStatus._STUDY_SCHEDULE_NOT_FOUND);
 
         // DTO로 변환하여 반환
         List<StudyScheduleDTO> scheduleDTOS = schedules.stream().map(schedule -> StudyScheduleDTO.builder()
             .title(schedule.getTitle())
             .location(schedule.getLocation())
-            .staredAt(schedule.getStartedAt())
+            .startedAt(schedule.getStartedAt())
+            .finishedAt(schedule.getFinishedAt())
             .build()).toList();
 
         // 페이징 처리