hotfix: 랭킹 조회 쿼리 및 방 조회 수정

team-moabam · Dec 3, 2023 · 711f4d2 · 711f4d2
1 parent c370913
commit 711f4d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/src/main/java/com/moabam/api/domain/member/repository/MemberSearchRepository.java b/src/main/java/com/moabam/api/domain/member/repository/MemberSearchRepository.java
@@ -34,7 +34,7 @@ public List<Member> findAllMembers() {
 		return jpaQueryFactory
 			.selectFrom(member)
 			.where(
-				member.deletedAt.isNotNull()
+				member.deletedAt.isNull()
 			)
 			.fetch();
 	}

diff --git a/src/main/java/com/moabam/api/domain/room/repository/RoomSearchRepository.java b/src/main/java/com/moabam/api/domain/room/repository/RoomSearchRepository.java
@@ -24,7 +24,8 @@ public List<Room> findAllWithNoOffset(RoomType roomType, Long roomId) {
 		return jpaQueryFactory.selectFrom(room)
 			.where(
 				DynamicQuery.generateEq(roomType, room.roomType::eq),
-				DynamicQuery.generateEq(roomId, room.id::lt)
+				DynamicQuery.generateEq(roomId, room.id::lt),
+				room.deletedAt.isNull()
 			)
 			.orderBy(room.id.desc())
 			.limit(ROOM_FIXED_SEARCH_SIZE + 1L)

diff --git a/src/test/java/com/moabam/api/application/auth/AuthorizationServiceTest.java b/src/test/java/com/moabam/api/application/auth/AuthorizationServiceTest.java
@@ -329,9 +329,7 @@ void unlink_success(@WithMember AuthMember authMember) {
 		// given
 		Member member = MemberFixture.member();
 
-		willReturn(member)
-			.given(memberService)
-			.validateMemberToDelete(authMember.id());
+		given(memberService.findMember(any())).willReturn(MemberFixture.member());
 		doNothing().when(oAuth2AuthorizationServerRequestService)
 			.unlinkMemberRequest(eq(oauthConfig.provider().unlink()), eq(oauthConfig.client().adminKey()), any());
 
@@ -351,23 +349,4 @@ void unlink_failBy_find_Member(@WithMember AuthMember authMember) {
 			.isInstanceOf(NotFoundException.class)
 			.hasMessage(ErrorMessage.MEMBER_NOT_FOUND.getMessage());
 	}
-
-	@DisplayName("소셜 탈퇴 요청 실패로 인한 실패")
-	@Test
-	void unlink_failBy_(@WithMember AuthMember authMember) {
-		// Given
-		Member member = MemberFixture.member();
-
-		willReturn(member)
-			.given(memberService)
-			.validateMemberToDelete(authMember.id());
-		willThrow(BadRequestException.class)
-			.given(oAuth2AuthorizationServerRequestService)
-			.unlinkMemberRequest(eq(oauthConfig.provider().unlink()), eq(oauthConfig.client().adminKey()), any());
-
-		// When + Then
-		assertThatThrownBy(() -> authorizationService.unLinkMember(authMember))
-			.isInstanceOf(BadRequestException.class)
-			.hasMessage(ErrorMessage.UNLINK_REQUEST_FAIL_ROLLBACK_SUCCESS.getMessage());
-	}
 }