fix tag counting

Raysmond · Raysmond · commit 7ec7900b8011 · 2015-10-10T17:59:03.000+08:00
diff --git a/src/main/java/com/raysmond/blog/repositories/PostRepository.java b/src/main/java/com/raysmond/blog/repositories/PostRepository.java
@@ -29,7 +29,11 @@ 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();
+    @Query("SELECT t.name, count(p) as tag_count from Post p " +
+            "INNER JOIN p.tags t " +
+            "WHERE p.postStatus = :status " +
+            "GROUP BY t.id " +
+            "ORDER BY tag_count DESC")
+    List<Map<String, Long>> countPostsByTags(@Param("status") PostStatus status);
 }
 
diff --git a/src/main/java/com/raysmond/blog/services/AppSetting.java b/src/main/java/com/raysmond/blog/services/AppSetting.java
@@ -17,12 +17,10 @@ public class AppSetting {
     private String siteName = "SpringBlog";
     private String siteSlogan = "An interesting place to discover";
     private Integer pageSize = 5;
-    // other settings
 
     public static final String SITE_NAME = "site_name";
     public static final String SITE_SLOGAN = "site_slogan";
     public static final String PAGE_SIZE = "page_size";
-    // other setting keys
 
     @Autowired
     public AppSetting(SettingService settingService){
diff --git a/src/main/java/com/raysmond/blog/services/PostService.java b/src/main/java/com/raysmond/blog/services/PostService.java
@@ -207,6 +207,6 @@ public Page<Post> findPostsByTag(String tagName, int page, int pageSize){
     public List<Map<String, Long>> countPostsByTags(){
         logger.debug("Count posts group by tags.");
 
-        return postRepository.countPostsByTags();
+        return postRepository.countPostsByTags(PostStatus.PUBLISHED);
     }
 }
diff --git a/src/main/java/com/raysmond/blog/services/SettingService.java b/src/main/java/com/raysmond/blog/services/SettingService.java
@@ -6,7 +6,7 @@
  * @author Raysmond<i@raysmond.com>
  */
 public interface SettingService {
-    public Serializable get(String key);
-    public Serializable get(String key, Serializable defaultValue);
-    public void put(String key, Serializable value);
+    Serializable get(String key);
+    Serializable get(String key, Serializable defaultValue);
+    void put(String key, Serializable value);
 }
diff --git a/src/main/java/com/raysmond/blog/services/TagService.java b/src/main/java/com/raysmond/blog/services/TagService.java
@@ -57,9 +57,7 @@ public void deleteTag(Tag tag){
 
     @Cacheable(value = CACHE_NAME_TAGS, key = "#root.method.name")
     public List<Tag> getAllTags(){
-        List<Tag> tags = tagRepository.findAll();
-
-        return tags;
+        return tagRepository.findAll();
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,6 @@ public Page<Post> findPostsByTag(String tagName, int page, int pageSize){`
`207`	`207`	`public List<Map<String, Long>> countPostsByTags(){`
`208`	`208`	`logger.debug("Count posts group by tags.");`
`209`	`209`
`210`		`- return postRepository.countPostsByTags();`
	`210`	`+ return postRepository.countPostsByTags(PostStatus.PUBLISHED);`
`211`	`211`	`}`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,7 @@ public void deleteTag(Tag tag){`
`57`	`57`
`58`	`58`	`@Cacheable(value = CACHE_NAME_TAGS, key = "#root.method.name")`
`59`	`59`	`public List<Tag> getAllTags(){`
`60`		`- List<Tag> tags = tagRepository.findAll();`
`61`		`-`
`62`		`- return tags;`
	`60`	`+ return tagRepository.findAll();`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`}`