implemented visitors counting and likes/dislikes

Author: bvn13

README.md

@@ -22,6 +22,11 @@ SpringBlog is powered by many powerful frameworks and third-party projects:
 
 ## Changelog
 
+#### 2017-11-15
+
+* Implemented visitors counting (depends on X-Real-IP header)
+* Implemented likes/dislikes (depends on X-Real-IP header)
+
 #### 2017-11-14
 
 * Added RememberMe checkbox into login form, increased RememberMe cookie timeout upto 7 days

build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'spring-boot'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = '2.6.2'
+version = '2.7.0'
 
 repositories {
     mavenLocal()
@@ -59,10 +59,6 @@ dependencies {
     compile 'de.neuland-bfi:spring-jade4j:1.2.7'
     compile 'org.pegdown:pegdown:1.6.0'
 
-    // python
-    //compile 'org.python:jython-standalone:2.7.1'
-    //compile 'org.pygments:pygments:2.2.0'
-
     //markdown processor
     compile 'com.vladsch.flexmark:flexmark-all:0.27.0'
 
@@ -100,6 +96,9 @@ dependencies {
     compile 'org.projectlombok:lombok:1.16.16'
     //compile 'com.qiniu:qiniu-java-sdk:7.0.+'
 
+    // JSON support
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.2'
+
     // static resources, ref. http://www.webjars.org/
     compile 'org.webjars:jquery:3.2.1'
     compile 'org.webjars:bootstrap:3.3.7-1'

src/main/java/com/raysmond/blog/controllers/PostController.java

@@ -3,15 +3,16 @@
 import com.raysmond.blog.Constants;
 import com.raysmond.blog.error.NotFoundException;
 import com.raysmond.blog.models.Post;
-import com.raysmond.blog.services.PostService;
-import com.raysmond.blog.services.TagService;
-import com.raysmond.blog.services.UserService;
+import com.raysmond.blog.services.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Set;
 
@@ -25,12 +26,24 @@
 @RequestMapping("posts")
 public class PostController {
 
+    Logger logger = LoggerFactory.getLogger(PostController.class);
+
     @Autowired
     private PostService postService;
 
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private VisitService visitService;
+
+    @Autowired
+    private LikeService likeService;
+
+    @Autowired
+    private RequestProcessorService requestProcessorService;
+
+
     @RequestMapping(value = "archive", method = GET)
     public String archive(Model model){
         model.addAttribute("posts", postService.getArchivePosts());
@@ -39,26 +52,14 @@ public String archive(Model model){
     }
 
     @RequestMapping(value = "{permalink}", method = GET)
-    public String show(@PathVariable String permalink, Model model){
-        Post post = null;
-
-        try{
-            post = this.postService.getPublishedPostByPermalink(permalink);
-        } catch (NotFoundException ex){
-            if (permalink.matches("\\d+")) {
-                if (this.userService.currentUser().isAdmin()) {
-                    post = this.postService.getPost(Long.valueOf(permalink));
-                } else {
-                    post = this.postService.getPublishedPost(Long.valueOf(permalink));
-                }
-            } else if (permalink.toLowerCase().trim().equals(Constants.PROJECTS_PAGE_PERMALINK)) {
-                post = this.postService.createProjectsPage();
-            }
-        }
-
-        if (post == null) {
-            throw new NotFoundException("Post with permalink " + permalink + " is not found");
-        }
+    public String show(@PathVariable String permalink, Model model, HttpServletRequest request){
+        Post post = this.postService.findPostByPermalink(permalink);
+
+        logger.debug(String.format("ACCESS %s from IP: %s", permalink, this.requestProcessorService.getRealIp(request)));
+
+        this.visitService.saveVisit(this.requestProcessorService.getRealIp(request), post);
+        post.setVisitsCount(this.visitService.getUniqueVisitsCount(post));
+        post.setSympathyCount(this.likeService.getTotalLikesByPost(post));
 
         model.addAttribute("post", post);
         model.addAttribute("tags", this.postService.getPostTags(post));

src/main/java/com/raysmond/blog/controllers/SympathyController.java

@@ -0,0 +1,64 @@
+package com.raysmond.blog.controllers;
+
+import com.raysmond.blog.forms.LikeForm;
+import com.raysmond.blog.models.Post;
+import com.raysmond.blog.services.*;
+import com.raysmond.blog.support.web.ViewHelper;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
+
+@Controller
+@RequestMapping(value = "/sympathy")
+public class SympathyController {
+
+    @Autowired
+    private AppSetting appSetting;
+
+    @Autowired
+    private PostService postService;
+
+    @Autowired
+    private LikeService likeService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private RequestProcessorService requestProcessorService;
+
+
+    @Data
+    public static class SympathyRequestData {
+        @NotNull
+        private String postId;
+    }
+
+
+    @PostMapping(value = "/like")
+    public @ResponseBody LikeForm likeIt(@RequestBody SympathyRequestData data, HttpServletRequest request) {
+        Post post = this.postService.findPostByPermalink(data.getPostId());
+        this.likeService.likePost(post, this.requestProcessorService.getRealIp(request));
+        ViewHelper viewHelper = new ViewHelper(this.appSetting);
+        LikeForm result = new LikeForm();
+        result.setSympathy(viewHelper.formatNumberByThousands(this.likeService.getTotalLikesByPost(post)));
+        return result;
+    }
+
+    @PostMapping(value = "/dislike")
+    public @ResponseBody LikeForm dislikeIt(@RequestBody SympathyRequestData data, HttpServletRequest request) {
+        Post post = this.postService.findPostByPermalink(data.getPostId());
+        this.likeService.dislikePost(post, this.requestProcessorService.getRealIp(request));
+        ViewHelper viewHelper = new ViewHelper(this.appSetting);
+        LikeForm result = new LikeForm();
+        result.setSympathy(viewHelper.formatNumberByThousands(this.likeService.getTotalLikesByPost(post)));
+        return result;
+    }
+
+
+
+}

src/main/java/com/raysmond/blog/forms/LikeForm.java

@@ -0,0 +1,13 @@
+package com.raysmond.blog.forms;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class LikeForm {
+
+    @NotNull
+    private String sympathy = "0";
+
+}

src/main/java/com/raysmond/blog/models/Like.java

@@ -0,0 +1,31 @@
+package com.raysmond.blog.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "posts_likes")
+@Getter @Setter
+public class Like extends BaseModel {
+
+    @ManyToOne
+    private User user;
+
+    @ManyToOne
+    private Post post;
+
+    @Column(nullable = false)
+    private Integer sympathy;
+
+    @Column(nullable = false)
+    private String clientIp;
+
+    @Column(nullable = false, columnDefinition = "boolean default false")
+    private Boolean isAdmin;
+
+}

src/main/java/com/raysmond/blog/models/Post.java

@@ -75,4 +75,15 @@ public void setPermalink(String permalink){
         this.permalink = StringUtils.arrayToDelimitedString(StringUtils.tokenizeToStringArray(token, " "), "-");
     }
 
+    private Long visitsCount = 0L;
+    public Long getVisitsCount() {
+        if (this.visitsCount == null) return 0L;
+        else return this.visitsCount;
+    }
+
+    private Integer sympathyCount = 0;
+    public Integer getSympathyCount() {
+        if (this.sympathyCount == null) return 0;
+        else return this.sympathyCount;
+    }
 }

src/main/java/com/raysmond/blog/models/StoredFile.java

@@ -29,7 +29,7 @@ public class StoredFile extends BaseModel {
     @Column(columnDefinition = "bigint default 0")
     private Long size;
 
-    public String getSizeForHuman() {
+    public String getSizeFormatted() {
         double bytes = this.getSize();
         double kilobytes = (bytes / 1024);
         double megabytes = (kilobytes / 1024);

src/main/java/com/raysmond/blog/models/Visit.java

@@ -0,0 +1,28 @@
+package com.raysmond.blog.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "visits")
+@Getter @Setter
+public class Visit extends BaseModel {
+
+    @ManyToOne
+    private User user;
+
+    @Column(nullable = false)
+    private String clientIp;
+
+    @ManyToOne
+    private Post post;
+
+    @Column(nullable = false, columnDefinition = "boolean default false")
+    private Boolean isAdmin;
+
+}

src/main/java/com/raysmond/blog/repositories/LikeRepository.java

@@ -0,0 +1,22 @@
+package com.raysmond.blog.repositories;
+
+import com.raysmond.blog.models.Like;
+import com.raysmond.blog.models.Post;
+import com.raysmond.blog.models.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface LikeRepository extends JpaRepository<Like, Long> {
+
+    @Query("SELECT SUM(l.sympathy) FROM Like AS l WHERE l.user = :user AND l.post = :post GROUP BY l.user, l.post")
+    Integer getTotalLikesByUserAndPost(@Param("user") User user, @Param("post") Post post);
+
+    @Query("SELECT SUM(l.sympathy) FROM Like AS l WHERE l.post = :post GROUP BY l.post")
+    Integer getTotalLikesByPost(@Param("post") Post post);
+
+    @Query("SELECT SUM(l.sympathy) FROM Like AS l WHERE l.clientIp = :clientIp AND l.post = :post GROUP BY l.clientIp, l.post")
+    Integer getTotalLikesByClientIpAndPost(@Param("clientIp") String clientIp, @Param("post") Post post);
+}