tags counting page

Raysmond · Raysmond · commit 19fcbeaa03f4 · 2015-10-08T21:57:32.000+08:00
diff --git a/src/main/java/com/raysmond/blog/controllers/TagController.java b/src/main/java/com/raysmond/blog/controllers/TagController.java
@@ -3,6 +3,8 @@
 import com.raysmond.blog.error.NotFoundException;
 import com.raysmond.blog.models.Post;
 import com.raysmond.blog.models.Tag;
+import com.raysmond.blog.repositories.PostRepository;
+import com.raysmond.blog.repositories.TagRepository;
 import com.raysmond.blog.services.AppSetting;
 import com.raysmond.blog.services.PostService;
 import com.raysmond.blog.services.TagService;
@@ -15,6 +17,9 @@
 import static org.springframework.web.bind.annotation.RequestMethod.*;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author Raysmond<i@raysmond.com>.
  */
@@ -31,9 +36,13 @@ public class TagController {
     private AppSetting appSetting;
 
     @RequestMapping(value = "", method = GET)
-    public String index(){
+    public String index(Model model){
         // TODO show all tags
 
+        List<Map<String, Long>> counts = postService.countPostsByTags();
+
+        model.addAttribute("tags", counts);
+
         return "tags/index";
     }
 
diff --git a/src/main/java/com/raysmond/blog/repositories/PostRepository.java b/src/main/java/com/raysmond/blog/repositories/PostRepository.java
@@ -7,11 +7,10 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.Map;
 
 import java.util.List;
 
@@ -29,5 +28,8 @@ public interface PostRepository extends JpaRepository<Post, Long> {
 
     @Query("SELECT p FROM Post p INNER JOIN p.tags t WHERE t.name = :tag")
     Page<Post> findByTag(@Param("tag") String tag, Pageable pageable);
+
+    @Query("SELECT t.name, count(p) as count from Post p INNER JOIN p.tags t GROUP BY t.id")
+    List<Map<String, Long>> countPostsByTags();
 }
 
diff --git a/src/main/java/com/raysmond/blog/services/PostService.java b/src/main/java/com/raysmond/blog/services/PostService.java
@@ -40,6 +40,7 @@ public class PostService {
     public static final String CACHE_NAME_ARCHIVE = CACHE_NAME + ".archive";
     public static final String CACHE_NAME_PAGE = CACHE_NAME + ".page";
     public static final String CACHE_NAME_TAGS = CACHE_NAME + ".tag";
+    public static final String CACHE_NAME_COUNTS = CACHE_NAME + ".counts_tags";
 
     private static final Logger logger = LoggerFactory.getLogger(PostService.class);
 
@@ -71,7 +72,8 @@ public Post getPublishedPostByPermalink(String permalink){
 
     @Caching(evict = {
             @CacheEvict(value = CACHE_NAME_ARCHIVE, allEntries = true),
-            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true)
+            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true),
+            @CacheEvict(value = CACHE_NAME_COUNTS,  allEntries = true)
     })
     public Post createPost(Post post) {
         if (post.getPostFormat() == PostFormat.MARKDOWN) {
@@ -86,7 +88,8 @@ public Post createPost(Post post) {
             @CacheEvict(value = CACHE_NAME, key = "#post.permalink", condition = "#post.permalink != null"),
             @CacheEvict(value = CACHE_NAME_TAGS,  key = "#post.id.toString().concat('-tags')"),
             @CacheEvict(value = CACHE_NAME_ARCHIVE, allEntries = true),
-            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true)
+            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true),
+            @CacheEvict(value = CACHE_NAME_COUNTS,  allEntries = true)
     })
     public Post updatePost(Post post) {
         if (post.getPostFormat() == PostFormat.MARKDOWN) {
@@ -101,7 +104,8 @@ public Post updatePost(Post post) {
             @CacheEvict(value = CACHE_NAME, key = "#post.permalink", condition = "#post.permalink != null"),
             @CacheEvict(value = CACHE_NAME_TAGS, key = "#post.id.toString().concat('-tags')"),
             @CacheEvict(value = CACHE_NAME_ARCHIVE, allEntries = true),
-            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true)
+            @CacheEvict(value = CACHE_NAME_PAGE, allEntries = true),
+            @CacheEvict(value = CACHE_NAME_COUNTS,  allEntries = true)
     })
     public void deletePost(Post post) {
         postRepository.delete(post);
@@ -173,6 +177,7 @@ public Set<Tag> parseTagNames(String tagNames){
         Set<Tag> tags = new HashSet<>();
 
         if (tagNames != null && !tagNames.isEmpty()){
+            tagNames = tagNames.toLowerCase();
             String[] names = tagNames.split("\\s*,\\s*");
             for (String name : names){
                 tags.add(tagService.findOrCreateByName(name));
@@ -193,7 +198,15 @@ public String getTagNames(Set<Tag> tags){
         return names.toString();
     }
 
+    // cache or not?
     public Page<Post> findPostsByTag(String tagName, int page, int pageSize){
         return postRepository.findByTag(tagName, new PageRequest(page, pageSize, Sort.Direction.DESC, "createdAt"));
     }
+
+    @Cacheable(value = CACHE_NAME_COUNTS, key = "#root.method.name")
+    public List<Map<String, Long>> countPostsByTags(){
+        logger.debug("Count posts group by tags.");
+
+        return postRepository.countPostsByTags();
+    }
 }
diff --git a/src/main/resources/resources/css/theme.css b/src/main/resources/resources/css/theme.css
@@ -13,7 +13,6 @@ body {
 
 /* override typo css */
 .typo a{
-	border-bottom: none;
 	color: #337ab7;
 }
 
@@ -166,6 +165,10 @@ ul.archive-list li span.month{
 	display: inline-block;
 }
 
+ul.tags li{
+	margin: 5px 10px;
+}
+
 .footer{
 	text-align: center;
 	margin-bottom: 50px;
diff --git a/src/main/resources/resources/vendors/typo.css-2.1.2/typo.min.css b/src/main/resources/resources/vendors/typo.css-2.1.2/typo.min.css
diff --git a/src/main/resources/templates/layout/navbar.jade b/src/main/resources/templates/layout/navbar.jade
@@ -6,5 +6,6 @@ nav.navbar.navbar-bright
         li.active
           a(href="/") Home
         li: a(href="/posts/archive") Archive
+        li: a(href="/tags") Tags
         li: a(href="/about") About
     
diff --git a/src/main/resources/templates/tags/index.jade b/src/main/resources/templates/tags/index.jade
@@ -0,0 +1,15 @@
+extends ../layout/app
+
+block title
+  | Tags
+
+block page_title
+  h1 Tags
+
+block content
+  .post
+    .content
+      ul.tags
+        for tag in tags
+          li: a.btn.btn-default(href="/tags/#{tag[0]}") #{tag[0]}(#{tag[1]})
+      hr
