[Feat] 회원 탈퇴 구현

src/main/java/idorm/idormServer/auth/adapter/in/web/AuthController.java

@@ -69,8 +69,15 @@ public ResponseEntity<SuccessResponse<Object>> login(
 			.body(SuccessResponse.from(AuthResponseCode.MEMBER_LOGIN));
 	}
 
-	@Operation(summary = "Access Token 재발급", security = {@SecurityRequirement(name = AUTHORIZATION),
-		@SecurityRequirement(name = "Refresh-Token")})
+	@Auth
+	@Operation(summary = "Access Token 재발급",
+		description = "<b>해당 API 사용법</b>\n"
+			+ "1. 원래 보내려던 요청을 보내기 전, access token의 payload를 통해 만료 기한을 얻습니다.\n"
+			+ "2. 만료 기한이 지난 토큰이라면, 해당 API 요청을 보낸 후에 새로운 access token을 발급받습니다.\n"
+			+ "3. 그 후에 원래 하려던 요청을 보내주세요.\n"
+			+ "-> 목적 : 네트워크 요청 줄이기",
+		security = {@SecurityRequirement(name = AUTHORIZATION),
+			@SecurityRequirement(name = "Refresh-Token")})
 	@ApiResponses(value = {
 		@ApiResponse(responseCode = "200", description = "MEMBER_REFRESH"),
 		@ApiResponse(responseCode = "401", description = "UNAUTHORIZED_ACCESS_TOKEN / UNAUTHORIZED_REFRESH_TOKEN"),
@@ -84,8 +91,11 @@ public ResponseEntity<SuccessResponse<Object>> refresh(
 		@AuthInfo AuthResponse auth
 	) {
 		validateExistHeader(servletRequest);
+		String accessToken = AuthorizationExtractor.extractAccessToken(servletRequest);
 		String refreshToken = AuthorizationExtractor.extractRefreshToken(servletRequest);
 
+		// TODO: 만료된 access token도 받도록 처리해야 한다.(BUG)
+
 		refreshTokenUseCase.matches(refreshToken, auth.getId());
 		String reissueAccessToken = jwtTokenUseCase.createAccessToken(auth);
 
@@ -114,9 +124,10 @@ public ResponseEntity<SuccessResponse<Object>> logout(
 	}
 
 	private void validateExistHeader(HttpServletRequest request) {
+		String accessTokenHeader = request.getHeader(AUTHORIZATION);
 		String refreshTokenHeader = request.getHeader("Refresh-Token");
 
-		if (Objects.isNull(refreshTokenHeader)) {
+		if (Objects.isNull(accessTokenHeader) || Objects.isNull(refreshTokenHeader)) {
 			throw new UnAuthorizedRefreshTokenException();
 		}
 	}

src/main/java/idorm/idormServer/auth/adapter/out/persistence/RefreshTokenRepository.java

@@ -3,6 +3,7 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Repository;
 
 import idorm.idormServer.auth.entity.RefreshToken;
@@ -12,5 +13,6 @@ public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long
 
 	Optional<RefreshToken> findByMemberId(Long memberId);
 
+	@Modifying
 	void deleteAllByMemberId(Long memberId);
 }

src/main/java/idorm/idormServer/calendar/adapter/in/web/TeamController.java

@@ -90,7 +90,7 @@ public ResponseEntity<SuccessResponse<Object>> deleteTeamMember(
 		@Positive(message = "삭제할 회원 식별자는 양수만 가능합니다.")
 		Long memberId
 	) {
-		teamUseCase.deleteMember(authResponse, memberId);
+		teamUseCase.deleteMember(memberId);
 		return ResponseEntity.ok().body(SuccessResponse.from(TEAM_MEMBER_DELETED));
 	}
 

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/DeleteSleepoverCalendarAdapter.java

@@ -17,4 +17,9 @@ public class DeleteSleepoverCalendarAdapter implements DeleteSleepoverCalendarPo
 	public void delete(SleepoverCalendar sleepoverCalendar) {
 		sleepoverCalendarRepository.delete(sleepoverCalendar);
 	}
+
+	@Override
+	public void deleteByMemberId(Long memberId) {
+		sleepoverCalendarRepository.deleteByMemberId(memberId);
+	}
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/DeleteTeamAdapter.java

@@ -1,11 +1,11 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
+import org.springframework.stereotype.Component;
+
 import idorm.idormServer.calendar.application.port.out.DeleteTeamPort;
 import idorm.idormServer.calendar.entity.Team;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.stereotype.Component;
-
 @Component
 @RequiredArgsConstructor
 public class DeleteTeamAdapter implements DeleteTeamPort {
@@ -14,6 +14,6 @@ public class DeleteTeamAdapter implements DeleteTeamPort {
 
 	@Override
 	public void delete(Team team) {
-		teamRepository.delete(team);
+		teamRepository.delete(team.getId());
 	}
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/DeleteTeamCalendarAdapter.java

@@ -1,12 +1,12 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
+import org.springframework.stereotype.Component;
+
 import idorm.idormServer.calendar.application.port.out.DeleteTeamCalendarPort;
 import idorm.idormServer.calendar.entity.TeamCalendar;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.stereotype.Component;
-
 @Component
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class DeleteTeamCalendarAdapter implements DeleteTeamCalendarPort {

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/DeleteTeamMemberAdapter.java

@@ -0,0 +1,49 @@
+package idorm.idormServer.calendar.adapter.out.persistence;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import idorm.idormServer.calendar.application.port.out.DeleteSleepoverCalendarPort;
+import idorm.idormServer.calendar.application.port.out.DeleteTeamCalendarPort;
+import idorm.idormServer.calendar.application.port.out.DeleteTeamMemberPort;
+import idorm.idormServer.calendar.application.port.out.DeleteTeamPort;
+import idorm.idormServer.calendar.application.port.out.LoadTeamCalendarPort;
+import idorm.idormServer.calendar.application.port.out.LoadTeamPort;
+import idorm.idormServer.calendar.entity.Team;
+import idorm.idormServer.calendar.entity.TeamCalendar;
+import idorm.idormServer.member.entity.Member;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+public class DeleteTeamMemberAdapter implements DeleteTeamMemberPort {
+
+	private final LoadTeamPort loadTeamPort;
+	private final DeleteTeamPort deleteTeamPort;
+
+	private final LoadTeamCalendarPort loadTeamCalendarPort;
+	private final DeleteTeamCalendarPort deleteTeamCalendarPort;
+
+	private final DeleteSleepoverCalendarPort deleteSleepoverCalendarPort;
+
+	@Override
+	public void deleteTeamMember(Member member) {
+		final Team team = loadTeamPort.findByMemberId(member.getId());
+		final List<TeamCalendar> teamCalendars = loadTeamCalendarPort.findByMemberId(member.getId());
+
+		team.deleteMember(member);
+		if (team.getMembers().isEmpty()) {
+			deleteTeamPort.delete(team);
+		} else {
+			deleteSleepoverCalendarPort.deleteByMemberId(member.getId());
+			teamCalendars
+				.forEach(teamCalendar -> {
+					teamCalendar.deletePariticipant(member.getId());
+					if (teamCalendar.getParticipants().isEmpty())
+						deleteTeamCalendarPort.delete(teamCalendar);
+				});
+		}
+	}
+}

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/LoadTeamAdapter.java

@@ -1,15 +1,14 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
+import java.util.Optional;
+
+import org.springframework.stereotype.Component;
+
 import idorm.idormServer.calendar.adapter.out.exception.NotFoundTeamException;
 import idorm.idormServer.calendar.application.port.out.LoadTeamPort;
 import idorm.idormServer.calendar.entity.Team;
-
-import java.util.Optional;
-
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.stereotype.Component;
-
 @Component
 @RequiredArgsConstructor
 public class LoadTeamAdapter implements LoadTeamPort {
@@ -24,7 +23,7 @@ public Optional<Team> findByMemberIdWithOptional(Long memberId) {
 
 	@Override
 	public Team findByMemberId(Long memberId) {
-		Team response = findByMemberId(memberId);
+		Team response = teamRepository.findByMemberId(memberId);
 		if (response == null) {
 			throw new NotFoundTeamException();
 		}

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/LoadTeamCalendarAdapter.java

@@ -1,20 +1,19 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
+import java.time.YearMonth;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
 import idorm.idormServer.calendar.adapter.out.exception.NotFoundTeamCalendarException;
 import idorm.idormServer.calendar.application.port.out.LoadTeamCalendarPort;
 import idorm.idormServer.calendar.entity.Team;
 import idorm.idormServer.calendar.entity.TeamCalendar;
 import idorm.idormServer.notification.adapter.out.api.NotificationRequest;
-
-import java.time.YearMonth;
-import java.util.Collections;
-import java.util.List;
-
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.stereotype.Component;
-
 @Component
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class LoadTeamCalendarAdapter implements LoadTeamCalendarPort {
@@ -39,7 +38,7 @@ public TeamCalendar findByIdAndMemberId(Long teamCalendarId, Long memberId) {
 
 	@Override
 	public List<TeamCalendar> findByMemberId(Long memberId) {
-		List<TeamCalendar> responses = findByMemberId(memberId);
+		List<TeamCalendar> responses = teamCalendarRepository.findByMemberId(memberId);
 		return responses != null ? responses : Collections.emptyList();
 	}
 

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/SleepoverCalendarCustomRepository.java

@@ -1,14 +1,14 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import idorm.idormServer.calendar.entity.Period;
-import idorm.idormServer.calendar.entity.SleepoverCalendar;
-import idorm.idormServer.calendar.entity.Team;
-
 import java.time.YearMonth;
 import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
+import idorm.idormServer.calendar.entity.Period;
+import idorm.idormServer.calendar.entity.SleepoverCalendar;
+import idorm.idormServer.calendar.entity.Team;
+
 @Repository
 public interface SleepoverCalendarCustomRepository {
 
@@ -21,4 +21,6 @@ public interface SleepoverCalendarCustomRepository {
 	Long hasOverlappingDatesWithSleepoverId(Long memberId, Period period, Long sleepoverCalendarId);
 
 	Long hasOverlappingDatesWithoutSleepoverId(Long memberId, Period period);
+
+	void deleteByMemberId(Long memberId);
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/SleepoverCalendarCustomRepositoryImpl.java

@@ -1,18 +1,17 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import static idorm.idormServer.calendar.entity.QSleepoverCalendar.sleepoverCalendar;
-import static idorm.idormServer.calendar.entity.QTeam.team;
+import static idorm.idormServer.calendar.entity.QSleepoverCalendar.*;
+import static idorm.idormServer.calendar.entity.QTeam.*;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.List;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import idorm.idormServer.calendar.entity.Period;
 import idorm.idormServer.calendar.entity.SleepoverCalendar;
 import idorm.idormServer.calendar.entity.Team;
-
-import java.time.LocalDate;
-import java.time.YearMonth;
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -75,4 +74,12 @@ public Long hasOverlappingDatesWithoutSleepoverId(Long memberId, Period period)
 					.and(sleepoverCalendar.memberId.eq(memberId)))
 			.fetchCount();
 	}
+
+	@Override
+	public void deleteByMemberId(Long memberId) {
+		queryFactory
+			.delete(sleepoverCalendar)
+			.where(sleepoverCalendar.memberId.eq(memberId))
+			.execute();
+	}
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/SleepoverCalendarRepository.java

@@ -1,15 +1,17 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import idorm.idormServer.calendar.entity.SleepoverCalendar;
-
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import idorm.idormServer.calendar.entity.SleepoverCalendar;
+
 @Repository
 public interface SleepoverCalendarRepository
 	extends JpaRepository<SleepoverCalendar, Long>, SleepoverCalendarCustomRepository {
 
 	List<SleepoverCalendar> findByMemberId(Long memberId);
+
+	void deleteByMemberId(Long memberId);
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/TeamCalendarCustomRepositoryImpl.java

@@ -1,9 +1,13 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import static idorm.idormServer.calendar.entity.QParticipant.participant;
-import static idorm.idormServer.calendar.entity.QTeam.team;
-import static idorm.idormServer.calendar.entity.QTeamCalendar.teamCalendar;
-import static idorm.idormServer.notification.entity.QFcmToken.fcmToken;
+import static idorm.idormServer.calendar.entity.QParticipant.*;
+import static idorm.idormServer.calendar.entity.QTeam.*;
+import static idorm.idormServer.calendar.entity.QTeamCalendar.*;
+import static idorm.idormServer.notification.entity.QFcmToken.*;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.List;
 
 import com.querydsl.core.Tuple;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -12,11 +16,6 @@
 import idorm.idormServer.calendar.entity.TeamCalendar;
 import idorm.idormServer.notification.adapter.out.api.NotificationRequest;
 import idorm.idormServer.notification.entity.FcmChannel;
-
-import java.time.LocalDate;
-import java.time.YearMonth;
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -40,8 +39,8 @@ public List<TeamCalendar> findByMemberId(Long memberId) {
 		return queryFactory
 			.select(teamCalendar)
 			.from(teamCalendar)
-			.join(teamCalendar.team, team)
-			.where(teamCalendar.participants.participants.any().memberId.eq(memberId))
+			.join(teamCalendar.participants.participants, participant)
+			.where(participant.memberId.eq(memberId))
 			.fetch();
 	}
 

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/TeamCalendarRepository.java

@@ -1,17 +1,14 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import idorm.idormServer.calendar.entity.TeamCalendar;
-
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import idorm.idormServer.calendar.entity.TeamCalendar;
+
 @Repository
 public interface TeamCalendarRepository extends JpaRepository<TeamCalendar, Long>, TeamCalendarCustomRepository {
 
 	Optional<TeamCalendar> findByIdAndTeamId(Long teamCalendarId, Long teamId);
-
-	List<TeamCalendar> findByTeamId(Long teamId);
 }

src/main/java/idorm/idormServer/calendar/adapter/out/persistence/TeamCustomRepository.java

@@ -1,11 +1,13 @@
 package idorm.idormServer.calendar.adapter.out.persistence;
 
-import idorm.idormServer.calendar.entity.Team;
-
 import org.springframework.stereotype.Repository;
 
+import idorm.idormServer.calendar.entity.Team;
+
 @Repository
 public interface TeamCustomRepository {
 
 	Team findByMemberId(Long memberId);
+
+	void delete(Long teamId);
 }