refactoring: @Mina-1316 recommends

Author: cmsong111

.gitignore

@@ -260,4 +260,9 @@ gradle-app.setting
 # Java heap dump
 *.hprof
 
-# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,intellij,java,gradle,windows,macos,linux
+# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,intellij,java,gradle,windows,macos,linux
+.idea/modules/blog.test.iml
+.idea/modules/blog.main.iml
+.idea/modules/blog.iml
+.idea/misc.xml
+.idea/Blog-API.iml

src/main/java/com/gdsc/blog/article/service/ArticleService.java

@@ -33,22 +33,24 @@ public class ArticleService {
      *
      * @param articleCreateDto 게시글 생성 DTO
      * @param username         작성자
+     * @throws IllegalArgumentException 유저 정보가 없을 경우
      */
-    public ArticleDto createArticle(
-            ArticleCreateDto articleCreateDto,
-            String username) {
+    public ArticleDto createArticle(ArticleCreateDto articleCreateDto, String username) {
 
         // 현재 시간
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
 
         // 유저 정보
-        User user = userRepository.findByUsername(username).orElseThrow();
+        Optional<User> user = userRepository.findByUsername(username);
+        if (user.isEmpty()) {
+            throw new IllegalArgumentException("Invalid username");
+        }
 
         // 게시글 생성
         Article article = Article.builder()
                 .title(articleCreateDto.getTitle())
                 .content(articleCreateDto.getContent())
-                .user(user)
+                .user(user.get())
                 .createDate(timestamp)
                 .modifyDate(timestamp)
                 .build();
@@ -80,7 +82,7 @@ public List<ArticleDto> getRecentArticle() {
     public List<ArticleDto> getUserArticle(User user) {
         // get user article list
         List<Article> articles = articleRepository.findByUser(user);
-        log.info("articles: {}", articles);
+        log.debug("articles: {}", articles);
 
         // article list to article dto list
         List<ArticleDto> articleList = new ArrayList<>();
@@ -96,13 +98,10 @@ public List<ArticleDto> getUserArticle(User user) {
      * @return Article 객체
      */
     public ArticleDto getArticleById(Long idx) { //get article by id
-        Optional<Article> article = articleRepository.findById(idx);
-
-        if (article.isPresent()) {
-            return articleMapper.toDto(article.get());
-        } else {
-            throw new IllegalArgumentException("Not found Article by id");
-        }
+        Article article = articleRepository.findById(idx).orElseThrow(
+                () -> new IllegalArgumentException("Not found Article by id")
+        );
+        return articleMapper.toDto(article);
     }
 
     public List<ArticleDto> findArticleByTitle(String title) {

src/main/java/com/gdsc/blog/mapper/ArticleMapper.java

@@ -4,12 +4,9 @@
 import com.gdsc.blog.article.entity.Article;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
 
 @Mapper(componentModel = "spring")
 public interface ArticleMapper {
-    ArticleMapper INSTANCE = Mappers.getMapper(ArticleMapper.class);
-
     @Mapping(target = "username", expression = "java(article.getUser().getUsername())")
     @Mapping(target = "createdAt", expression = "java(article.getCreateDate().toLocalDateTime())")
     @Mapping(target = "modifiedAt", expression = "java(article.getModifyDate().toLocalDateTime())")

src/main/java/com/gdsc/blog/security/MyUserDetails.java

@@ -18,11 +18,8 @@ public class MyUserDetails implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        final User user = userRepository.findByUsername(username).get();
-
-        if (user == null) {
-            throw new UsernameNotFoundException("User '" + username + "' not found");
-        }
+        final User user = userRepository.findByUsername(username)
+                .orElseThrow(() -> new UsernameNotFoundException("User '" + username + "' not found"));
 
         return org.springframework.security.core.userdetails.User//
                 .withUsername(username)//

src/main/java/com/gdsc/blog/security/jwt/JwtTokenProvider.java

@@ -46,6 +46,8 @@ public String createToken(String username, List<UserRole> userRoles) {
         claims.put("auth", userRoles.stream().map(s -> new SimpleGrantedAuthority(s.getAuthority()))
                 .filter(Objects::nonNull).collect(Collectors.toList()));
 
+        claims.put("UID", 1L);
+
         Date now = new Date();
         Date validity = new Date(now.getTime() + validityInMilliseconds);
 

src/main/java/com/gdsc/blog/user/entity/UserRole.java

@@ -5,6 +5,7 @@
 public enum UserRole implements GrantedAuthority {
     ROLE_ADMIN, ROLE_CLIENT;
 
+    @Override
     public String getAuthority() {
         return name();
     }