Skip to content

Commit

Permalink
[#52] feat: search detail API
Browse files Browse the repository at this point in the history
  • Loading branch information
hellouz818 committed Mar 26, 2022
1 parent 53c6d5a commit 4e96ea9
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.stereotype.Repository;


import java.time.LocalDate;
import java.util.List;
import java.util.Optional;

Expand All @@ -21,4 +22,6 @@ public interface NoticeRepository extends JpaRepository<Notice, Long> {
List<SearchDateInf> findUniqueNdate(User user);

List<Notice> findByUser(User user);

List<Notice> findByNdate(LocalDate date);
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public List<SearchListDto> 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);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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<Object> results;

@Builder
public SearchDetailDto(LocalDate date, List<Object> results){
this.date = date;
this.results = results;
}
}
Original file line number Diff line number Diff line change
@@ -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<Object> fullText;
private String korean;

@Builder
public SearchResultDetailDto(Long id, String imageUri, List<Object> fullText, String korean){
this.id = id;
this.imageUri = imageUri;
this.fullText = fullText;
this.korean = korean;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
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;
import org.springframework.stereotype.Service;

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;
Expand Down Expand Up @@ -63,18 +65,38 @@ public List<SearchListDto> 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<Notice> notices = noticeRepository.findByNdate(trans_date);

List<Notice> notices = noticeRepository.findByNdate(date);

System.out.println(notices);
List<List<Object>> resultLists = new ArrayList<>();
List<Object> test = new ArrayList<>();

for (int i = 0; i<notices.size(); i++){
String imageUri = notices.get(i).getNimageurl()+"/"+notices.get(i).getNimagename();
Long id = notices.get(i).getNid();
String korean = notices.get(i).getOrigin_full();
List<Object> 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();

Expand Down

0 comments on commit 4e96ea9

Please sign in to comment.