Merge pull request #45 from ithsjava25/Task-Comment-relation

Task comment relation

Author: eraiicphu

src/main/java/demo/codeexample/comment/application/CommentService.java

@@ -1,5 +1,6 @@
 package demo.codeexample.comment.application;
 import demo.codeexample.comment.CommentDto;
+import demo.codeexample.comment.CommentLookup;
 import demo.codeexample.comment.domain.CommentRepository;
 import demo.codeexample.comment.CreateCommentDto;
 import demo.codeexample.comment.domain.Comment;
@@ -12,10 +13,9 @@
 
 @Service
 @AllArgsConstructor
-public class CommentService {
+public class CommentService implements CommentLookup {
 
     private final CommentRepository commentRepository;
-    //private final TaskRepository taskRepository;
     private final ModelMapper modelMapper;
     //private final "Some kind of Authorization service" with saved user
 
@@ -31,6 +31,19 @@ public CommentDto createComment(CreateCommentDto createCommentDto) {
         return modelMapper.map(commentEntity, CommentDto.class);
     }
 
+    @Override // Implementing the method from your Facade
+    public List<CommentDto> getCommentsForTask(long taskId) {
+        // Use a repository method to find comments by Task ID
+        return commentRepository.findAllByTaskIdOrderByCreatedAtDesc(taskId).stream()
+                .map(entity -> modelMapper.map(entity, CommentDto.class))
+                .toList();
+    }
+
+    @Override // Implementing the method from your Facade
+    public void deleteComment(long commentId) {
+        commentRepository.deleteById(commentId);
+    }
+
     public List<CommentDto> getAllComments() {
         List<Comment> commentEntities = commentRepository.findAll();
         final List<CommentDto> commentDtos = new ArrayList<>();

src/main/java/demo/codeexample/comment/domain/Comment.java

@@ -22,6 +22,9 @@ public class Comment {
     @Column(nullable = false, length = 300)
     private String content;
 
+    @Column
+    private Long taskId;
+
 //    @Column(nullable = false)
 //    private Long writerId;
 

src/main/java/demo/codeexample/comment/domain/CommentRepository.java

@@ -2,5 +2,9 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface CommentRepository extends JpaRepository<Comment, Long> {
+        List<Comment> findAllByTaskIdOrderByCreatedAtDesc(Long taskId);
+
 }

src/main/java/demo/codeexample/config/DataInitializer.java

@@ -1,6 +1,5 @@
 package demo.codeexample.config;
 
-import demo.codeexample.user.CreateUserDto;
 import demo.codeexample.user.CreateUserDto;
 import demo.codeexample.shared.Role;
 import demo.codeexample.user.UserLookup;

src/main/java/demo/codeexample/logger/application/LoggerService.java

@@ -5,23 +5,19 @@
 import demo.codeexample.logger.domain.LoggerEntity;
 import demo.codeexample.logger.domain.LoggerRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class LoggerService implements LoggerLookup {
+public class LoggerService implements LoggerLookup{
 
     private final LoggerRepository loggerRepository;
 
     @Override
     public void log(LoggerAction action, Long userId, String entityType, Long entityId) {
         LoggerEntity log = new LoggerEntity();
         log.setAction(action);
-        log.setUserId(userId);
-        log.setEntityType(entityType);
-        log.setEntityId(entityId);
-
-        loggerRepository.save(log);
     }
 
 }

src/main/java/demo/codeexample/task/TaskResponseDto.java

@@ -0,0 +1,28 @@
+package demo.codeexample.task;
+
+import demo.codeexample.comment.CommentDto;
+import demo.codeexample.task.domain.Task;
+import demo.codeexample.task.domain.TaskStatus;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class TaskResponseDto {
+    private Long taskId;
+    private String title;
+    private String description;
+    private TaskStatus status;
+    private LocalDateTime deadline;
+    private Long projectId;
+    private Long userId;
+
+    private List<CommentDto> comments;
+
+}
+

src/main/java/demo/codeexample/task/infrastructure/adapters/in/TaskController.java

@@ -1,4 +1,39 @@
 package demo.codeexample.task.infrastructure.adapters.in;
+import demo.codeexample.comment.CommentLookup;
+import demo.codeexample.task.TaskResponseDto;
+import demo.codeexample.task.application.ports.in.TaskUseCase;
+import demo.codeexample.task.domain.Task;
+import lombok.RequiredArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.server.ResponseStatusException;
 
+
+
+@Controller
+@RequestMapping("/tasks")
+@RequiredArgsConstructor
 public class TaskController {
+    private final TaskUseCase taskUseCase;
+    private final CommentLookup commentLookup;
+    private final ModelMapper modelMapper;
+
+
+    @GetMapping("/{taskId}/view")
+    public String viewTask(@PathVariable Long taskId, Model model) {
+        Task task = taskUseCase.findById(taskId)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
+
+        TaskResponseDto dto = modelMapper.map(task, TaskResponseDto.class);
+
+        dto.setComments(commentLookup.getCommentsForTask(taskId));
+
+        model.addAttribute("task", dto);
+        return "task-detail";
+    }
 }