refactor dto creations

Author: akirasosa

src/main/java/com/myapp/dto/PostDTO.java

@@ -36,8 +36,4 @@ public static PostDTO newInstance(Micropost post, Boolean isMyPost) {
         return PostDTO.newInstance(post, null, isMyPost);
     }
 
-    public static PostDTO newInstance(Micropost post) {
-        return PostDTO.newInstance(post, null, null);
-    }
-
 }

src/main/java/com/myapp/dto/RelatedUserDTO.java

@@ -19,19 +19,6 @@ public class RelatedUserDTO {
     private final Boolean isMyself;
     private final Boolean isFollowedByMe;
 
-    public static RelatedUserDTO newInstance(User user, Relationship relationship, UserStats userStats, Boolean isMyself) {
-        final String avatarHash = Utils.md5(user.getUsername());
-
-        return RelatedUserDTO.builder()
-                .id(user.getId())
-                .name(user.getName())
-                .avatarHash(avatarHash)
-                .isMyself(isMyself)
-                .userStats(userStats)
-                .relationshipId(relationship.getId())
-                .build();
-    }
-
     public static RelatedUserDTOBuilder builder2(User user, Relationship relationship, UserStats userStats) {
         final String avatarHash = Utils.md5(user.getUsername());
 

src/main/java/com/myapp/dto/UserDTO.java

@@ -19,28 +19,8 @@ public class UserDTO {
     private final Boolean isMyself;
     private final Boolean isFollowedByMe;
 
-    public String getEmail() {
-        return Optional.ofNullable(isMyself)
-                        .filter(Boolean::booleanValue)
-                        .map(b -> this.email)
-                        .orElse(null);
-    }
-
-    public static UserDTO newInstance(User user, UserStats userStats, Boolean isMyself) {
-        final String avatarHash = Utils.md5(user.getUsername());
-
-        return UserDTO.builder()
-                .id(user.getId())
-                .email(user.getUsername())
-                .name(user.getName())
-                .avatarHash(avatarHash)
-                .userStats(userStats)
-                .isMyself(isMyself)
-                .build();
-    }
-
     public static UserDTO newInstance(User user) {
-        return UserDTO.newInstance(user, null, null);
+        return UserDTO.builder2(user, null).build();
     }
 
     public static UserDTOBuilder builder2(User user, UserStats userStats) {
@@ -54,4 +34,12 @@ public static UserDTOBuilder builder2(User user, UserStats userStats) {
                 .userStats(userStats);
     }
 
+    @SuppressWarnings("unused")
+    public String getEmail() {
+        return Optional.ofNullable(isMyself)
+                .filter(Boolean::booleanValue)
+                .map(b -> this.email)
+                .orElse(null);
+    }
+
 }

src/test/groovy/com/myapp/controller/UserControllerTest.groovy

@@ -126,7 +126,7 @@ class UserControllerTest extends BaseControllerTest {
         userService.findOne(1) >> {
             User user = new User(id: 1, username: "test1@test.com", password: "secret", name: "test")
             UserStats userStats = new UserStats(3, 2, 1)
-            return Optional.of(UserDTO.newInstance(user, userStats, null))
+            return Optional.of(UserDTO.builder2(user, userStats).build())
         }
 
         when:
@@ -166,7 +166,11 @@ class UserControllerTest extends BaseControllerTest {
         userService.findMe() >> {
             User user = new User(id: 1, username: "test1@test.com", password: "secret", name: "test")
             UserStats userStats = new UserStats(3, 2, 1)
-            return Optional.of(UserDTO.newInstance(user, userStats, true))
+            Optional.of(UserDTO.builder2(user, userStats)
+                    .isMyself(true)
+                    .isFollowedByMe(false)
+                    .build()
+            )
         }
 
         when:
@@ -179,7 +183,7 @@ class UserControllerTest extends BaseControllerTest {
             andExpect(jsonPath('$.email', is("test1@test.com")))
             andExpect(jsonPath('$.avatarHash', is("94fba03762323f286d7c3ca9e001c541")))
             andExpect(jsonPath('$.isMyself', is(true)))
-            andExpect(jsonPath('$.isFollowedByMe', nullValue()))
+            andExpect(jsonPath('$.isFollowedByMe', is(false)))
             andExpect(jsonPath('$.userStats').exists())
             andExpect(jsonPath('$.userStats.micropostCnt', is(3)))
             andExpect(jsonPath('$.userStats.followingCnt', is(2)))

src/test/groovy/com/myapp/controller/UserMicropostControllerTest.groovy

@@ -35,7 +35,7 @@ class UserMicropostControllerTest extends BaseControllerTest {
         User user = new User(id: 1, username: "akira@test.com", password: "secret", name: "akira")
         micropostService.findByUser(1, new PageParams()) >> (0..1).collect {
             Micropost post = new Micropost(id: it, content: "content${it}", user: user)
-            return PostDTO.newInstance(post)
+            return PostDTO.newInstance(post, null)
         }
 
 

src/test/groovy/com/myapp/controller/UserRelationshipControllerTest.groovy

@@ -39,8 +39,8 @@ class UserRelationshipControllerTest extends BaseControllerTest {
         Relationship r1 = new Relationship(id: 1, follower: follower, followed: followed1)
         Relationship r2 = new Relationship(id: 2, follower: follower, followed: followed2)
         relationshipService.findFollowings(follower.id, new PageParams()) >> [
-                RelatedUserDTO.newInstance(followed1, r1, null, null),
-                RelatedUserDTO.newInstance(followed2, r2, null, null),
+                RelatedUserDTO.builder2(followed1, r1, null).build(),
+                RelatedUserDTO.builder2(followed2, r2, null).build(),
         ]
 
         when:
@@ -66,8 +66,8 @@ class UserRelationshipControllerTest extends BaseControllerTest {
         Relationship r1 = new Relationship(id: 1, follower: follower1, followed: followed)
         Relationship r2 = new Relationship(id: 2, follower: follower2, followed: followed)
         relationshipService.findFollowers(followed.id, new PageParams()) >> [
-                RelatedUserDTO.newInstance(follower1, r1, null, null),
-                RelatedUserDTO.newInstance(follower2, r2, null, null),
+                RelatedUserDTO.builder2(follower1, r1, null).build(),
+                RelatedUserDTO.builder2(follower2, r2, null).build(),
         ]
 
         when: