[~] #64 TemplateDocService 메서드들이 ServiceResult를 반환하도록 변경

TenQuest-Team · Oct 12, 2023 · 3537082 · 3537082
1 parent c3625d9
commit 3537082
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/kns/tenquest/controller/TemplateController.java b/src/main/java/com/kns/tenquest/controller/TemplateController.java
@@ -33,8 +33,8 @@ public class TemplateController {
     public Response apiGetAllTemplates() {
         ServiceResult sr = templateService.getAllTemplates();
         return sr.isFailed() ?
-                new Response().BadRequest().message(sr.getMessage());
-        new Response().Ok().data(sr.getData());
+                new Response().BadRequest().message(sr.getMessage()) :
+                new Response().Ok().data(sr.getData());
     }
 
     @ResponseBody

diff --git a/src/main/java/com/kns/tenquest/controller/ViewController.java b/src/main/java/com/kns/tenquest/controller/ViewController.java
@@ -58,14 +58,14 @@ public String replyerView(Model model) {
 
     @GetMapping("/templates")
     public String templateView(Model model) {
-        DtoList<TemplateDto> templateList = templateService.getAllTemplates();
+        DtoList<TemplateDto> templateList = (DtoList<TemplateDto>)templateService.getAllTemplates().getData();
         model.addAttribute("templateList", templateList);
         return "template_view";
     }
 
     @GetMapping("/template-docs")
     public String templateDocView(Model model) {
-        DtoList<TemplateDocDto> templateDocList = templateDocService.getAllTemplateDocs();
+        DtoList<TemplateDocDto> templateDocList = (DtoList<TemplateDocDto>)templateDocService.getAllTemplateDocs().getData();
         model.addAttribute("templateDocList", templateDocList);
         return "template_doc_view";
     }

diff --git a/src/main/java/com/kns/tenquest/service/TemplateDocService.java b/src/main/java/com/kns/tenquest/service/TemplateDocService.java
@@ -2,6 +2,7 @@
 
 import com.kns.tenquest.DtoList;
 import com.kns.tenquest.dto.ResponseDto;
+import com.kns.tenquest.dto.ServiceResult;
 import com.kns.tenquest.dto.TemplateDocDto;
 import com.kns.tenquest.dto.TemplateDto;
 import com.kns.tenquest.repository.TemplateDocRepository;
@@ -15,9 +16,10 @@ public class TemplateDocService {
 
     private final TemplateDocRepository templateDocRepository;
 
-    public DtoList<TemplateDocDto> getAllTemplateDocs(){
+    public ServiceResult getAllTemplateDocs(){
+
         DtoList<TemplateDocDto> templateDocDtoList = new DtoList<>(templateDocRepository.findAll());
-        return templateDocDtoList;
+        return new ServiceResult().success().data(templateDocDtoList);
     }
 
 //    public ResponseDto<TemplateDocDto> createTemplateDoc (DtoList<TemplateDocDto> )