[#52] refactor: typographical error save_title to saved_titles

dsc-sookmyung · Mar 26, 2022 · 53c6d5a · 53c6d5a
1 parent c99b535
commit 53c6d5a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/spring/notinote/src/main/java/com/answer/notinote/Search/controller/SearchController.java b/spring/notinote/src/main/java/com/answer/notinote/Search/controller/SearchController.java
@@ -1,13 +1,16 @@
 package com.answer.notinote.Search.controller;
 
+import com.answer.notinote.Search.dto.SearchDetailDto;
 import com.answer.notinote.Search.dto.SearchListDto;
 import com.answer.notinote.Search.service.SearchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.util.List;
 
 @RestController
@@ -25,9 +28,9 @@ public List<SearchListDto> searchList(HttpServletRequest request){
         return searchService.searchList(request);
     }
 
-    @RequestMapping(value="/search/{nid}", method = RequestMethod.GET)
-    public String searchDetail(){
-        return "SearchDetail";
+    @RequestMapping(value="/search/detail", method = RequestMethod.GET)
+    public SearchDetailDto searchDetail(@RequestParam("date") LocalDate date, HttpServletRequest request){
+        return searchService.searchDetailList(date, request);
     }
 
 }
diff --git a/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchListDto.java b/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchListDto.java
@@ -12,12 +12,12 @@
 @NoArgsConstructor
 public class SearchListDto {
     private LocalDate date;
-    private List<String> save_titles;
+    private List<String> saved_titles;
 
     @Builder
-    public SearchListDto(LocalDate date, List<String> save_titles){
+    public SearchListDto(LocalDate date, List<String> saved_titles){
         this.date = date;
-        this.save_titles = save_titles;
+        this.saved_titles = saved_titles;
     }
 
 

diff --git a/spring/notinote/src/main/java/com/answer/notinote/Search/service/SearchService.java b/spring/notinote/src/main/java/com/answer/notinote/Search/service/SearchService.java
@@ -3,6 +3,7 @@
 import com.answer.notinote.Auth.token.provider.JwtTokenProvider;
 import com.answer.notinote.Notice.domain.entity.Notice;
 import com.answer.notinote.Notice.domain.repository.NoticeRepository;
+import com.answer.notinote.Search.dto.SearchDetailDto;
 import com.answer.notinote.Search.dto.SearchListDto;
 import com.answer.notinote.User.domain.entity.User;
 import com.answer.notinote.User.domain.repository.UserRepository;
@@ -55,11 +56,29 @@ public List<SearchListDto> searchList(HttpServletRequest request){
             titleLists.add(titleList);
             SearchListDto searchListDto = SearchListDto.builder()
                     .date(dateList.get(i))
-                    .save_titles(titleLists.get(i))
+                    .saved_titles(titleLists.get(i))
                     .build();
             searchListDtos.add(searchListDto);
         }
         return searchListDtos;
     }
 
+    public SearchDetailDto searchDetailList(LocalDate date, HttpServletRequest request) {
+
+        String token = jwtTokenProvider.resolveToken(request);
+        String useremail = jwtTokenProvider.getUserEmail(token);
+        User user = userRepository.findByUemail(useremail).orElseThrow(IllegalArgumentException::new);
+
+        List<Notice> notices = noticeRepository.findByNdate(date);
+
+        List<List<Object>> resultLists = new ArrayList<>();
+        List<Object> test = new ArrayList<>();
+        SearchDetailDto searchDetailDto = SearchDetailDto.builder()
+                .date(date)
+                .results(test)
+                .build();
+
+        return searchDetailDto;
+
+    }
 }