added chart filters into admin dashboard

Author: bvn13

README.md

@@ -21,9 +21,14 @@ SpringBlog is powered by many powerful frameworks and third-party projects:
 - [Prism](http://prismjs.com) - syntax highlighter
 - [HighCharts](https://www.highcharts.com/) - charts JS-library
 - [TelegramBots](https://github.com/rubenlagus/TelegramBots) - telegram bot API for sending announcements of posts into Telegram Channel
+- [Date Range Picker](http://www.daterangepicker.com) - A JavaScript component for choosing date ranges. Designed to work with the Bootstrap CSS framework.
 
 ## Changelog
 
+#### 2017-12-25
+
+* Added chart filters into admin dashboard using [Date Range Picker](http://www.daterangepicker.com)
+
 #### 2017-12-22 - SpringBlog version 2.8.0 is released
 
 * __SpringBoot updated upto 1.4.9__

build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'org.springframework.boot'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = '2.8.0'
+version = '2.8.1'
 
 repositories {
     mavenCentral()

src/main/java/com/raysmond/blog/admin/controllers/AdminController.java

@@ -4,6 +4,7 @@
 import com.raysmond.blog.models.dto.VisitStatDTO;
 import com.raysmond.blog.models.dto.VisitsStatsChartDTO;
 import com.raysmond.blog.services.AppSetting;
+import com.raysmond.blog.services.PostService;
 import com.raysmond.blog.services.StatisticsService;
 import com.raysmond.blog.support.web.MessageHelper;
 import com.raysmond.blog.utils.DTOUtil;
@@ -32,9 +33,13 @@ public class AdminController {
     @Autowired
     private AppSetting appSetting;
 
+    @Autowired
+    private PostService postService;
+
 
     @RequestMapping("")
-    public String index() {
+    public String index(Model model) {
+        model.addAttribute("posts", postService.getPostsIdTitleList());
         return "admin/home/index";
     }
 

src/main/java/com/raysmond/blog/admin/controllers/NotificatorController.java

@@ -40,6 +40,9 @@ public class NotificatorController {
             try {
                 notificator.announcePost(post);
                 return new PostAnnouncementDTO(false);
+            } catch (IllegalArgumentException iae) {
+                iae.printStackTrace();
+                return new PostAnnouncementDTO(true, iae.getMessage());
             } catch (TelegramApiException e) {
                 e.printStackTrace();
                 return new PostAnnouncementDTO(true, "Error occures");

src/main/java/com/raysmond/blog/admin/controllers/StatisticsController.java

@@ -1,13 +1,16 @@
 package com.raysmond.blog.admin.controllers;
 
+import com.raysmond.blog.models.dto.PostsIdListDTO;
 import com.raysmond.blog.models.dto.VisitsStatsChartDTO;
 import com.raysmond.blog.services.StatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 /**
  * Created by bvn13 on 20.12.2017.
@@ -20,12 +23,20 @@ public class StatisticsController {
     private StatisticsService statisticsService;
 
 
-    @RequestMapping(value = "/visits", produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "/visits", produces = MediaType.APPLICATION_JSON_VALUE)
     public @ResponseBody VisitsStatsChartDTO getVisitsChart() {
-
-        VisitsStatsChartDTO chart = statisticsService.getVisitsStatsChartData();
+        VisitsStatsChartDTO chart = statisticsService.getFullVisitsStatsChartData();
         return chart;
+    }
 
+    @PostMapping(value = "/visits", produces = MediaType.APPLICATION_JSON_VALUE)
+    public @ResponseBody VisitsStatsChartDTO getVisitsChartByPeriodAndPostsIdList(
+            @RequestParam @DateTimeFormat(pattern="dd-MM-yyyy") Date start,
+            @RequestParam @DateTimeFormat(pattern="dd-MM-yyyy") Date end,
+            @RequestBody PostsIdListDTO postsDto)
+    {
+        VisitsStatsChartDTO chart = statisticsService.getChartDataByPeriodAndPostsList(start, end, postsDto.getIds());
+        return chart;
     }
 
 }

src/main/java/com/raysmond/blog/models/dto/PostIdTitleDTO.java

@@ -0,0 +1,14 @@
+package com.raysmond.blog.models.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * Created by bvn13 on 25.12.2017.
+ */
+@Data
+@AllArgsConstructor
+public class PostIdTitleDTO {
+    private Long id;
+    private String title;
+}

src/main/java/com/raysmond/blog/models/dto/PostsIdListDTO.java

@@ -0,0 +1,13 @@
+package com.raysmond.blog.models.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by bvn13 on 25.12.2017.
+ */
+@Data
+public class PostsIdListDTO {
+    private List<Integer> ids;
+}

src/main/java/com/raysmond/blog/notificators/Notificator.java

@@ -20,7 +20,10 @@ public class Notificator {
     private TelegramBotManager telegramBot;
 
 
-    public void announcePost(Post post) throws TelegramApiException {
+    public void announcePost(Post post) throws IllegalArgumentException, TelegramApiException {
+        if (post == null || post.getAnnouncement().isEmpty()) {
+            throw new IllegalArgumentException("Nothing to announce");
+        }
         String postUrl = appSetting.getMainUriStripped()+"/posts/"+(post.getPermalink().isEmpty() ? post.getId() : post.getPermalink());
         String message = String.format(
                 "*%s*\r\n\n" +

src/main/java/com/raysmond/blog/services/PostService.java

@@ -5,6 +5,7 @@
 import com.raysmond.blog.models.Post;
 import com.raysmond.blog.models.SeoPostData;
 import com.raysmond.blog.models.Tag;
+import com.raysmond.blog.models.dto.PostIdTitleDTO;
 import com.raysmond.blog.models.support.PostFormat;
 import com.raysmond.blog.models.support.PostStatus;
 import com.raysmond.blog.models.support.PostType;
@@ -221,6 +222,10 @@ public List<Post> getAllPublishedPosts() {
         return this.postRepository.findAllByPostTypeAndPostStatus(PostType.POST, PostStatus.PUBLISHED);
     }
 
+    public List<Post> getAllPosts() {
+        return this.postRepository.findAll();
+    }
+
     public Post createAboutPage() {
         logger.debug("Create default about page");
 
@@ -315,4 +320,18 @@ private void saveSeoData(Post post) {
         }
     }
 
+    public List<PostIdTitleDTO> getPostsIdTitleList() {
+        List<PostIdTitleDTO> result = new ArrayList<>();
+        this.getAllPosts().forEach(p -> {
+            result.add(new PostIdTitleDTO(p.getId(), p.getTitle()));
+        });
+        Collections.sort(result, new Comparator<PostIdTitleDTO>() {
+            @Override
+            public int compare(PostIdTitleDTO o1, PostIdTitleDTO o2) {
+                return Long.compare(o2.getId(), o1.getId());
+            }
+        });
+        return result;
+    }
+
 }

src/main/java/com/raysmond/blog/services/StatisticsService.java

@@ -44,8 +44,35 @@ public List<Object> getVisitsStats() {
         return result;
     }
 
-    public VisitsStatsChartDTO getVisitsStatsChartData() {
+    public List<Object> getVisitsStatsByPeriodAndPostsList(Date periodStart, Date periodEnd, List<Integer> postsIdList) {
 
+        Session session = (Session) this.entityManager.getDelegate();
+        SQLQuery query = session.createSQLQuery(
+                "select data.dt, data.post_id, data.title, data.count from (" +
+                        "select date_trunc('day', v.createdat) as dt, v.post_id, p.title, count(distinct v.clientip) as count " +
+                        "from visits as v " +
+                        "left join seo_robots_agents as ra " +
+                        "on case when ra.isregexp then lower(nullif(v.useragent,'')) ~* lower(ra.useragent) " +
+                        "else lower(nullif(v.useragent,'')) like concat('%',lower(ra.useragent),'%') end " +
+                        "inner join posts as p " +
+                        "on v.post_id = p.id " +
+                        "where v.isadmin = false " +
+                        "and ra.id isnull " +
+                        "group by date_trunc('day', v.createdat), v.post_id, p.title " +
+                        ") as data " +
+                        "where data.dt >= :periodStart and data.dt <= :periodEnd and data.post_id in (:postsIdList)"
+        );
+
+        query.setParameter("periodStart", periodStart);
+        query.setParameter("periodEnd", periodEnd);
+        query.setParameterList("postsIdList", postsIdList);
+
+        List<Object> result = query.list();
+
+        return result;
+    }
+
+    private VisitsStatsChartDTO convertDataToChart(List<Object> list) {
         VisitsStatsChartDTO chart = new VisitsStatsChartDTO();
         chart.getChart().setType("line");
         chart.getTitle().setText("Visits Statistics");
@@ -59,7 +86,6 @@ public VisitsStatsChartDTO getVisitsStatsChartData() {
         Map<String, Map<Date, Long>> data = new HashMap<>();
 
 
-        List<Object> list = getVisitsStats();
         for (Object vs : list) {
             Object[] vsa = (Object[]) vs;
 
@@ -104,4 +130,14 @@ public VisitsStatsChartDTO getVisitsStatsChartData() {
         return chart;
     }
 
+    public VisitsStatsChartDTO getFullVisitsStatsChartData() {
+        List<Object> list = getVisitsStats();
+        return convertDataToChart(list);
+    }
+
+    public VisitsStatsChartDTO getChartDataByPeriodAndPostsList(Date periodStart, Date periodEnd, List<Integer> postsIdList) {
+        List<Object> list = getVisitsStatsByPeriodAndPostsList(periodStart, periodEnd, postsIdList);
+        return convertDataToChart(list);
+    }
+
 }