Merge pull request #51 from fernandokkang/develop

fix like count error

README.md

@@ -56,3 +56,9 @@ http://bend-doumi.com:8080/
 
 ## 🗂 DB 구성도
 <img src="src/main/resources/static/images/readMe/doumi_erd.png">
+
+## CI/CD
+![CI/CD](/src/main/resources/static/images/readMe/GitAction%20Deploy%20Flow.png)
+
+## Architecture
+![CI/CD](/src/main/resources/static/images/readMe/Architecture.png)

src/main/java/com/example/doumiproject/controller/LikeController.java

@@ -42,15 +42,15 @@ public class LikeController {
 
             ))})
     public ResponseEntity<?> getLikeInfo(HttpServletRequest request,
-        @RequestParam(value = "postId") long postId) {
+        @RequestParam(value = "postId") long postId, @RequestParam(value = "type") String type) {
 
         try {
 
             HttpSession session = request.getSession();
             long userId = (long) session.getAttribute("userId");
 
             boolean exists = likeService.existsByUserIdAndPostId(userId, postId);
-            long likeCount = likeService.getCountLike(postId);
+            long likeCount = likeService.getCountLike(postId, type);
 
             LikesDto likesDto = new LikesDto();
             likesDto.setExists(exists);
@@ -86,7 +86,7 @@ public ResponseEntity<?> addLike(HttpServletRequest request,
             long userId = (long) session.getAttribute("userId");
 
             likeService.addLike(userId, postId, type);
-            long likeCount = likeService.getCountLike(postId);
+            long likeCount = likeService.getCountLike(postId, type);
 
             return ResponseEntity.ok(likeCount);
         } catch (Exception e) {
@@ -118,7 +118,7 @@ public ResponseEntity<?> cancelLike(HttpServletRequest request,
             long userId = (long) session.getAttribute("userId");
 
             likeService.cancelLike(userId, postId, type);
-            long likeCount = likeService.getCountLike(postId);
+            long likeCount = likeService.getCountLike(postId, type);
 
             return ResponseEntity.ok(likeCount);
         } catch (Exception e) {

src/main/java/com/example/doumiproject/repository/JdbcTemplateLikeRepository.java

@@ -36,13 +36,13 @@ public void cancelLike(long user_id, long post_id, String type) {
     }
 
     @Override
-    public long countLike(long post_id) {
+    public long countLike(long post_id, String type) {
 
         String sql = "select count(*) " +
                 "from likes " +
-                "where post_id = ?";
+                "where post_id = ? and type = ? ";
 
-        return jdbcTemplate.queryForObject(sql, Long.class, post_id);
+        return jdbcTemplate.queryForObject(sql, Long.class, post_id, type);
     }
 
     @Override

src/main/java/com/example/doumiproject/repository/LikeRepository.java

@@ -7,6 +7,6 @@ public interface LikeRepository {
 
     public void addLike(long user_id, long post_id, String type);
     public void cancelLike(long user_id, long post_id, String type);
-    public long countLike(long post_id);
+    public long countLike(long post_id, String type);
     public boolean existsByUserIdAndPostId(long user_id, long post_id);
 }

src/main/java/com/example/doumiproject/service/LikeService.java

@@ -4,6 +4,6 @@ public interface LikeService {
 
     public void addLike(long user_id, long post_id, String type);
     public void cancelLike(long user_id, long post_id, String type);
-    public long getCountLike(long post_id);
+    public long getCountLike(long post_id, String type);
     public boolean existsByUserIdAndPostId(long user_id, long post_id);
 }

src/main/java/com/example/doumiproject/service/LikeServiceImpl.java

@@ -23,9 +23,9 @@ public void cancelLike(long user_id, long post_id, String type) {
     }
 
     @Override
-    public long getCountLike(long post_id) {
+    public long getCountLike(long post_id, String type) {
 
-        return likeRepository.countLike(post_id);
+        return likeRepository.countLike(post_id, type);
     }
 
     @Override