diff --git a/spring/notinote/src/main/java/com/answer/notinote/Notice/domain/repository/NoticeRepository.java b/spring/notinote/src/main/java/com/answer/notinote/Notice/domain/repository/NoticeRepository.java index 858f615..d79ad04 100644 --- a/spring/notinote/src/main/java/com/answer/notinote/Notice/domain/repository/NoticeRepository.java +++ b/spring/notinote/src/main/java/com/answer/notinote/Notice/domain/repository/NoticeRepository.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Repository; +import java.time.LocalDate; import java.util.List; import java.util.Optional; @@ -21,4 +22,6 @@ public interface NoticeRepository extends JpaRepository { List findUniqueNdate(User user); List findByUser(User user); + + List findByNdate(LocalDate date); } 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 index d1ebd31..6c32677 100644 --- 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 @@ -29,7 +29,7 @@ public List searchList(HttpServletRequest request){ } @RequestMapping(value="/search/detail", method = RequestMethod.GET) - public SearchDetailDto searchDetail(@RequestParam("date") LocalDate date, HttpServletRequest request){ + public SearchDetailDto searchDetail(@RequestParam("date") String date, HttpServletRequest request){ return searchService.searchDetailList(date, request); } diff --git a/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchDetailDto.java b/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchDetailDto.java index 2f36163..ab111cc 100644 --- a/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchDetailDto.java +++ b/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchDetailDto.java @@ -1,7 +1,19 @@ package com.answer.notinote.Search.dto; +import lombok.Builder; import lombok.Getter; +import java.time.LocalDate; +import java.util.List; + @Getter public class SearchDetailDto { + private LocalDate date; + private List results; + + @Builder + public SearchDetailDto(LocalDate date, List results){ + this.date = date; + this.results = results; + } } diff --git a/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchResultDetailDto.java b/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchResultDetailDto.java new file mode 100644 index 0000000..def3401 --- /dev/null +++ b/spring/notinote/src/main/java/com/answer/notinote/Search/dto/SearchResultDetailDto.java @@ -0,0 +1,24 @@ +package com.answer.notinote.Search.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Getter +@NoArgsConstructor +public class SearchResultDetailDto { + private Long id; + private String imageUri; + private List fullText; + private String korean; + + @Builder + public SearchResultDetailDto(Long id, String imageUri, List fullText, String korean){ + this.id = id; + this.imageUri = imageUri; + this.fullText = fullText; + this.korean = korean; + } +} 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 index b5008ee..6423d0b 100644 --- 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 @@ -5,6 +5,7 @@ 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.Search.dto.SearchResultDetailDto; import com.answer.notinote.User.domain.entity.User; import com.answer.notinote.User.domain.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +13,7 @@ import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -63,18 +65,38 @@ public List searchList(HttpServletRequest request){ return searchListDtos; } - public SearchDetailDto searchDetailList(LocalDate date, HttpServletRequest request) { + public SearchDetailDto searchDetailList(String date, HttpServletRequest request) { String token = jwtTokenProvider.resolveToken(request); String useremail = jwtTokenProvider.getUserEmail(token); User user = userRepository.findByUemail(useremail).orElseThrow(IllegalArgumentException::new); + LocalDate trans_date = LocalDate.parse(date, DateTimeFormatter.ISO_DATE); + List notices = noticeRepository.findByNdate(trans_date); - List notices = noticeRepository.findByNdate(date); - + System.out.println(notices); List> resultLists = new ArrayList<>(); List test = new ArrayList<>(); + + for (int i = 0; i fullText = new ArrayList<>(); + + SearchResultDetailDto searchResultDetailDto = SearchResultDetailDto.builder() + .imageUri(imageUri) + .id(id) + .korean(korean) + .fullText(fullText) + .build(); + + test.add(searchResultDetailDto); + } + + System.out.println(test); + SearchDetailDto searchDetailDto = SearchDetailDto.builder() - .date(date) + .date(trans_date) .results(test) .build();