Merge pull request #177 from dnd-side-project/feature/#176-template-add-func

Feature/#176 template add func

Author: RTUnu12

src/main/java/com/dnd/reevserver/domain/template/controller/TemplateController.java

@@ -31,10 +31,10 @@ public ResponseEntity<List<TemplateResponseDto>> findCustomTemplatesByUser(@Auth
     }
 
     // 공용 템플릿 조회
-    @Operation(summary = "공용 템플릿 조회, userId는 public라고 나올 것입니다.")
+    @Operation(summary = "공용 템플릿 조회, userId는 public라고 나올 것입니다. Type은 회고 방식을 나타내는 retrospective_type과 직무를 나타내는 job_type으로 분류할 수 있습니다.")
     @GetMapping("/public")
-    public ResponseEntity<List<TemplateResponseDto>> findPublicTemplates() {
-        return ResponseEntity.ok(templateService.findPublicTemplates());
+    public ResponseEntity<List<TemplateResponseDto>> findPublicTemplates(@RequestParam String type) {
+        return ResponseEntity.ok(templateService.findPublicTemplates(type));
     }
 
     // 템플릿 개별 조회

src/main/java/com/dnd/reevserver/domain/template/dto/request/CreateTemplateRequestDto.java

@@ -3,6 +3,6 @@
 
 import java.util.List;
 
-public record CreateTemplateRequestDto(String templateName, String content, String preset, List<String> categoryNames) {
+public record CreateTemplateRequestDto(String templateName, String content, String preset, List<String> categoryNames, String description, String type) {
 
 }

src/main/java/com/dnd/reevserver/domain/template/dto/request/UpdateTemplateRequestDto.java

@@ -2,5 +2,5 @@
 
 import java.util.List;
 
-public record UpdateTemplateRequestDto(Long templateId, String templateName, String content, String preset, List<String> categoryNames) {
+public record UpdateTemplateRequestDto(Long templateId, String templateName, String content, String preset, List<String> categoryNames, String description, String type) {
 }

src/main/java/com/dnd/reevserver/domain/template/dto/response/TemplateResponseDto.java

@@ -5,7 +5,7 @@
 import java.util.List;
 
 @Builder
-public record TemplateResponseDto(Long templateId, String templateName, String content, String preset,
-                                  boolean isPublic, String userId, List<String> categories){
+public record TemplateResponseDto(Long templateId, String templateName, String description, String content, String preset,
+                                  boolean isPublic, String userId, List<String> categories, String type){
 }
 

src/main/java/com/dnd/reevserver/domain/template/entity/Template.java

@@ -23,6 +23,9 @@ public class Template extends BaseEntity {
     @Column(name = "template_name", nullable = false, length = 200, unique = true)
     private String templateName;
 
+    @Column(name = "description", nullable = false, columnDefinition = "LONGTEXT")
+    private String description;
+
     @Column(name = "content", nullable = false, columnDefinition = "LONGTEXT")
     private String content;
 
@@ -36,6 +39,9 @@ public class Template extends BaseEntity {
     @Column(name = "preset", nullable = false, columnDefinition = "LONGTEXT")
     private String preset;
 
+    @Column(name = "type", nullable = false)
+    private String type;
+
     @OneToMany(mappedBy = "template")
     private List<TemplateCategory> templateCategories = new ArrayList<>();
 
@@ -47,7 +53,11 @@ public void updateContent(String newContent) {
         this.content = newContent;
     }
 
-    public void updateDescription(String newDescription) { this.preset = newDescription; }
+    public void updatePreset(String newPreset) { this.preset = newPreset; }
+
+    public void updateDescription(String newDescription) { this.description = newDescription; }
+
+    public void updateType(String newType) { this.type = newType; }
 
     public void clearTemplateCategory(){
         this.templateCategories.clear();

src/main/java/com/dnd/reevserver/domain/template/repository/TemplateRepository.java

@@ -19,8 +19,8 @@ public interface TemplateRepository extends JpaRepository<Template, Long> {
     @Query("SELECT t FROM Template t " +
             "LEFT JOIN FETCH t.templateCategories tc " +
             "LEFT JOIN FETCH tc.category " +
-            "WHERE t.isPublic = true")
-    List<Template> findByIsPublicTrueWithCategories();
+            "WHERE t.isPublic = true AND t.type = :type")
+    List<Template> findByIsPublicTrueWithCategories(@Param("type") String type);
 
 
     Template findByTemplateName(String templateName);

src/main/java/com/dnd/reevserver/domain/template/service/TemplateService.java

@@ -50,8 +50,8 @@ public List<TemplateResponseDto> findCustomTemplatesByUser(String userId) {
     }
 
     // 공용 템플릿 조회
-    public List<TemplateResponseDto> findPublicTemplates() {
-        return templateRepository.findByIsPublicTrueWithCategories().stream()
+    public List<TemplateResponseDto> findPublicTemplates(String type) {
+        return templateRepository.findByIsPublicTrueWithCategories(type).stream()
                 .map(this::convertToDto)
                 .collect(Collectors.toList());
     }
@@ -69,10 +69,12 @@ public void createCustomTemplate(String userId, CreateTemplateRequestDto dto) {
         Template template = Template.builder()
                 .templateName(dto.templateName())
                 .content(dto.content())
+                .description(dto.description())
                 .isPublic(false)
                 .member(member)
                 .preset(dto.preset())
                 .templateCategories(new ArrayList<>())
+                .type(dto.type())
                 .build();
         templateRepository.save(template);
 
@@ -86,7 +88,7 @@ public void createCustomTemplate(String userId, CreateTemplateRequestDto dto) {
         templateCategoryBatchRepository.saveAll(tcList);
     }
 
-    // 템플릿 제목, 내용, 설명, 카테고리 수정, isPublic이 false여만 가능, true면 PublicTemplateCannotModifyException 예외 처리
+    // 템플릿 제목, 내용, 설명, 카테고리, 타입 수정, isPublic이 false여만 가능, true면 PublicTemplateCannotModifyException 예외 처리
     @Transactional
     public void updateTemplate(String userId, UpdateTemplateRequestDto dto) {
         Template template = findById(dto.templateId());
@@ -100,7 +102,9 @@ public void updateTemplate(String userId, UpdateTemplateRequestDto dto) {
 
         template.updateTemplateName(dto.templateName());
         template.updateContent(dto.content());
-        template.updateDescription(dto.preset());
+        template.updatePreset(dto.preset());
+        template.updateDescription(dto.description());
+        template.updateType(dto.type());
 
         templateCategoryRepository.deleteAllByTemplate(template);
         template.clearTemplateCategory();
@@ -133,10 +137,12 @@ private TemplateResponseDto convertToDto(Template template) {
         return TemplateResponseDto.builder()
                 .templateId(template.getTemplateId())
                 .templateName(template.getTemplateName())
+                .description(template.getDescription())
                 .content(template.getContent())
                 .preset(template.getPreset())
                 .isPublic(template.isPublic())
                 .userId(template.isPublic() ? "public" : template.getMember().getUserId())
+                .type(template.getType())
                 .categories(
                         List.copyOf(
                                 template.getTemplateCategories().stream()