Merge remote-tracking branch 'origin/main'

Author: JunBe

blog-service-deployment.yaml

@@ -16,6 +16,7 @@ spec:
       containers:
         - name: blog-service
           image: msj9965/alog-blog:main
+          imagePullPolicy: Always
           ports:
             - containerPort: 8030
           env:
@@ -79,4 +80,9 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: blog-app-secret
-                  key: FEIGN_MATCHING_SERVICE_URL
+                  key: FEIGN_MATCHING_SERVICE_URL
+            - name: KAFKA_BOOTSTRAP_SERVERS
+              valueFrom:
+                secretKeyRef:
+                  name: blog-app-secret
+                  key: KAFKA_BOOTSTRAP_SERVERS

src/main/java/com/gucci/blog_service/comment/repository/CommentRepository.java

@@ -8,5 +8,5 @@
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
     List<Comment> findAllByPost(Post post);
-    List<Comment> findAllByUserId(Long userId);
+    List<Comment> findAllByPostAndIsDeleted(Post post, Boolean isDeleted);
 }

src/main/java/com/gucci/blog_service/comment/service/CommentRefService.java

@@ -15,7 +15,7 @@ public class CommentRefService {
     private final CommentRepository commentRepository;
 
     public Integer getCommentCount(Post post) {
-        List<Comment> comments = commentRepository.findAllByPost(post);
+        List<Comment> comments = commentRepository.findAllByPostAndIsDeleted(post, false);
         return comments.size();
     }
 

src/main/java/com/gucci/blog_service/healthcheck/HealthCheckController.java

@@ -19,6 +19,6 @@ public String healthCheck() {
 
     @GetMapping("/test")
     public String test() {
-        return "Blog Service Test Endpoint is working!!";
+        return "Blog Service Test Endpoint is working!!!";
     }
 }