Merge pull request #44 from Modagbul/feat/마이페이지

Feat/마이페이지
Modagbul · Oct 23, 2023 · 23c133d · 23c133d
2 parents 9b4fe17 + b7e520c
commit 23c133d
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 16 deletions.
diff --git a/src/docs/asciidoc/Overview.adoc b/src/docs/asciidoc/Overview.adoc
@@ -105,6 +105,18 @@
 
 |===
 
+=== MyPage ErrorCode
+|===
+| ErrorCode | Scope | Description
+| `MP0001`
+| 알람을 수정할 때
+| 알람 입력값이 유효하지 않음
+
+| `MP0002`
+| 회원 탈퇴할 때
+| 탈퇴되지 않은 소모임이 있음
+|===
+
 === Board ErrorCode
 |===
 | ErrorCode | Scope | Description
@@ -117,6 +129,7 @@
 | 작성자가 아님 (권한 없음)
 |===
 
+=== BoardComment ErrorCode
 |===
 | ErrorCode | Scope | Description
 | `BC0001`
@@ -128,6 +141,8 @@
 | 작성자가 아님 (권한 없음)
 |===
 
+
+
 === Mission ErrorCode
 |===
 | ErrorCode | Scope | Description

diff --git a/src/main/java/com/moing/backend/domain/mypage/application/service/SignOutUserCase.java b/src/main/java/com/moing/backend/domain/mypage/application/service/SignOutUserCase.java
@@ -15,7 +15,6 @@ public class SignOutUserCase {
     private final MemberGetService memberGetService;
 
     public void signOut(String socialId){
-        //TODO: teamMember가 isDeleted가 아닌게 한개라도 있으면 error 반환
         tokenUtil.expireRefreshToken(socialId);
     }
 }
diff --git a/src/main/java/com/moing/backend/domain/mypage/application/service/WithdrawUserCase.java b/src/main/java/com/moing/backend/domain/mypage/application/service/WithdrawUserCase.java
@@ -5,26 +5,34 @@
 import com.moing.backend.domain.member.domain.service.MemberGetService;
 import com.moing.backend.domain.mypage.application.dto.request.WithdrawRequest;
 import com.moing.backend.domain.mypage.domain.service.FeedbackSaveService;
+import com.moing.backend.domain.mypage.exception.ExistingTeamException;
+import com.moing.backend.domain.teamMember.domain.service.TeamMemberGetService;
 import com.moing.backend.global.config.security.jwt.TokenUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class WithdrawUserCase {
+
     private final MemberGetService memberGetService;
     private final FeedbackSaveService feedbackSaveService;
     private final TokenUtil tokenUtil;
     private final MemberDeleteService memberDeleteService;
+    private final TeamMemberGetService teamMemberGetService;
 
     public void withdraw(String socialId, WithdrawRequest withdrawRequest) {
-        //1. 멤버 삭제
         Member member = memberGetService.getMemberBySocialId(socialId);
+        checkMemberIsNotPartOfAnyTeam(member);
         memberDeleteService.deleteMember(member);
-        //TODO: 애플과 카카오 회원탈퇴
-        //2. 피드백 저장
         feedbackSaveService.saveFeedback(member, withdrawRequest);
-        //3. 리프레시 토큰 만료
         tokenUtil.expireRefreshToken(socialId);
     }
+
+    private void checkMemberIsNotPartOfAnyTeam(Member member) {
+        if (!teamMemberGetService.getNotDeletedTeamMember(member.getMemberId()).isEmpty()) {
+            throw new ExistingTeamException();
+        }
+    }
 }
+
diff --git a/src/main/java/com/moing/backend/domain/mypage/exception/ExistingTeamException.java b/src/main/java/com/moing/backend/domain/mypage/exception/ExistingTeamException.java
@@ -0,0 +1,12 @@
+package com.moing.backend.domain.mypage.exception;
+
+import com.moing.backend.global.exception.ApplicationException;
+import com.moing.backend.global.response.ErrorCode;
+import org.springframework.http.HttpStatus;
+
+public class ExistingTeamException extends ApplicationException {
+    public ExistingTeamException() {
+        super(ErrorCode.EXISTING_TEAM_ERROR,
+                HttpStatus.NOT_FOUND);
+    }
+}
diff --git a/...ava/com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepository.java b/...ava/com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepository.java
@@ -1,6 +1,8 @@
 package com.moing.backend.domain.teamMember.domain.repository;
 
