refactoring

src/main/java/io/spring/api/CurrentUserApi.java

@@ -3,7 +3,7 @@ package io.spring.api;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import io.spring.api.exception.InvalidRequestException;
 import io.spring.application.UserQueryService;
-import io.spring.application.UserWithToken;
+import io.spring.application.data.UserWithToken;
 import io.spring.application.data.UserData;
 import io.spring.core.user.User;
 import io.spring.core.user.UserRepository;

src/main/java/io/spring/api/UsersApi.java

@@ -3,7 +3,7 @@ package io.spring.api;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import io.spring.api.exception.InvalidRequestException;
 import io.spring.application.UserQueryService;
-import io.spring.application.UserWithToken;
+import io.spring.application.data.UserWithToken;
 import io.spring.application.data.UserData;
 import io.spring.core.service.JwtService;
 import io.spring.core.user.EncryptService;

src/main/java/io/spring/application/ArticleQueryService.java

@@ -2,10 +2,11 @@ package io.spring.application;
 
 import io.spring.application.data.ArticleData;
 import io.spring.application.data.ArticleDataList;
+import io.spring.application.data.ArticleFavoriteCount;
 import io.spring.core.user.User;
+import io.spring.infrastructure.mybatis.readservice.ArticleFavoritesReadService;
 import io.spring.infrastructure.mybatis.readservice.ArticleReadService;
 import io.spring.infrastructure.mybatis.readservice.UserRelationshipQueryService;
