merge develop into

src/main/java/com/moabam/api/application/item/ItemService.java

@@ -60,11 +60,12 @@ public void purchaseItem(Long memberId, Long itemId, PurchaseItemRequest request
 
 	@Transactional
 	public void selectItem(Long memberId, Long itemId) {
+		Member member = memberService.findMember(memberId);
 		Inventory inventory = getInventory(memberId, itemId);
 
 		inventorySearchRepository.findDefault(memberId, inventory.getItemType())
 			.ifPresent(Inventory::deselect);
-		inventory.select();
+		inventory.select(member);
 	}
 
 	private Item getItem(Long itemId) {

src/main/java/com/moabam/api/application/member/MemberService.java

@@ -17,6 +17,9 @@
 import com.moabam.api.domain.member.Member;
 import com.moabam.api.domain.member.repository.MemberRepository;
 import com.moabam.api.domain.member.repository.MemberSearchRepository;
+import com.moabam.api.domain.room.Participant;
+import com.moabam.api.domain.room.repository.ParticipantRepository;
+import com.moabam.api.domain.room.repository.ParticipantSearchRepository;
 import com.moabam.api.dto.auth.AuthorizationTokenInfoResponse;
 import com.moabam.api.dto.auth.LoginResponse;
 import com.moabam.api.dto.member.MemberInfo;
@@ -42,6 +45,8 @@ public class MemberService {
 	private final InventoryRepository inventoryRepository;
 	private final ItemRepository itemRepository;
 	private final MemberSearchRepository memberSearchRepository;
+	private final ParticipantSearchRepository participantSearchRepository;
+	private final ParticipantRepository participantRepository;
 	private final ClockHolder clockHolder;
 
 	public Member findMember(Long memberId) {
@@ -69,6 +74,12 @@ public Member findMemberToDelete(Long memberId) {
 
 	@Transactional
 	public void delete(Member member) {
+		List<Participant> participants = participantRepository.findAllByMemberId(member.getId());
+
+		if (!participants.isEmpty()) {
+			throw new BadRequestException(NEED_TO_EXIT_ALL_ROOMS);
+		}
+
 		member.delete(clockHolder.times());
 		memberRepository.flush();
 		memberRepository.delete(member);
@@ -92,14 +103,29 @@ public void modifyInfo(AuthMember authMember, ModifyMemberRequest modifyMemberRe
 		Member member = memberSearchRepository.findMember(authMember.id())
 			.orElseThrow(() -> new NotFoundException(MEMBER_NOT_FOUND));
 
-		member.changeNickName(modifyMemberRequest.nickname());
+		boolean nickNameChanged = member.changeNickName(modifyMemberRequest.nickname());
 		member.changeIntro(modifyMemberRequest.intro());
 		member.changeProfileUri(newProfileUri);
 
 		memberRepository.save(member);
+
+		if (nickNameChanged) {
+			changeNickname(authMember.id(), modifyMemberRequest.nickname());
+		}
+	}
+
+	private void changeNickname(Long memberId, String changedName) {
+		List<Participant> participants = participantSearchRepository.findAllRoomMangerByMemberId(memberId);
+
+		for (Participant participant : participants) {
+			participant.getRoom().changeManagerNickname(changedName);
+		}
 	}
 
 	private void validateNickname(String nickname) {
+		if (Objects.isNull(nickname)) {
+			return;
+		}
 		if (StringUtils.isEmpty(nickname) && memberRepository.existsByNickname(nickname)) {
 			throw new ConflictException(NICKNAME_CONFLICT);
 		}

src/main/java/com/moabam/api/application/report/ReportService.java

@@ -31,29 +31,30 @@ public class ReportService {
 
 	@Transactional
 	public void report(AuthMember authMember, ReportRequest reportRequest) {
-		validateNoReportSubject(reportRequest.roomId(), reportRequest.certificationId());
+		validateNoReportSubject(reportRequest.reportedId());
 		Report report = createReport(authMember.id(), reportRequest);
 		reportRepository.save(report);
 	}
 
 	private Report createReport(Long reporterId, ReportRequest reportRequest) {
 		Member reportedMember = memberService.findMember(reportRequest.reportedId());
 
+		Certification certification = null;
 		if (nonNull(reportRequest.certificationId())) {
-			Certification certification = certificationService.findCertification(reportRequest.certificationId());
-
-			return ReportMapper.toReport(reporterId, reportedMember.getId(),
-				null, certification, reportRequest.description());
+			certification = certificationService.findCertification(reportRequest.certificationId());
 		}
 
-		Room room = roomService.findRoom(reportRequest.roomId());
+		Room room = null;
+		if (nonNull(reportRequest.roomId())) {
+			room = roomService.findRoom(reportRequest.roomId());
+		}
 
 		return ReportMapper.toReport(reporterId, reportedMember.getId(),
-			room, null, reportRequest.description());
+			room, certification, reportRequest.description());
 	}
 
-	private void validateNoReportSubject(Long roomId, Long certificationId) {
-		if (isNull(roomId) && isNull(certificationId)) {
+	private void validateNoReportSubject(Long reportedId) {
+		if (isNull(reportedId)) {
 			throw new BadRequestException(ErrorMessage.REPORT_REQUEST_ERROR);
 		}
 	}

src/main/java/com/moabam/api/application/room/RoomService.java

@@ -45,7 +45,7 @@ public class RoomService {
 	private final MemberService memberService;
 
 	@Transactional
-	public Long createRoom(Long memberId, String nickname, CreateRoomRequest createRoomRequest) {
+	public Long createRoom(Long memberId, CreateRoomRequest createRoomRequest) {
 		Room room = RoomMapper.toRoomEntity(createRoomRequest);
 		List<Routine> routines = RoutineMapper.toRoutineEntities(room, createRoomRequest.routines());
 		Participant participant = ParticipantMapper.toParticipant(room, memberId);
@@ -55,7 +55,7 @@ public Long createRoom(Long memberId, String nickname, CreateRoomRequest createR
 		Member member = memberService.findMember(memberId);
 		member.enterRoom(room.getRoomType());
 		participant.enableManager();
-		room.changeManagerNickname(nickname);
+		room.changeManagerNickname(member.getNickname());
 
 		Room savedRoom = roomRepository.save(room);
 		routineRepository.saveAll(routines);
@@ -135,6 +135,7 @@ public void mandateManager(Long managerId, Long roomId, Long memberId) {
 
 	@Transactional
 	public void deportParticipant(Long managerId, Long roomId, Long memberId) {
+		validateDeportParticipant(managerId, memberId);
 		Participant managerParticipant = getParticipant(managerId, roomId);
 		Participant memberParticipant = getParticipant(memberId, roomId);
 		validateManagerAuthorization(managerParticipant);
@@ -172,6 +173,12 @@ private Participant getParticipant(Long memberId, Long roomId) {
 			.orElseThrow(() -> new NotFoundException(PARTICIPANT_NOT_FOUND));
 	}
 
+	private void validateDeportParticipant(Long managerId, Long memberId) {
+		if (managerId.equals(memberId)) {
+			throw new BadRequestException(PARTICIPANT_DEPORT_ERROR);
+		}
+	}
+
 	private void validateManagerAuthorization(Participant participant) {
 		if (!participant.isManager()) {
 			throw new ForbiddenException(ROOM_MODIFY_UNAUTHORIZED_REQUEST);

src/main/java/com/moabam/api/application/room/SearchService.java

@@ -147,7 +147,7 @@ public ManageRoomResponse getRoomForModification(Long memberId, Long roomId) {
 			participantResponses.add(ParticipantMapper.toParticipantResponse(member, contributionPoint));
 		}
 
-		return RoomMapper.toManageRoomResponse(room, routineResponses, participantResponses);
+		return RoomMapper.toManageRoomResponse(room, memberId, routineResponses, participantResponses);
 	}
 
 	public GetAllRoomsResponse getAllRooms(@Nullable RoomType roomType, @Nullable Long roomId) {

src/main/java/com/moabam/api/application/room/mapper/RoomMapper.java

@@ -99,11 +99,12 @@ public static RoomsHistoryResponse toRoomsHistoryResponse(List<RoomHistoryRespon
 			.build();
 	}
 
-	public static ManageRoomResponse toManageRoomResponse(Room room, List<RoutineResponse> routines,
+	public static ManageRoomResponse toManageRoomResponse(Room room, Long managerId, List<RoutineResponse> routines,
 		List<ParticipantResponse> participantResponses) {
 		return ManageRoomResponse.builder()
 			.roomId(room.getId())
 			.title(room.getTitle())
+			.managerId(managerId)
 			.announcement(room.getAnnouncement())
 			.roomType(room.getRoomType())
 			.certifyTime(room.getCertifyTime())

src/main/java/com/moabam/api/domain/item/Inventory.java

@@ -4,6 +4,7 @@
 
 import org.hibernate.annotations.ColumnDefault;
 
+import com.moabam.api.domain.member.Member;
 import com.moabam.global.common.entity.BaseTimeEntity;
 
 import jakarta.persistence.Column;
@@ -54,8 +55,9 @@ public ItemType getItemType() {
 		return this.item.getType();
 	}
 
-	public void select() {
+	public void select(Member member) {
 		this.isDefault = true;
+		member.changeDefaultSkintUrl(this.item);
 	}
 
 	public void deselect() {

src/main/java/com/moabam/api/domain/member/BadgeType.java

@@ -27,7 +27,7 @@ public enum BadgeType {
 	public static List<BadgeResponse> memberBadgeMap(Set<BadgeType> badgeTypes) {
 		return Arrays.stream(BadgeType.values())
 			.map(badgeType -> BadgeResponse.builder()
-				.badge(badgeType)
+				.badge(badgeType.korean)
 				.unlock(badgeTypes.contains(badgeType))
 				.build())
 			.toList();

src/main/java/com/moabam/api/domain/member/Member.java

@@ -7,6 +7,7 @@
 import static java.util.Objects.*;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
@@ -47,7 +48,7 @@ public class Member extends BaseTimeEntity {
 	@Column(name = "social_id", nullable = false, unique = true)
 	private String socialId;
 
-	@Column(name = "nickname", nullable = false, unique = true)
+	@Column(name = "nickname", unique = true)
 	private String nickname;
 
 	@Column(name = "intro", length = 30)
@@ -134,10 +135,15 @@ public void increaseTotalCertifyCount() {
 
 	public void delete(LocalDateTime now) {
 		socialId = deleteSocialId(now);
+		nickname = null;
 	}
 
-	public void changeNickName(String nickname) {
-		this.nickname = requireNonNullElse(nickname, this.nickname);
+	public boolean changeNickName(String nickname) {
+		if (Objects.isNull(nickname)) {
+			return false;
+		}
+		this.nickname = nickname;
+		return true;
 	}
 
 	public void changeIntro(String intro) {

src/main/java/com/moabam/api/domain/room/repository/ParticipantRepository.java

@@ -1,9 +1,12 @@
 package com.moabam.api.domain.room.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.moabam.api.domain.room.Participant;
 
 public interface ParticipantRepository extends JpaRepository<Participant, Long> {
 
+	List<Participant> findAllByMemberId(Long id);
 }

src/main/java/com/moabam/api/domain/room/repository/ParticipantSearchRepository.java

@@ -62,6 +62,7 @@ public List<Participant> findAllParticipantsByMemberId(Long memberId) {
 			.where(
 				participant.memberId.eq(memberId)
 			)
+			.orderBy(participant.createdAt.desc())
 			.fetch();
 	}
 
@@ -75,4 +76,15 @@ public List<Participant> findAllByRoomCertifyTime(int certifyTime) {
 			)
 			.fetch();
 	}
+
+	public List<Participant> findAllRoomMangerByMemberId(Long memberId) {
+		return jpaQueryFactory
+			.selectFrom(participant)
+			.join(participant.room, room).fetchJoin()
+			.where(
+				participant.memberId.eq(memberId),
+				participant.isManager.isTrue()
+			)
+			.fetch();
+	}
 }

src/main/java/com/moabam/api/dto/member/BadgeResponse.java

@@ -6,7 +6,7 @@
 
 @Builder
 public record BadgeResponse(
-	BadgeType badge,
+	String badge,
 	boolean unlock
 ) {
 

src/main/java/com/moabam/api/dto/room/ManageRoomResponse.java

@@ -10,6 +10,7 @@
 public record ManageRoomResponse(
 	Long roomId,
 	String title,
+	Long managerId,
 	String announcement,
 	RoomType roomType,
 	int certifyTime,

src/main/java/com/moabam/api/presentation/RoomController.java

@@ -52,7 +52,7 @@ public class RoomController {
 	@PostMapping
 	@ResponseStatus(HttpStatus.CREATED)
 	public Long createRoom(@Auth AuthMember authMember, @Valid @RequestBody CreateRoomRequest createRoomRequest) {
-		return roomService.createRoom(authMember.id(), authMember.nickname(), createRoomRequest);
+		return roomService.createRoom(authMember.id(), createRoomRequest);
 	}
 
 	@GetMapping

src/main/java/com/moabam/global/error/model/ErrorMessage.java

@@ -29,6 +29,8 @@ public enum ErrorMessage {
 	INVALID_REQUEST_URL("잘못된 URL 요청입니다."),
 	INVALID_CERTIFY_TIME("현재 인증 시간이 아닙니다."),
 	CERTIFICATION_NOT_FOUND("인증 정보가 없습니다."),
+	NEED_TO_EXIT_ALL_ROOMS("모든 방에서 나가야 회원 탈퇴가 가능합니다."),
+	PARTICIPANT_DEPORT_ERROR("방장은 자신을 추방할 수 없습니다."),
 
 	LOGIN_FAILED("로그인에 실패했습니다."),
 	REQUEST_FAILED("네트워크 접근 실패입니다."),

src/test/java/com/moabam/api/application/item/ItemServiceTest.java

@@ -160,6 +160,7 @@ void success() {
 			Inventory inventory = inventory(memberId, nightMageSkin());
 			Inventory defaultInventory = inventory(memberId, nightMageSkin());
 			ItemType itemType = inventory.getItemType();
+			given(memberService.findMember(memberId)).willReturn(member());
 			given(inventorySearchRepository.findOne(memberId, itemId)).willReturn(Optional.of(inventory));
 			given(inventorySearchRepository.findDefault(memberId, itemType)).willReturn(Optional.of(defaultInventory));
 

src/test/java/com/moabam/api/application/member/MemberServiceTest.java

@@ -24,6 +24,8 @@
 import com.moabam.api.domain.member.Member;
 import com.moabam.api.domain.member.repository.MemberRepository;
 import com.moabam.api.domain.member.repository.MemberSearchRepository;
+import com.moabam.api.domain.room.repository.ParticipantRepository;
+import com.moabam.api.domain.room.repository.ParticipantSearchRepository;
 import com.moabam.api.dto.auth.AuthorizationTokenInfoResponse;
 import com.moabam.api.dto.auth.LoginResponse;
 import com.moabam.api.dto.member.MemberInfo;
@@ -54,6 +56,12 @@ class MemberServiceTest {
 	@Mock
 	MemberSearchRepository memberSearchRepository;
 
+	@Mock
+	ParticipantRepository participantRepository;
+
+	@Mock
+	ParticipantSearchRepository participantSearchRepository;
+
 	@Mock
 	InventorySearchRepository inventorySearchRepository;
 
@@ -204,6 +212,8 @@ void modify_success_test(@WithMember AuthMember authMember) {
 		Member member = MemberFixture.member();
 		ModifyMemberRequest modifyMemberRequest = ModifyImageFixture.modifyMemberRequest();
 		given(memberSearchRepository.findMember(authMember.id())).willReturn(Optional.ofNullable(member));
+		given(participantSearchRepository.findAllRoomMangerByMemberId(any()))
+			.willReturn(List.of());
 
 		// when
 		memberService.modifyInfo(authMember, modifyMemberRequest, "/main");

src/test/java/com/moabam/api/application/report/ReportServiceTest.java

@@ -52,7 +52,7 @@ class ReportServiceTest {
 	@Test
 	void no_report_subject_fail(@WithMember AuthMember authMember) {
 		// given
-		ReportRequest reportRequest = new ReportRequest(5L, null, null, "st");
+		ReportRequest reportRequest = new ReportRequest(null, null, null, "st");
 
 		// When + Then
 		assertThatThrownBy(() -> reportService.report(authMember, reportRequest))

src/test/java/com/moabam/api/application/room/RoomServiceTest.java

@@ -70,7 +70,7 @@ void create_room_no_password_success() {
 		given(memberService.findMember(1L)).willReturn(member);
 
 		// when
-		Long result = roomService.createRoom(1L, "닉네임", createRoomRequest);
+		Long result = roomService.createRoom(1L, createRoomRequest);
 
 		// then
 		verify(roomRepository).save(any(Room.class));
@@ -98,7 +98,7 @@ void create_room_with_password_success() {
 		given(memberService.findMember(1L)).willReturn(member);
 
 		// when
-		Long result = roomService.createRoom(1L, "닉네임", createRoomRequest);
+		Long result = roomService.createRoom(1L, createRoomRequest);
 
 		// then
 		verify(roomRepository).save(any(Room.class));