4 lab репозитории (не законченные очевидно) и сервис под репозитории для коммента (тесты отрабатывают)

src/main/java/ru/ulstu/is/sbapp/Comment/repository/CommentRepository.java

@@ -0,0 +1,7 @@
+package ru.ulstu.is.sbapp.Comment.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.is.sbapp.Comment.model.Comment;
+
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+}

src/main/java/ru/ulstu/is/sbapp/Comment/service/CommentService.java

@@ -4,60 +4,58 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityNotFoundException;
-import jakarta.persistence.PersistenceContext;
-import org.springframework.util.StringUtils;
 import ru.ulstu.is.sbapp.Comment.model.Comment;
+import ru.ulstu.is.sbapp.Comment.repository.CommentRepository;
+import ru.ulstu.is.sbapp.Util.validation.ValidatorUtil;
 
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CommentService {
-    @PersistenceContext
-    private EntityManager em;
+    private final CommentRepository commentRepository;
+    private final ValidatorUtil validatorUtil;
 
+    public CommentService(CommentRepository commentRepository, ValidatorUtil validatorUtil)
+    {
+        this.commentRepository=commentRepository;
+        this.validatorUtil=validatorUtil;
+    }
     @Transactional
     public Comment addComment(String Text) {
-        if (!StringUtils.hasText(Text)) {
-            throw new IllegalArgumentException("TEXT is null or empty");
-        }
         final Comment comment = new Comment(Text);
-        em.persist(comment);
-        return comment;
+        validatorUtil.validate(comment);
+        return commentRepository.save(comment);
     }
 
     @Transactional(readOnly = true)
     public Comment findComment(Long id) {
-        final Comment comment = em.find(Comment.class, id);
-        if (comment == null) {
-            throw new EntityNotFoundException(String.format("Comment with id [%s] is not found", id));
-        }
-        return comment;
+        final Optional<Comment> client = commentRepository.findById(id);
+        return client.orElseThrow(() -> new CommentNotFoundException(id));
     }
 
     @Transactional(readOnly = true)
     public List<Comment> findAllComments() {
-        return em.createQuery("select c from Comment c", Comment.class)
-                .getResultList();
+        return commentRepository.findAll();
     }
     @Transactional
     public Comment updateComment(Long id,String Text) {
         final Comment currentComment = findComment(id);
         currentComment.setText(Text);
-        return em.merge(currentComment);
+        validatorUtil.validate(currentComment);
+        return commentRepository.save(currentComment);
     }
     @Transactional
     public Comment deleteComment(Long id) {
         final Comment currentComment = findComment(id);
-        em.remove(currentComment);
+        commentRepository.delete(currentComment);
         return currentComment;
     }
 
     @Transactional
     public void deleteAllComments() {
-        em.createQuery("delete from Comment").executeUpdate();
+        commentRepository.deleteAll();
     }
 
 

src/main/java/ru/ulstu/is/sbapp/Post/repository/PostRepository.java

@@ -0,0 +1,7 @@
+package ru.ulstu.is.sbapp.Post.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.is.sbapp.Post.model.Post;
+
+public interface PostRepository extends JpaRepository<Post, Long> {
+}

src/main/java/ru/ulstu/is/sbapp/User/repository/UserRepository.java

@@ -0,0 +1,8 @@
+package ru.ulstu.is.sbapp.User.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.is.sbapp.User.model.User;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+
+}

src/test/java/ru/ulstu/is/sbapp/JpaCommentTest.java

@@ -7,7 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import ru.ulstu.is.sbapp.Comment.controller.CommentDto;
 import ru.ulstu.is.sbapp.Comment.model.Comment;
+import ru.ulstu.is.sbapp.Comment.service.CommentNotFoundException;
 import ru.ulstu.is.sbapp.Comment.service.CommentService;
 import ru.ulstu.is.sbapp.User.service.UserService;
 
@@ -20,8 +22,6 @@ public class JpaCommentTest {
     private static final Logger log = LoggerFactory.getLogger(JpaCommentTest.class);
     @Autowired
     private CommentService commentService;
-    @Autowired
-    private UserService userService;
 
     @Test
     void testTidingCreate()
@@ -47,7 +47,7 @@ public class JpaCommentTest {
     @Test
     void testTidingReadNotFound() {
         commentService.deleteAllComments();
-        Assertions.assertThrows(EntityNotFoundException.class, () -> commentService.findComment(-1L));
+        Assertions.assertThrows(CommentNotFoundException.class, () -> commentService.findComment(-1L));
     }
     @Test
     void testAllTidingRead()