Merge pull request #146 from dnd-side-project/refactor/#145-memo

Refactor/#145 memo

Author: RTUnu12

src/main/java/com/dnd/reevserver/domain/memo/dto/request/CreateMemoRequestDto.java

@@ -2,6 +2,5 @@
 
 import java.util.List;
 
-public record CreateMemoRequestDto(String title, String content, String templateName,
-                                   List<String> categoriesName, Long groupId) {
+public record CreateMemoRequestDto(Long groupId, String title, String content, List<String> categoryNames) {
 }

src/main/java/com/dnd/reevserver/domain/memo/dto/response/MemoResponseDto.java

@@ -6,5 +6,5 @@
 
 @Builder
 public record MemoResponseDto(Long memoId, String userId, String title,
-                              String content, String templateName, List<String> categories, Long groupId){
+                              String content, List<String> categoryNames, Long groupId){
 }

src/main/java/com/dnd/reevserver/domain/memo/entity/Memo.java

@@ -3,7 +3,6 @@
 import com.dnd.reevserver.domain.category.entity.MemoCategory;
 import com.dnd.reevserver.domain.member.entity.Member;
 import com.dnd.reevserver.domain.team.entity.Team;
-import com.dnd.reevserver.domain.template.entity.Template;
 import com.dnd.reevserver.global.common.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -33,10 +32,6 @@ public class Memo extends BaseEntity {
     @Column(name = "content", nullable = false, columnDefinition = "LONGTEXT")
     private String content;
 
-    @ManyToOne
-    @JoinColumn(name = "template_id")
-    private Template template;
-
     @OneToMany(mappedBy = "memo", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<MemoCategory> memoCategories = new ArrayList<>();
 

src/main/java/com/dnd/reevserver/domain/memo/repository/MemoRepository.java

@@ -10,14 +10,12 @@
 public interface MemoRepository extends JpaRepository<Memo, Long> {
     @Query("SELECT m FROM Memo m " +
             "JOIN FETCH m.member " +
-            "JOIN FETCH m.template " +
             "JOIN FETCH m.team "+
             "WHERE m.member.userId = :userId")
     List<Memo> findMemosByMemberUserId(@Param("userId") String userId);
 
     @Query("SELECT m FROM Memo m " +
             "JOIN FETCH m.member " +
-            "JOIN FETCH m.template " +
             "JOIN FETCH m.team "+
             "WHERE m.member.userId = :userId " +
             "AND m.team.groupId = :groupId")

src/main/java/com/dnd/reevserver/domain/memo/service/MemoService.java

@@ -63,17 +63,15 @@ public Integer countMemosByUserId(String userId){
     // 메모 생성
     @Transactional
     public void createMemo(String userId, CreateMemoRequestDto dto){
-        Template template = templateService.findByName(dto.templateName());
         Memo memo = Memo.builder()
                     .member(memberService.findById(userId))
                     .title(dto.title())
                     .content(dto.content())
-                    .template(template) // null 가능
                     .team(dto.groupId() == null ? null : teamService.findById(dto.groupId())) // null 가능
                     .build();
         // 메모-태그 생성
         memoRepository.save(memo);
-        List<Category> categories = categoryRepository.findByCategoryNameIn(dto.categoriesName());
+        List<Category> categories = categoryRepository.findByCategoryNameIn(dto.categoryNames());
         List<MemoCategory> mcList = categories.stream()
                 .map(category -> new MemoCategory(memo, category))
                 .collect(Collectors.toList());
@@ -94,8 +92,7 @@ private MemoResponseDto convertToDto(Memo memo){
                 .title(memo.getTitle())
                 .userId(memo.getMember().getUserId())
                 .content(memo.getContent())
-                .templateName(memo.getTemplate().getTemplateName())
-                .categories(
+                .categoryNames(
                          memo.getMemoCategories().stream()
                             .map(mc -> mc.getCategory().getCategoryName())
                             .toList()