hotfix: 코드 수정

woowacourse · Oct 6, 2023 · 1cdfb23 · 1cdfb23
1 parent 2fb80d1
commit 1cdfb23
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/backend/src/main/java/wooteco/prolog/login/ui/AuthMemberPrincipalArgumentResolver.java b/backend/src/main/java/wooteco/prolog/login/ui/AuthMemberPrincipalArgumentResolver.java
@@ -32,22 +32,21 @@ public LoginMember resolveArgument(MethodParameter parameter,
                                        ModelAndViewContainer mavContainer,
                                        NativeWebRequest webRequest,
                                        WebDataBinderFactory binderFactory) {
-        return new LoginMember(1L, Authority.MEMBER);
-//        String credentials = AuthorizationExtractor
-//            .extract(webRequest.getNativeRequest(HttpServletRequest.class));
-//
-//        if (credentials == null || credentials.isEmpty()) {
-//            memberAuthorityCache.setAuthority(Authority.ANONYMOUS);
-//            return new LoginMember(Authority.ANONYMOUS);
-//        }
-//
-//        try {
-//            Long id = Long.parseLong(jwtTokenProvider.extractSubject(credentials));
-//            memberAuthorityCache.setAuthority(Authority.MEMBER);
-//            return new LoginMember(id, Authority.MEMBER);
-//        } catch (NumberFormatException e) {
-//            throw new BadRequestException(TOKEN_NOT_VALID);
-//        }
+        String credentials = AuthorizationExtractor
+            .extract(webRequest.getNativeRequest(HttpServletRequest.class));
+
+        if (credentials == null || credentials.isEmpty()) {
+            memberAuthorityCache.setAuthority(Authority.ANONYMOUS);
+            return new LoginMember(Authority.ANONYMOUS);
+        }
+
+        try {
+            Long id = Long.parseLong(jwtTokenProvider.extractSubject(credentials));
+            memberAuthorityCache.setAuthority(Authority.MEMBER);
+            return new LoginMember(id, Authority.MEMBER);
+        } catch (NumberFormatException e) {
+            throw new BadRequestException(TOKEN_NOT_VALID);
+        }
     }
 
 }
diff --git a/backend/src/test/java/wooteco/prolog/article/application/ArticleServiceTest.java b/backend/src/test/java/wooteco/prolog/article/application/ArticleServiceTest.java
@@ -31,6 +31,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -320,13 +323,13 @@ void filter_isBookmarked() {
         final Article article = new Article(member, new Title("title"), new Url("url"), new ImageUrl("imageUrl"));
         final LoginMember loginMember = new LoginMember(1L, MEMBER);
 
-        when(articleRepository.findArticlesByCourseAndMember(any(), any(), any())).thenReturn(Arrays.asList(article));
+        when(articleRepository.findArticlesByCourseAndMember(anyString(), anyLong(), anyBoolean())).thenReturn(Arrays.asList(article));
 
         //when
         final List<ArticleResponse> articleResponses = articleService.getFilteredArticles(loginMember, ArticleFilterType.BACKEND, true);
 
         //then
-        verify(articleRepository).findArticlesByCourseAndMember(any(), any(), any());
+        verify(articleRepository).findArticlesByCourseAndMember(anyString(), anyLong(), anyBoolean());
         Assertions.assertThat(articleResponses.get(0).getTitle()).isEqualTo(article.getTitle().getTitle());
     }