-import lombok.Value;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,15 +23,15 @@ import static java.util.stream.Collectors.toList;
 public class ArticleQueryService {
     private ArticleReadService articleReadService;
     private UserRelationshipQueryService userRelationshipQueryService;
-    private ArticleFavoritesQueryService articleFavoritesQueryService;
+    private ArticleFavoritesReadService articleFavoritesReadService;
 
     @Autowired
     public ArticleQueryService(ArticleReadService articleReadService,
                                UserRelationshipQueryService userRelationshipQueryService,
-                               ArticleFavoritesQueryService articleFavoritesQueryService) {
+                               ArticleFavoritesReadService articleFavoritesReadService) {
         this.articleReadService = articleReadService;
         this.userRelationshipQueryService = userRelationshipQueryService;
-        this.articleFavoritesQueryService = articleFavoritesQueryService;
+        this.articleFavoritesReadService = articleFavoritesReadService;
     }
 
     public Optional<ArticleData> findById(String id, User user) {
@@ -89,7 +90,7 @@ public class ArticleQueryService {
     }
 
     private void setFavoriteCount(List<ArticleData> articles) {
-        List<ArticleFavoriteCount> favoritesCounts = articleFavoritesQueryService.articlesFavoriteCount(articles.stream().map(ArticleData::getId).collect(toList()));
+        List<ArticleFavoriteCount> favoritesCounts = articleFavoritesReadService.articlesFavoriteCount(articles.stream().map(ArticleData::getId).collect(toList()));
         Map<String, Integer> countMap = new HashMap<>();
         favoritesCounts.forEach(item -> {
             countMap.put(item.getId(), item.getCount());
@@ -98,7 +99,7 @@ public class ArticleQueryService {
     }
 
     private void setIsFavorite(List<ArticleData> articles, User currentUser) {
-        Set<String> favoritedArticles = articleFavoritesQueryService.userFavorites(articles.stream().map(articleData -> articleData.getId()).collect(toList()), currentUser);
+        Set<String> favoritedArticles = articleFavoritesReadService.userFavorites(articles.stream().map(articleData -> articleData.getId()).collect(toList()), currentUser);
 
         articles.forEach(articleData -> {
             if (favoritedArticles.contains(articleData.getId())) {
@@ -108,8 +109,8 @@ public class ArticleQueryService {
     }
 
     private void fillExtraInfo(String id, User user, ArticleData articleData) {
-        articleData.setFavorited(articleFavoritesQueryService.isUserFavorite(user.getId(), id));
+        articleData.setFavorited(articleFavoritesReadService.isUserFavorite(user.getId(), id));
-        articleData.setFavoritesCount(articleFavoritesQueryService.articleFavoriteCount(id));
+        articleData.setFavoritesCount(articleFavoritesReadService.articleFavoriteCount(id));
         articleData.getProfileData().setFollowing(
             userRelationshipQueryService.isUserFollowing(
                 user.getId(),
@@ -129,8 +130,3 @@ public class ArticleQueryService {
     }
 }
 
-@Value
-class ArticleFavoriteCount {
-    private String id;
-    private Integer count;
-}

src/main/java/io/spring/application/UserQueryService.java

@@ -1,7 +1,6 @@
 package io.spring.application;
 
 import io.spring.application.data.UserData;
-import io.spring.core.service.JwtService;
 import io.spring.infrastructure.mybatis.readservice.UserReadService;
 import org.springframework.stereotype.Service;
 
@@ -10,11 +9,9 @@ import java.util.Optional;
 @Service
 public class UserQueryService  {
     private UserReadService userReadService;
-    private JwtService jwtService;
 
-    public UserQueryService(UserReadService userReadService, JwtService jwtService) {
+    public UserQueryService(UserReadService userReadService) {
         this.userReadService = userReadService;
-        this.jwtService = jwtService;
     }
 
     public Optional<UserData> findById(String id) {

src/main/java/io/spring/application/data/ArticleFavoriteCount.java

@@ -0,0 +1,9 @@
+package io.spring.application.data;
+
+import lombok.Value;
+
+@Value
+public class ArticleFavoriteCount {
+    private String id;
+    private Integer count;
+}

src/main/java/io/spring/application/data/UserWithToken.java

@@ -1,6 +1,5 @@
-package io.spring.application;
+package io.spring.application.data;
 
-import io.spring.application.data.UserData;
 import lombok.Getter;
 
 @Getter

src/main/java/io/spring/infrastructure/mybatis/readservice/ArticleFavoritesReadService.java

@@ -1,5 +1,6 @@
-package io.spring.application;
+package io.spring.infrastructure.mybatis.readservice;
 
+import io.spring.application.data.ArticleFavoriteCount;
 import io.spring.core.user.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,7 +11,7 @@ import java.util.Set;
 
 @Mapper
 @Component
-public interface ArticleFavoritesQueryService {
+public interface ArticleFavoritesReadService {
     boolean isUserFavorite(@Param("userId") String userId, @Param("articleId") String articleId);
 
     int articleFavoriteCount(@Param("articleId") String articleId);

src/main/resources/mapper/ArticleFavoritesReadService.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="io.spring.application.ArticleFavoritesQueryService">
+<mapper namespace="io.spring.infrastructure.mybatis.readservice.ArticleFavoritesReadService">
     <select id="isUserFavorite" resultType="java.lang.Boolean">
         select count(1) from article_favorites where user_id = #{userId} and article_id = #{articleId}
     </select>

src/main/resources/mapper/TransferData.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="transfer.data">
-    <resultMap id="favoriteCount" type="io.spring.application.ArticleFavoriteCount">
+    <resultMap id="favoriteCount" type="io.spring.application.data.ArticleFavoriteCount">
         <constructor>
             <idArg column="id" javaType="string"/>
             <arg column="favoriteCount" javaType="integer"/>

src/test/java/io/spring/api/ApiTestBase.java

@@ -1,13 +0,0 @@
-package io.spring.api;
-
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-public abstract class ApiTestBase {
-
-    @Before
-    public void setUp() throws Exception {
-    }
-}

src/test/java/io/spring/api/ArticleApiTest.java

@@ -89,7 +89,6 @@ public class ArticleApiTest extends TestWithCurrentUser {
 
         Article article = new Article(title, description, body, new String[]{"java", "spring", "jpg"}, user.getId());
 
-        DateTime time = new DateTime();
         ArticleData articleData = TestHelper.getArticleDataFromArticleAndUser(article, user);
 
         when(articleRepository.findBySlug(eq(article.getSlug()))).thenReturn(Optional.of(article));
@@ -168,7 +167,6 @@ public class ArticleApiTest extends TestWithCurrentUser {
         String title = "new-title";
         String body = "new body";
         String description = "new description";
-        Map<String, Object> updateParam = prepareUpdateParam(title, body, description);
 
         User anotherUser = new User("test@test.com", "test", "123123", "", "");
 

src/test/java/io/spring/api/ArticleFavoriteApiTest.java

@@ -46,13 +46,12 @@ public class ArticleFavoriteApiTest extends TestWithCurrentUser {
     private ArticleQueryService articleQueryService;
 
     private Article article;
-    private User anotherUser;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         RestAssuredMockMvc.mockMvc(mvc);
-        anotherUser = new User("other@test.com", "other", "123", "", "");
+        User anotherUser = new User("other@test.com", "other", "123", "", "");
         article = new Article("title", "desc", "body", new String[]{"java"}, anotherUser.getId());
         when(articleRepository.findBySlug(eq(article.getSlug()))).thenReturn(Optional.of(article));
         ArticleData articleData = new ArticleData(

src/test/java/io/spring/api/ProfileApiTest.java

@@ -5,7 +5,6 @@ import io.spring.JacksonCustomizations;
 import io.spring.api.security.WebSecurityConfig;
 import io.spring.application.ProfileQueryService;
 import io.spring.application.data.ProfileData;
-import io.spring.core.article.Article;
 import io.spring.core.user.FollowRelation;
 import io.spring.core.user.User;
 import org.junit.Before;
@@ -27,7 +26,6 @@ import static org.mockito.Mockito.when;
 @WebMvcTest(ProfileApi.class)
 @Import({WebSecurityConfig.class, JacksonCustomizations.class})
 public class ProfileApiTest extends TestWithCurrentUser {
-    private Article article;
     private User anotherUser;
 
     @Autowired

src/test/java/io/spring/api/TestWithCurrentUser.java

@@ -13,7 +13,7 @@ import java.util.Optional;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
-abstract class TestWithCurrentUser extends ApiTestBase {
+abstract class TestWithCurrentUser {
     @MockBean
     protected UserRepository userRepository;
 
@@ -46,10 +46,8 @@ abstract class TestWithCurrentUser extends ApiTestBase {
         when(jwtService.getSubFromToken(eq(token))).thenReturn(Optional.of(user.getId()));
     }
 
-    @Override
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         userFixture();
     }
 }

src/test/java/io/spring/api/UsersApiTest.java

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.when;
 
 @WebMvcTest(UsersApi.class)
 @Import({WebSecurityConfig.class, UserQueryService.class, NaiveEncryptService.class, JacksonCustomizations.class})
-public class UsersApiTest extends ApiTestBase {
+public class UsersApiTest {
     @Autowired
     private MockMvc mvc;
 

src/test/java/io/spring/infrastructure/article/MyBatisArticleRepositoryTest.java

@@ -31,13 +31,12 @@ public class MyBatisArticleRepositoryTest {
     @Autowired
     private UserRepository userRepository;
 
-    private User user;
     private Article article;
 
 
     @Before
     public void setUp() throws Exception {
-        user = new User("aisensiy@gmail.com", "aisensiy", "123", "bio", "default");
+        User user = new User("aisensiy@gmail.com", "aisensiy", "123", "bio", "default");
         userRepository.save(user);
         article = new Article("test", "desc", "body", new String[]{"java", "spring"}, user.getId());
     }