Merge pull request #138 from Modagbul/feat/alarm_minsu

1명인 경우 바로 소모임 삭제되게 수정

src/main/java/com/moing/backend/domain/auth/application/service/CheckNicknameUseCase.java

@@ -4,15 +4,15 @@
 import com.moing.backend.domain.member.domain.service.MemberCheckService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class CheckNicknameUseCase {
 
     private final MemberCheckService memberCheckService;
+
+    @Transactional(readOnly=true)
     public CheckNicknameResponse checkNickname(String nickname){
         boolean isDuplicated=memberCheckService.checkNickname(nickname);
         return new CheckNicknameResponse(isDuplicated);

src/main/java/com/moing/backend/domain/auth/application/service/MemberAuthUseCase.java

@@ -15,7 +15,6 @@ public class MemberAuthUseCase {
 
     private final MemberSaveService memberSaveService;
 
-    @Transactional
     public Member auth(String fcmToken, Member member, String providerInfo) {
         member.updateFcmToken(fcmToken);
         Member signInMember = memberSaveService.saveMember(member);

src/main/java/com/moing/backend/domain/board/application/service/GetBoardUseCase.java

@@ -11,11 +11,9 @@
 import com.moing.backend.global.utils.BaseBoardService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class GetBoardUseCase {
 
@@ -30,6 +28,7 @@ public class GetBoardUseCase {
     /**
      * 게시글 상세 조회
      */
+    @Transactional
     public GetBoardDetailResponse getBoardDetail(String socialId, Long teamId, Long boardId) {
         // 1. 게시글 조회
         BaseBoardServiceResponse data = baseBoardService.getCommonData(socialId, teamId, boardId);
@@ -41,6 +40,7 @@ public GetBoardDetailResponse getBoardDetail(String socialId, Long teamId, Long
     /**
      * 게시글 전체 조회
      */
+    @Transactional(readOnly = true)
     public GetAllBoardResponse getAllBoard(String socialId, Long teamId){
         Member member=memberGetService.getMemberBySocialId(socialId);
         return boardGetService.getBoardAll(teamId, member.getMemberId());

src/main/java/com/moing/backend/domain/board/domain/entity/Board.java

@@ -11,6 +11,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -58,6 +59,7 @@ public class Board extends BaseTimeEntity {
     @OneToMany(mappedBy = "board", cascade = CascadeType.ALL)
     private List<BoardRead> boardReads = new ArrayList<>();
 
+    @BatchSize(size=10)
     @OneToMany(mappedBy = "board", cascade = CascadeType.ALL)
     private List<BoardComment> boardComments = new ArrayList<>();
 

src/main/java/com/moing/backend/domain/history/application/service/GetAlarmHistoryUseCase.java

@@ -7,6 +7,7 @@
 import com.moing.backend.domain.member.domain.service.MemberGetService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,6 +21,7 @@ public class GetAlarmHistoryUseCase {
     /**
      * 알림 히스토리 조회
      */
+    @Transactional(readOnly = true)
     public List<GetAlarmHistoryResponse> getAllAlarmHistories(String socialId) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         return alarmHistoryGetService.getAlarmHistories(member.getMemberId());
@@ -28,6 +30,7 @@ public List<GetAlarmHistoryResponse> getAllAlarmHistories(String socialId) {
     /**
      * 안 읽은 알림 개수 조회
      */
+    @Transactional(readOnly = true)
     public GetAlarmCountResponse getUnreadAlarmCount(String socialId) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         return new GetAlarmCountResponse(alarmHistoryGetService.getUnreadAlarmCount(member.getMemberId()));

src/main/java/com/moing/backend/domain/member/domain/service/MemberCheckService.java

@@ -3,14 +3,14 @@
 import com.moing.backend.domain.member.domain.repository.MemberRepository;
 import com.moing.backend.global.annotation.DomainService;
 import lombok.RequiredArgsConstructor;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 @DomainService
-@Transactional
 @RequiredArgsConstructor
 public class MemberCheckService {
     private final MemberRepository memberRepository;
+
+    @Transactional(readOnly = true)
     public boolean checkNickname(String nickname) {
         return memberRepository.checkNickname(nickname);
     }

src/main/java/com/moing/backend/domain/member/domain/service/MemberSaveService.java

@@ -4,18 +4,18 @@
 import com.moing.backend.domain.member.domain.repository.MemberRepository;
 import com.moing.backend.global.annotation.DomainService;
 import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.time.LocalDateTime;
 import java.util.Optional;
 
 @DomainService
-@Transactional
 @AllArgsConstructor
 public class MemberSaveService {
 
     private final MemberRepository memberRepository;
 
+    @Transactional
     public Member saveMember(Member member) {
         Optional<Member>findMember=memberRepository.findNotDeletedBySocialId(member.getSocialId());
         if(findMember.isEmpty()){

src/main/java/com/moing/backend/domain/mypage/application/service/AlarmUseCase.java

@@ -6,21 +6,21 @@
 import com.moing.backend.domain.mypage.exception.AlarmInvalidException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class AlarmUseCase {
 
     private final MemberGetService memberGetService;
 
+    @Transactional(readOnly = true)
     public GetAlarmResponse getAlarm(String socialId){
         Member member=memberGetService.getMemberBySocialId(socialId);
         return new GetAlarmResponse(member.isNewUploadPush(),member.isRemindPush(), member.isFirePush());
     }
 
+    @Transactional
     public GetAlarmResponse updateAlarm(String socialId, String type, String status) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         boolean push = "on".equals(status);

src/main/java/com/moing/backend/domain/mypage/application/service/GetMyPageUseCase.java

@@ -9,20 +9,20 @@
 import com.moing.backend.domain.team.domain.service.TeamGetService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class GetMyPageUseCase {
 
     private final MemberGetService memberGetService;
     private final TeamGetService teamGetService;
     private final MyPageMapper myPageMapper;
 
+    @Transactional(readOnly = true)
     public GetMyPageResponse getMyPageResponse(String socialId) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         List<GetMyPageTeamBlock> getMyPageTeamBlocks = teamGetService.getMyPageTeamBlockByMemberId(member.getMemberId());

src/main/java/com/moing/backend/domain/mypage/application/service/ProfileUseCase.java

@@ -7,8 +7,7 @@
 import com.moing.backend.global.utils.UpdateUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
@@ -17,6 +16,7 @@ public class ProfileUseCase {
     private final MemberGetService memberGetService;
     private final UpdateUtils updateUtils;
 
+    @Transactional(readOnly = true)
     public GetProfileResponse getProfile(String socialId){
         Member member=memberGetService.getMemberBySocialId(socialId);
         return new GetProfileResponse(member.getProfileImage(), member.getNickName(), member.getIntroduction());

src/main/java/com/moing/backend/domain/mypage/application/service/SignOutUseCase.java

@@ -9,13 +9,13 @@
 import javax.transaction.Transactional;
 
 @Service
+@Transactional
 @RequiredArgsConstructor
 public class SignOutUseCase {
 
     private final TokenUtil tokenUtil;
     private final MemberGetService memberGetService;
 
-    @Transactional
     public void signOut(String socialId){
         tokenUtil.expireRefreshToken(socialId);
         Member member=memberGetService.getMemberBySocialId(socialId);

src/main/java/com/moing/backend/domain/mypage/domain/service/FeedbackSaveService.java

@@ -10,11 +10,11 @@
 import javax.transaction.Transactional;
 
 @DomainService
-@Transactional
 @RequiredArgsConstructor
 public class FeedbackSaveService {
     private final FeedbackRepository feedbackRepository;
 
+    @Transactional
     public void saveFeedback(Member member, WithdrawRequest withdrawRequest){
         Feedback feedback=new Feedback(member.getMemberId(), withdrawRequest.getReason());
         feedbackRepository.save(feedback);

src/main/java/com/moing/backend/domain/team/application/service/DisbandTeamUseCase.java

@@ -5,6 +5,8 @@
 import com.moing.backend.domain.team.application.dto.response.DeleteTeamResponse;
 import com.moing.backend.domain.team.domain.entity.Team;
 import com.moing.backend.domain.team.domain.service.TeamGetService;
+import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
+import com.moing.backend.domain.teamMember.domain.service.TeamMemberGetService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -18,12 +20,17 @@ public class DisbandTeamUseCase {
     private final MemberGetService memberGetService;
     private final TeamGetService teamGetService;
     private final CheckLeaderUseCase checkLeaderUseCase;
+    private final TeamMemberGetService teamMemberGetService;
 
     public DeleteTeamResponse disbandTeam(String socialId, Long teamId) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         Team team = teamGetService.getTeamByTeamId(teamId);
         checkLeaderUseCase.validateTeamLeader(member, team);
         team.deleteTeam();
+        if (team.getNumOfMember() == 1) { // 1명인 경우 3일 유예기간 없음
+            TeamMember teamMember = teamMemberGetService.getTeamMember(member, team);
+            teamMember.deleteMember(team);
+        }
         return new DeleteTeamResponse(teamId);
     }
 }

src/main/java/com/moing/backend/domain/team/application/service/UpdateTeamUseCase.java

@@ -13,6 +13,7 @@
 import javax.transaction.Transactional;
 
 @Service
+@Transactional
 @RequiredArgsConstructor
 public class UpdateTeamUseCase {
 
@@ -21,7 +22,6 @@ public class UpdateTeamUseCase {
     private final CheckLeaderUseCase checkLeaderUseCase;
     private final UpdateUtils updateUtils;
 
-    @Transactional
     public UpdateTeamResponse updateTeam(UpdateTeamRequest updateTeamRequest, String socialId, Long teamId) {
         Member member = memberGetService.getMemberBySocialId(socialId);
         Team team = teamGetService.getTeamByTeamId(teamId);

src/main/java/com/moing/backend/domain/team/domain/entity/Team.java

@@ -81,9 +81,7 @@ public void updateTeam(String name, String introduction, String profileImgUrl) {
 
     public void deleteTeam() {
         this.isDeleted=true;
-        //TODO 테스트 용으로 현재 시간이 아닌 4일 전으로
-//        this.deletionTime = LocalDateTime.now().withNano(0);
-        this.deletionTime=LocalDateTime.now().minusDays(4).withNano(0);
+        this.deletionTime = LocalDateTime.now().withNano(0);
     }
 
     public void addTeamMember(){