Merge pull request #31 from siwonKH/main

Refactor: separate api and web
Team-KHPT · Jun 28, 2023 · 9bfbfd4 · 9bfbfd4
2 parents 58fb62b + 24c7cdb
commit 9bfbfd4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/...jectkim/controller/ChatApiController.java → ...im/controller/api/ChatRestController.java b/...jectkim/controller/ChatApiController.java → ...im/controller/api/ChatRestController.java
@@ -1,4 +1,4 @@
-package com.khpt.projectkim.controller;
+package com.khpt.projectkim.controller.api;
 
 import com.khpt.projectkim.dto.ChatData;
 import org.springframework.web.bind.annotation.*;
@@ -9,7 +9,7 @@
 
 @RestController
 @RequestMapping("/chat")
-public class ChatApiController {
+public class ChatRestController {
     @PostMapping
     public ChatData sendChat(HttpSession session, @RequestBody List<ChatData> chatDataList) {
         // TODO API 요청으로 responseChat 가져오기

diff --git a/...ctkim/controller/ResultApiController.java → .../controller/api/ResultRestController.java b/...ctkim/controller/ResultApiController.java → .../controller/api/ResultRestController.java
@@ -1,4 +1,4 @@
-package com.khpt.projectkim.controller;
+package com.khpt.projectkim.controller.api;
 
 import com.khpt.projectkim.dto.ResultDto;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,9 +11,9 @@
 
 @RestController
 @RequestMapping("/result")
-public class ResultApiController {
+public class ResultRestController {
     @GetMapping
-    public List<ResultDto> getChats(HttpSession session) {
+    public List<ResultDto> getResult_test(HttpSession session) {
         ResultDto responseChat1 = new ResultDto("https://google.com", "comp", "제목", "지역", "대충급여", "대충형태", "대충시간", "몰?루", "경력");
         ResultDto responseChat2 = new ResultDto("https://google.com", "comp2", "제목2", "지역2", "대충급여2", "대충형태22", "대충시간22", "몰?루22", "경력22");
         ResultDto responseChat3 = new ResultDto("https://google.com", "comp3", "제목3", "지역3", "대충급여3", "대충형태33", "대충시간33", "몰?루33", "경력33");

diff --git a/...projectkim/controller/ChatController.java → ...ectkim/controller/web/ChatController.java b/...projectkim/controller/ChatController.java → ...ectkim/controller/web/ChatController.java
@@ -1,9 +1,8 @@
-package com.khpt.projectkim.controller;
+package com.khpt.projectkim.controller.web;
 
 import com.khpt.projectkim.dto.ExtractListFromUserDto;
 import com.khpt.projectkim.entity.User;
 import com.khpt.projectkim.service.ChatService;
-import com.khpt.projectkim.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -18,8 +17,6 @@ public class ChatController {
 
     private final ChatService chatService;
 
-    private final UserService userService;
-
     @ModelAttribute
     public void addAttributes(HttpServletRequest request, Model model) {
         model.addAttribute("current_url", request.getRequestURL().toString());

diff --git a/...rojectkim/controller/LoginController.java → ...ctkim/controller/web/LoginController.java b/...rojectkim/controller/LoginController.java → ...ctkim/controller/web/LoginController.java
@@ -1,4 +1,4 @@
-package com.khpt.projectkim.controller;
+package com.khpt.projectkim.controller.web;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

diff --git a/...projectkim/controller/ViewController.java → ...ectkim/controller/web/ViewController.java b/...projectkim/controller/ViewController.java → ...ectkim/controller/web/ViewController.java
@@ -1,4 +1,4 @@
-package com.khpt.projectkim.controller;
+package com.khpt.projectkim.controller.web;
 
 import com.khpt.projectkim.entity.User;
 import org.springframework.stereotype.Controller;
@@ -23,6 +23,6 @@ public String index(HttpSession session, Model model) {
     public String test(Model model) {
         Date date = new Date();
         model.addAttribute("date", date);
-        return "chatTest.mustache";
+        return "chatTest";
     }
 }