Skip to content

Commit 5961688

Browse files
authored
Merge pull request #89 from HaruHan-Mail/develop
Develop
2 parents 79af638 + 35120e4 commit 5961688

4 files changed

Lines changed: 2 additions & 13 deletions

File tree

src/main/java/com/haruhan/bookmark/service/BookmarkServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class BookmarkServiceImpl implements BookmarkService {
3030

3131
// 사용 가능한 데이터인지 확인하는 메소드
3232
private Bookmark isUsableData(BookmarkReqDto bookmarkReqDto) {
33-
// 이메일로 사용자 찾기
33+
// 토큰 값으로 사용자 찾기
3434
User user = userRepository.findByToken(bookmarkReqDto.token())
3535
.orElseThrow(() -> new CustomException(StatusCode.NOT_FOUND_USER));
3636

src/test/java/com/haruhan/bookmark/controller/BookmarkControllerTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
package com.haruhan.bookmark.controller;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.haruhan.bookmark.dto.BookmarkReqDto;
54
import com.haruhan.bookmark.service.BookmarkService;
6-
import org.junit.jupiter.api.DisplayName;
7-
import org.junit.jupiter.api.Test;
85
import org.springframework.beans.factory.annotation.Autowired;
96
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
107
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
118
import org.springframework.boot.test.mock.mockito.MockBean;
12-
import org.springframework.http.MediaType;
139
import org.springframework.test.web.servlet.MockMvc;
1410

15-
import static org.mockito.ArgumentMatchers.any;
16-
import static org.mockito.Mockito.*;
17-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
18-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
19-
2011
@WebMvcTest(BookmarkController.class)
2112
@AutoConfigureMockMvc
2213
public class BookmarkControllerTest {

src/test/java/com/haruhan/bookmark/service/BookmarkServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ void setUp() {
107107
// //Then
108108
// assertEquals(StatusCode.NOT_FOUND, exception.getStatusCode());
109109
// }
110-
}
110+
}

src/test/java/com/haruhan/user/controller/UserControllerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.haruhan.common.error.CustomException;
55
import com.haruhan.common.error.StatusCode;
66
import com.haruhan.user.dto.UserRequestDto;
7-
import com.haruhan.user.dto.UserSettingRequestDto;
87
import com.haruhan.user.entity.PreferedTime;
98
import com.haruhan.user.service.UserService;
109
import org.junit.jupiter.api.DisplayName;
@@ -18,7 +17,6 @@
1817

1918
import static org.mockito.ArgumentMatchers.any;
2019
import static org.mockito.Mockito.*;
21-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
2220
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
2321
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
2422

0 commit comments

Comments
 (0)