#20: Add shortcut for posts

Author: proshin-roman

src/main/java/org/proshin/blog/dynamodb/DynamoPost.java

@@ -6,18 +6,19 @@
 import com.amazonaws.services.dynamodbv2.document.Table;
 import java.time.LocalDateTime;
 import static java.time.LocalDateTime.now;
+import lombok.EqualsAndHashCode;
 import lombok.NonNull;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.proshin.blog.DateToString;
 import org.proshin.blog.StringToDate;
 import org.proshin.blog.Url;
 import org.proshin.blog.model.PersistentPost;
 
+@EqualsAndHashCode(exclude = "posts")
 public class DynamoPost implements PersistentPost {
     private final Table posts;
     private final Url url;
     private final String title;
+    private final String shortcut;
     private final LocalDateTime creationDate;
     private final LocalDateTime publicationDate;
     private final boolean published;
@@ -27,18 +28,20 @@ public DynamoPost(@NonNull Table posts, @NonNull Item item) {
         this(posts,
                 new Url(item.getString("url")),
                 item.getString("title"),
+                item.getString("shortcut"),
                 new StringToDate(item.getString("creation_date")).toLocalDateTime(),
                 new StringToDate(item.getString("publication_date")).toLocalDateTime(),
                 item.getBOOL("published"),
                 item.getString("content"));
     }
 
-    public DynamoPost(@NonNull Table posts, @NonNull Url url, @NonNull String title,
+    public DynamoPost(@NonNull Table posts, @NonNull Url url, @NonNull String title, @NonNull String shortcut,
             @NonNull LocalDateTime creationDate, @NonNull LocalDateTime publicationDate, boolean published,
             @NonNull String content) {
         this.posts = posts;
         this.url = url;
         this.title = title;
+        this.shortcut = shortcut;
         this.creationDate = creationDate;
         this.publicationDate = publicationDate;
         this.published = published;
@@ -55,6 +58,11 @@ public String title() {
         return title;
     }
 
+    @Override
+    public String shortcut() {
+        return shortcut;
+    }
+
     @Override
     public LocalDateTime creationDate() {
         return creationDate;
@@ -78,13 +86,13 @@ public String content() {
     @NonNull
     @Override
     public PersistentPost publish() {
-        return new DynamoPost(posts, url, title, creationDate, now(), true, content);
+        return new DynamoPost(posts, url, title, shortcut, creationDate, now(), true, content);
     }
 
     @NonNull
     @Override
     public PersistentPost unpublish() {
-        return new DynamoPost(posts, url, title, creationDate, publicationDate, false, content);
+        return new DynamoPost(posts, url, title, shortcut, creationDate, publicationDate, false, content);
     }
 
     @NonNull
@@ -94,6 +102,7 @@ public PersistentPost persist() {
                 new Item()
                         .withPrimaryKey(new PrimaryKey("url", url.decoded()))
                         .with("title", title)
+                        .with("shortcut", shortcut)
                         .with("creation_date", new DateToString(creationDate).toString())
                         .with("publication_date", new DateToString(publicationDate).toString())
                         .with("published", published)
@@ -107,6 +116,7 @@ public PersistentPost persist() {
     public PersistentPost update() {
         posts.updateItem(new PrimaryKey("url", url.decoded()),
                 new AttributeUpdate("title").put(title),
+                new AttributeUpdate("shortcut").put(shortcut),
                 new AttributeUpdate("creation_date")
                         .put(new DateToString(creationDate).toString()),
                 new AttributeUpdate("publication_date")
@@ -120,36 +130,4 @@ public PersistentPost update() {
     public void delete() {
         posts.deleteItem(new PrimaryKey("url", url.decoded()));
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        DynamoPost that = (DynamoPost) o;
-
-        return new EqualsBuilder()
-                .append(published, that.published)
-                .append(url, that.url)
-                .append(title, that.title)
-                .append(creationDate, that.creationDate)
-                .append(publicationDate, that.publicationDate)
-                .append(content, that.content)
-                .isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37)
-                .append(url)
-                .append(title)
-                .append(creationDate)
-                .append(publicationDate)
-                .append(published)
-                .append(content)
-                .toHashCode();
-    }
 }

src/main/java/org/proshin/blog/dynamodb/DynamoPosts.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Optional;
 import lombok.NonNull;
+import static org.apache.commons.lang3.StringUtils.left;
 import org.proshin.blog.Url;
 import org.proshin.blog.model.PersistentPost;
 import org.proshin.blog.model.PersistentPosts;
@@ -64,7 +65,7 @@ public List<PersistentPost> page(int offset, int count, boolean publishedOnly) {
     @NonNull
     @Override
     public PersistentPost newPost(@NonNull Url url, @NonNull String title, @NonNull String content) {
-        return new DynamoPost(table, url, title, now(), now(), false, content)
+        return new DynamoPost(table, url, title, left(content, 512), now(), now(), false, content)
                 .persist();
     }
 

src/main/java/org/proshin/blog/model/Post.java

@@ -8,6 +8,8 @@ public interface Post {
 
     String title();
 
+    String shortcut();
+
     LocalDateTime creationDate();
 
     LocalDateTime publicationDate();

src/main/java/org/proshin/blog/page/admin/AdminPostsPagesController.java

@@ -62,6 +62,7 @@ public ModelAndView edit(@PathVariable("url") Url url) {
                         new ChangedPost(
                                 post.url().decoded(),
                                 post.title(),
+                                post.shortcut(),
                                 post.creationDate(),
                                 post.publicationDate(),
                                 post.published(),
@@ -102,7 +103,7 @@ public ModelAndView save(@PathVariable("originalUrl") Url originalUrl,
         }
         Url newUrl = new Url(post.getUrl());
         DynamoPost dynamoPost =
-                new DynamoPost(posts.getTable(), newUrl, post.getTitle(), post.getCreationDate(),
+                new DynamoPost(posts.getTable(), newUrl, post.getTitle(), post.getShortcut(), post.getCreationDate(),
                         post.getPublicationDate(), post.isPublished(), post.getContent());
         if (!newUrl.equals(originalUrl)) {
             dynamoPost.persist();
@@ -124,6 +125,8 @@ public static class ChangedPost {
         private String url;
         @NotBlank
         private String title;
+        @NotBlank
+        private String shortcut;
         private LocalDateTime creationDate;
         private LocalDateTime publicationDate;
         private boolean published;

src/test/java/org/proshin/blog/dynamodb/DynamoPostsTest.java

@@ -24,8 +24,9 @@ public class DynamoPostsTest extends AbstractIntegrationTest {
     @Test
     public void testSelectOne_findExistingPost() {
         PersistentPost post =
-                new DynamoPost(posts.getTable(), new Url("url"), "Published post", now(), now(), true, "Some content")
-                        .persist();
+                new DynamoPost(posts.getTable(), new Url("url"), "Published post", "Shortcut", now(), now(), true,
+                        "Some content")
+                                .persist();
         assertThat(posts.postByUrl(post.url()).orElseThrow(() -> new PostNotFoundException(new Url("url"))), is(post));
     }
 
@@ -38,11 +39,13 @@ public void testSelectOne_findNonExistingPost() {
     @Test
     public void testThatPublishedAreFilteredOut() {
         Url publishedUrl =
-                new DynamoPost(posts.getTable(), new Url("url-1"), "Published post", now(), now(), true, "Some content")
-                        .persist()
-                        .url();
+                new DynamoPost(posts.getTable(), new Url("url-1"), "Published post", "Shortcut", now(), now(), true,
+                        "Some content")
+                                .persist()
+                                .url();
         Url nonPublishedUrl =
-                new DynamoPost(posts.getTable(), new Url("url-2"), "NOT published post", now(), now(), false,
+                new DynamoPost(posts.getTable(), new Url("url-2"), "NOT published post", "Shortcut", now(), now(),
+                        false,
                         "Some content")
                                 .persist()
                                 .url();
@@ -77,8 +80,9 @@ public void testCreate() {
     @Test(expected = PostNotFoundException.class)
     public void testDelete() {
         PersistentPost post =
-                new DynamoPost(posts.getTable(), new Url("url"), "Published post", now(), now(), true, "Some content")
-                        .persist();
+                new DynamoPost(posts.getTable(), new Url("url"), "Published post", "Shortcut", now(), now(), true,
+                        "Some content")
+                                .persist();
 
         post.delete();
 

src/test/java/org/proshin/blog/page/GuestPagesControllerIntegrationTest.java

@@ -43,7 +43,7 @@ public void testThatNonExistingPostReturnsNotFound() throws Exception {
     public void testThatNonPublishedPostIsNotAvailableForGuests() throws Exception {
         PersistentPost post =
                 new DynamoPost(dynamoDB.getTable(DynamoPosts.TABLE_NAME),
-                        new Url("url"), "Some test post", now(), now(), false, "Just a piece of content")
+                        new Url("url"), "Some test post", "Shortcut", now(), now(), false, "Just a piece of content")
                                 .persist();
         // when it's not published
         post.unpublish().persist();

src/test/java/org/proshin/blog/page/GuestPagesControllerTest.java

@@ -25,7 +25,8 @@ public class GuestPagesControllerTest {
     public void testThatIndexPageShowsFirstArticles() throws Exception {
         List<PersistentPost> postsForIndexPage =
                 singletonList(
-                        new DynamoPost(postsTable, new Url("10"), "Test post #10", now(), now(), true, "content"));
+                        new DynamoPost(postsTable, new Url("10"), "Test post #10", "Shortcut", now(), now(), true,
+                                "content"));
 
         when(posts.page(0, 10, true))
                 .thenReturn(postsForIndexPage);
@@ -39,7 +40,7 @@ public void testThatIndexPageShowsFirstArticles() throws Exception {
     @Test
     public void testThatViewPostShowsTheRequestedPost() throws Exception {
         PersistentPost requestedPost =
-                new DynamoPost(postsTable, new Url("10"), "Test post #10", now(), now(), true,
+                new DynamoPost(postsTable, new Url("10"), "Test post #10", "Shortcut", now(), now(), true,
                         "*markdown* content");
         when(posts.postByUrl(new Url("10")))
                 .thenReturn(Optional.of(requestedPost));

src/test/java/org/proshin/blog/page/admin/AdminPostsPagesControllerTest.java

@@ -133,6 +133,7 @@ public void testSave() throws Exception {
                                 .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                                 .param("url", post.url().decoded())
                                 .param("title", "New title")
+                                .param("shortcut", "New shortcut")
                                 .param("content", "New content")
                                 .param("creationDate", "2018-01-09T13:23")
                                 .param("publicationDate", "2018-01-07T13:23")
@@ -142,6 +143,7 @@ public void testSave() throws Exception {
 
         posts.postByUrl(post.url()).ifPresent(changedPost -> {
             assertThat(changedPost.title(), is("New title"));
+            assertThat(changedPost.shortcut(), is("New shortcut"));
             assertThat(changedPost.content(), is("New content"));
             assertThat(changedPost.creationDate(),
                     is(new StringToDate("2018-01-09T13:23").toLocalDateTime()));