added 3. Post Comments, Likes and View API

cevheri · cevheri · commit 9b5eccc5c568 · 2022-06-13T01:25:29.000+03:00
diff --git a/src/main/java/com/cevheri/blog/repository/PostCommentRepository.java b/src/main/java/com/cevheri/blog/repository/PostCommentRepository.java
@@ -1,8 +1,10 @@
 package com.cevheri.blog.repository;
 
 import com.cevheri.blog.domain.PostComment;
+
 import java.util.List;
 import java.util.Optional;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.*;
@@ -18,23 +20,25 @@ default Optional<PostComment> findOneWithEagerRelationships(Long id) {
         return this.findOneWithToOneRelationships(id);
     }
 
-    default List<PostComment> findAllWithEagerRelationships() {
-        return this.findAllWithToOneRelationships();
+    default List<PostComment> findAllWithEagerRelationships(Long postId) {
+        return this.findAllWithToOneRelationships(postId);
     }
 
-    default Page<PostComment> findAllWithEagerRelationships(Pageable pageable) {
-        return this.findAllWithToOneRelationships(pageable);
+    default Page<PostComment> findAllWithEagerRelationships(Long postId, Pageable pageable) {
+        return this.findAllWithToOneRelationships(postId, pageable);
     }
 
     @Query(
-        value = "select distinct postComment from PostComment postComment left join fetch postComment.post",
-        countQuery = "select count(distinct postComment) from PostComment postComment"
+        value = "select distinct postComment from PostComment postComment left join fetch postComment.post where postComment.post.id =:postId",
+        countQuery = "select count(distinct postComment) from PostComment postComment where postComment.post.id =:postId"
     )
-    Page<PostComment> findAllWithToOneRelationships(Pageable pageable);
+    Page<PostComment> findAllWithToOneRelationships(@Param("postId") Long postId, Pageable pageable);
 
-    @Query("select distinct postComment from PostComment postComment left join fetch postComment.post")
-    List<PostComment> findAllWithToOneRelationships();
+    @Query("select distinct postComment from PostComment postComment left join fetch postComment.post where postComment.post.id =:postId")
+    List<PostComment> findAllWithToOneRelationships(@Param("postId") Long postId);
 
     @Query("select postComment from PostComment postComment left join fetch postComment.post where postComment.id =:id")
     Optional<PostComment> findOneWithToOneRelationships(@Param("id") Long id);
+
+    Page<PostComment> findAllByPost_Id(@Param("postId") Long postId, Pageable pageable);
 }
diff --git a/src/main/java/com/cevheri/blog/repository/PostLikeRepository.java b/src/main/java/com/cevheri/blog/repository/PostLikeRepository.java
@@ -37,4 +37,6 @@ default Page<PostLike> findAllWithEagerRelationships(Pageable pageable) {
 
     @Query("select postLike from PostLike postLike left join fetch postLike.post where postLike.id =:id")
     Optional<PostLike> findOneWithToOneRelationships(@Param("id") Long id);
+
+    Integer countByPost_Id(Long id);
 }
diff --git a/src/main/java/com/cevheri/blog/service/PostCommentService.java b/src/main/java/com/cevheri/blog/service/PostCommentService.java
@@ -39,6 +39,7 @@ public interface PostCommentService {
      * @param pageable the pagination information.
      * @return the list of entities.
      */
+    Page<PostCommentDTO> findAll(Long postId, Pageable pageable);
     Page<PostCommentDTO> findAll(Pageable pageable);
 
     /**
@@ -47,6 +48,8 @@ public interface PostCommentService {
      * @param pageable the pagination information.
      * @return the list of entities.
      */
+    Page<PostCommentDTO> findAllWithEagerRelationships(Long postId, Pageable pageable);
+
     Page<PostCommentDTO> findAllWithEagerRelationships(Pageable pageable);
 
     /**
diff --git a/src/main/java/com/cevheri/blog/service/dto/PostDTO.java b/src/main/java/com/cevheri/blog/service/dto/PostDTO.java
@@ -53,6 +53,25 @@ public class PostDTO implements Serializable {
 
     private String integrationId;
 
+    private Integer likeCount;
+    private Integer viewCount;
+
+    public Integer getLikeCount() {
+        return likeCount;
+    }
+
+    public void setLikeCount(Integer likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
     public String getIntegrationId() {
         return integrationId;
     }
diff --git a/src/main/java/com/cevheri/blog/service/impl/MediumServiceImpl.java b/src/main/java/com/cevheri/blog/service/impl/MediumServiceImpl.java
@@ -38,16 +38,13 @@ public String sendPost(PostDTO postDTO) {
         PostResponse result = new PostResponse();
         try {
 
-            if(postDTO.getIntegrationId()!=null){
-                //TODO call medium updatePost api.
-            }
-
+//            if(postDTO.getIntegrationId()!=null){
+//                //TODO call medium updatePost api.
+//            }
             result = PostApi.createPost(postMapper.toPostModel(postDTO));
-
             if(!result.getErrors().isEmpty()){
                 //TODO PostCreateError. Medium response Error. Write a log!!!!
             }
-
             integrationLogDTO.setExitCode(ExitCodeType.SUCCESS);
             integrationLogDTO.setResponseData(result.toString());
         }catch (IOException ie){
diff --git a/src/main/java/com/cevheri/blog/service/impl/PostCommentServiceImpl.java b/src/main/java/com/cevheri/blog/service/impl/PostCommentServiceImpl.java
@@ -5,7 +5,9 @@
 import com.cevheri.blog.service.PostCommentService;
 import com.cevheri.blog.service.dto.PostCommentDTO;
 import com.cevheri.blog.service.mapper.PostCommentMapper;
+
 import java.util.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
@@ -62,15 +64,28 @@ public Optional<PostCommentDTO> partialUpdate(PostCommentDTO postCommentDTO) {
             .map(postCommentMapper::toDto);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public Page<PostCommentDTO> findAll(Long postId, Pageable pageable) {
+        log.debug("Request to get all PostComments");
+        return postCommentRepository.findAllByPost_Id(postId, pageable).map(postCommentMapper::toDto);
+    }
+
     @Override
     @Transactional(readOnly = true)
     public Page<PostCommentDTO> findAll(Pageable pageable) {
         log.debug("Request to get all PostComments");
         return postCommentRepository.findAll(pageable).map(postCommentMapper::toDto);
     }
 
+    @Override
+    public Page<PostCommentDTO> findAllWithEagerRelationships(Long postId, Pageable pageable) {
+        return postCommentRepository.findAllWithEagerRelationships(postId, pageable).map(postCommentMapper::toDto);
+    }
+
+    @Override
     public Page<PostCommentDTO> findAllWithEagerRelationships(Pageable pageable) {
-        return postCommentRepository.findAllWithEagerRelationships(pageable).map(postCommentMapper::toDto);
+        return postCommentRepository.findAll(pageable).map(postCommentMapper::toDto);
     }
 
     @Override
diff --git a/src/main/java/com/cevheri/blog/service/impl/PostServiceImpl.java b/src/main/java/com/cevheri/blog/service/impl/PostServiceImpl.java
@@ -1,6 +1,7 @@
 package com.cevheri.blog.service.impl;
 
 import com.cevheri.blog.domain.Post;
+import com.cevheri.blog.repository.PostLikeRepository;
 import com.cevheri.blog.repository.PostRepository;
 import com.cevheri.blog.repository.PostViewRepository;
 import com.cevheri.blog.service.PostService;
@@ -32,17 +33,20 @@ public class PostServiceImpl implements PostService {
 
     private final PostRepository postRepository;
     private final PostViewRepository postViewRepository;
+    private final PostLikeRepository postLikeRepository;
     private final PostMapper postMapper;
     private final ThirdPartyBlogService thirdPartyBlogService;
     private final PostViewService postViewService;
 
     public PostServiceImpl(PostRepository postRepository,
                            PostViewRepository postViewRepository,
+                           PostLikeRepository postLikeRepository,
                            PostMapper postMapper,
                            ThirdPartyBlogService thirdPartyBlogService,
                            PostViewService postViewService) {
         this.postRepository = postRepository;
         this.postViewRepository = postViewRepository;
+        this.postLikeRepository = postLikeRepository;
         this.postMapper = postMapper;
         this.thirdPartyBlogService = thirdPartyBlogService;
         this.postViewService = postViewService;
@@ -69,7 +73,11 @@ public PostDTO update(UpdatePostDTO postDTO) {
         log.debug("Request to save Post : {}", postDTO);
         Post post = postMapper.toEntity(postDTO);
         post = postRepository.save(post);
-        return postMapper.toDto(post);
+        var result = postMapper.toDto(post);
+        if (post.getIntegrationId() != null) {
+            thirdPartyBlogService.sendPost(result);
+        }
+        return result;
     }
 
     @Override
@@ -91,7 +99,10 @@ public Optional<PostDTO> partialUpdate(PostDTO postDTO) {
     @Transactional(readOnly = true)
     public Page<PostDTO> findAll(Pageable pageable) {
         log.debug("Request to get all Posts");
-        return postRepository.findAll(pageable).map(postMapper::toDto);
+        return postRepository
+            .findAll(pageable)
+            .map(postMapper::toDto)
+            ;
     }
 
     public Page<PostDTO> findAllWithEagerRelationships(Pageable pageable) {
@@ -101,7 +112,8 @@ public Page<PostDTO> findAllWithEagerRelationships(Pageable pageable) {
     @Override
     public Optional<PostDTO> findOne(Long id) {
         log.debug("Request to get Post : {}", id);
-        var result = postRepository.findOneWithEagerRelationships(id).map(postMapper::toDto);
+        var result = postRepository.findOneWithEagerRelationships(id)
+            .map(postMapper::toDto);
         result.ifPresentOrElse(t -> {
                 PostViewDTO postView = new PostViewDTO();
                 postView.setPost(t);
@@ -111,7 +123,9 @@ public Optional<PostDTO> findOne(Long id) {
                 throw new BadRequestAlertException("Entity not found", "post", "idnotfound");
             }
         );
-
+        PostDTO postDTO = result.get();
+        postDTO.setLikeCount(postLikeRepository.countByPost_Id(postDTO.getId()));
+        postDTO.setViewCount(postViewRepository.countByPost_Id(postDTO.getId()));
         return result;
     }
 
diff --git a/src/main/java/com/cevheri/blog/service/mapper/PostMapper.java b/src/main/java/com/cevheri/blog/service/mapper/PostMapper.java
@@ -52,18 +52,19 @@ default Set<TagDTO> toDtoTagNameSet(Set<Tag> tag) {
         return tag.stream().map(this::toDtoTagName).collect(Collectors.toSet());
     }
 
-    default PostResponse toPostModel(PostDTO postDTO){
+    default PostResponse toPostModel(PostDTO postDTO) {
         PostResponse result = new PostResponse();
         PostResponse.PostData model = result.getData();
-        model.setId(null);
-        model.setAuthorId(null);
+        if (postDTO.getIntegrationId() != null) {
+            model.setId(postDTO.getIntegrationId());
+        }
         model.setTitle(postDTO.getTitle());
         model.setTags(postDTO.getTags().stream().map(TagDTO::getName).collect(Collectors.toList()));
         model.setCanonicalUrl("https://cevheri-blog.herokuapp.com");
         model.setContent(postDTO.getContent());
-        model.setLicense(null);
+        model.setLicense("all-rights-reserved");
         model.setContentFormat("html");
-        model.setPublishStatus(null);
+        model.setPublishStatus("public");
         result.setData(model);
         return result;
     }
diff --git a/src/main/java/com/cevheri/blog/web/rest/PostCommentResource.java b/src/main/java/com/cevheri/blog/web/rest/PostCommentResource.java
@@ -153,14 +153,37 @@ public ResponseEntity<List<PostCommentDTO>> getAllPostComments(
         log.debug("REST request to get a page of PostComments");
         Page<PostCommentDTO> page;
         if (eagerload) {
-            page = postCommentService.findAllWithEagerRelationships(pageable);
+            page = postCommentService.findAllWithEagerRelationships(1L, pageable);
         } else {
-            page = postCommentService.findAll(pageable);
+            page = postCommentService.findAll(1L, pageable);
+        }
+        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
+        return ResponseEntity.ok().headers(headers).body(page.getContent());
+    }
+    /**
+     * {@code GET  /post-comments/:postId } : get all the postComments By postId.
+     *
+     * @param postId the post ID information
+     * @param pageable the pagination information.
+     * @param eagerload flag to eager load entities from relationships (This is applicable for many-to-many).
+     * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of postComments in body.
+     */
+    @GetMapping("/post-comments/post/{postId}")
+    public ResponseEntity<List<PostCommentDTO>> getAllPostCommentsByPostId(
+        @PathVariable(value = "postId") Long postId,
+        @org.springdoc.api.annotations.ParameterObject Pageable pageable,
+        @RequestParam(required = false, defaultValue = "false") boolean eagerload
+    ) {
+        log.debug("REST request to get a page of PostComments");
+        Page<PostCommentDTO> page;
+        if (eagerload) {
+            page = postCommentService.findAllWithEagerRelationships(postId, pageable);
+        } else {
+            page = postCommentService.findAll(postId, pageable);
         }
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
         return ResponseEntity.ok().headers(headers).body(page.getContent());
     }
-
     /**
      * {@code GET  /post-comments/:id} : get the "id" postComment.
      *

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,6 @@ default Page<PostLike> findAllWithEagerRelationships(Pageable pageable) {`
`37`	`37`
`38`	`38`	`@Query("select postLike from PostLike postLike left join fetch postLike.post where postLike.id =:id")`
`39`	`39`	`Optional<PostLike> findOneWithToOneRelationships(@Param("id") Long id);`
	`40`	`+`
	`41`	`+ Integer countByPost_Id(Long id);`
`40`	`42`	`}`