+import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.team.application.dto.response.TeamMemberInfo;
+import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 
 import java.util.List;
 import java.util.Optional;
@@ -10,4 +12,5 @@ public interface TeamMemberCustomRepository {
     Optional<List<String>> findFcmTokensByTeamIdAndMemberId(Long teamId, Long memberId);
     Optional<List<String>> findFcmTokensByTeamId(Long teamId);
     List<TeamMemberInfo> findTeamMemberInfoByTeamId(Long teamId);
+    List<TeamMember> findTeamMemberByMemberId(Long memberId);
 }
diff --git a/...com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepositoryImpl.java b/...com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepositoryImpl.java
@@ -4,6 +4,7 @@
 import com.moing.backend.domain.team.application.dto.response.TeamMemberInfo;
 import com.moing.backend.domain.team.domain.constant.ApprovalStatus;
 import com.moing.backend.domain.team.domain.entity.QTeam;
+import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import javax.persistence.EntityManager;
@@ -69,4 +70,12 @@ public List<TeamMemberInfo> findTeamMemberInfoByTeamId(Long teamId){
                 .groupBy(teamMember.member.memberId)
                 .fetch();
     }
+
+    @Override
+    public List<TeamMember> findTeamMemberByMemberId(Long memberId) {
+        return queryFactory.selectFrom(teamMember)
+                .where(teamMember.member.memberId.eq(memberId)
+                        .and(teamMember.isDeleted.eq(false)))
+                .fetch();
+    }
 }
diff --git a/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberGetService.java b/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberGetService.java
@@ -36,4 +36,8 @@ public Optional<List<String>> getFcmTokens(Long teamId) {
     public List<TeamMemberInfo> getTeamMemberInfo(Long teamId){
         return teamMemberRepository.findTeamMemberInfoByTeamId(teamId);
     }
+
+    public List<TeamMember> getNotDeletedTeamMember(Long memberId){
+        return teamMemberRepository.findTeamMemberByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberSaveService.java b/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberSaveService.java
@@ -17,20 +17,30 @@
 @Transactional
 public class TeamMemberSaveService {
     private final TeamMemberRepository teamMemberRepository;
-    public void addTeamMember(Team team, Member member){
+    public void addTeamMember(Team team, Member member) {
         Optional<TeamMember> teamMember = teamMemberRepository.findTeamMemberByTeamAndMember(team, member);
+
         if (teamMember.isPresent()) {
-            if (teamMember.get().isDeleted()) {
-                throw new AlreadyWithdrawTeamException();
-            } else {
-                throw new AlreadyJoinTeamException();
-            }
+            handleExistingMember(teamMember.get());
+        } else {
+            addNewTeamMember(team, member);
+        }
+    }
+
+    private void handleExistingMember(TeamMember teamMember) {
+        if (teamMember.isDeleted()) {
+            throw new AlreadyWithdrawTeamException();
         } else {
-            TeamMember newMember = new TeamMember();
-            newMember.updateMember(member);
-            newMember.updateTeam(team);
-            team.addTeamMember();
-            this.teamMemberRepository.save(newMember);
+            throw new AlreadyJoinTeamException();
         }
     }
+
+    private void addNewTeamMember(Team team, Member member) {
+        TeamMember newMember = new TeamMember();
+        newMember.updateMember(member);
+        newMember.updateTeam(team);
+        team.addTeamMember();
+        this.teamMemberRepository.save(newMember);
+    }
+
 }
diff --git a/src/main/java/com/moing/backend/global/response/ErrorCode.java b/src/main/java/com/moing/backend/global/response/ErrorCode.java
@@ -44,6 +44,7 @@ public enum ErrorCode {
 
     //마이페이지 관련 에러 코드
     INVALID_ALARM_ERROR("MP0001","유효하지 않는 알람 입력값입니다"),
+    EXISTING_TEAM_ERROR("MP0002","탈퇴되지 않은 소모임이 있습니다."),
 
     //게시글 관련 에러 코드
     NOT_FOUND_BY_BOARD_ID_ERROR("B0001","해당 boardId인 게시글이 존재하지 않습니다."),