Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB3_4_Log4U_BE into develop

Author: sapiens2000

src/main/java/com/example/log4u/domain/diary/facade/DiaryFacade.java

@@ -124,7 +124,9 @@ public PageResponse<DiaryResponseDto> getDiariesByCursor(
 	) {
 		Slice<DiaryResponseDto> dtoSlice = diaryService.getDiaryResponseDtoSlice(userId, targetUserId, cursorId, size);
 		// 다음 커서 ID 계산
-		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
+		Long nextCursor = (dtoSlice.hasNext() && !dtoSlice.isEmpty())
+			? dtoSlice.getContent().getLast().diaryId()
+			: null;
 		return PageResponse.of(dtoSlice, nextCursor);
 	}
 
@@ -144,7 +146,9 @@ public PageResponse<DiaryResponseDto> searchDiariesByCursor(
 	) {
 		Slice<DiaryResponseDto> dtoSlice = diaryService.searchDiariesByCursor(keyword, sort, cursorId, size);
 		// 다음 커서 ID 계산
-		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
+		Long nextCursor = (dtoSlice.hasNext() && !dtoSlice.isEmpty())
+			? dtoSlice.getContent().getLast().diaryId()
+			: null;
 		return PageResponse.of(dtoSlice, nextCursor);
 	}
 

src/test/java/com/example/log4u/domain/diary/facade/DiaryFacadeTest.java

@@ -11,6 +11,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;
 
@@ -195,7 +196,7 @@ void getDiariesByCursor() {
 			)
 		);
 
-		Slice<DiaryResponseDto> dtoSlice = new SliceImpl<>(dtoList);
+		Slice<DiaryResponseDto> dtoSlice = new SliceImpl<>(dtoList, PageRequest.of(0, size), true);
 		PageResponse<DiaryResponseDto> pageResponse = PageResponse.of(dtoSlice, 3L);
 
 		given(diaryService.getDiaryResponseDtoSlice(userId, targetUserId, cursorId, size)).willReturn(dtoSlice);
@@ -244,7 +245,7 @@ void searchDiariesByCursor() {
 			)
 		);
 
-		Slice<DiaryResponseDto> dtoSlice = new SliceImpl<>(dtoList);
+		Slice<DiaryResponseDto> dtoSlice = new SliceImpl<>(dtoList, PageRequest.of(0, size), true);
 		PageResponse<DiaryResponseDto> pageResponse = PageResponse.of(dtoSlice, 2L);
 
 		given(diaryService.searchDiariesByCursor(keyword, sort, cursorId, size)).willReturn(dtoSlice);

src/test/java/com/example/log4u/domain/user/service/UserServiceTest.java

@@ -47,7 +47,7 @@ void shouldCreateAndSaveMyUserProfile() {
 		Long userId = 1L;
 		UserProfileMakeRequestDto userProfileMakeRequestDto = new UserProfileMakeRequestDto(
 			"test nickname",
-			"test msg"
+			"test img"
 		);
 
 		User mockUser = mock(User.class);