Feat/#40 news category service #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Y-Joo
requested changes
Nov 27, 2023
Comment on lines
39
to
55
| @ApiDocumentResponse | ||
| @Operation(summary = "Today News List", description = "type이 Recent일 경우 최신 뉴스만 반환, type이 My일 경우 맞춤형 뉴스만 반환, 지정 하지 않을 시 모두 반환") | ||
| @GetMapping("/today/list") | ||
| public ResponseEntity<List<TodayHomeResponseDto>> getTodayNews(@ReqUser User user, @RequestParam(value = "type", defaultValue = "All") String type) { | ||
| List<TodayHomeResponseDto> responseDtoList = new ArrayList<>(); | ||
| if(type.equals("Recent")){ | ||
| responseDtoList.add(new TodayHomeResponseDto("Recent",newsService.getRecentNewsList(user))); | ||
| } | ||
| else if(type.equals("My")){ | ||
| responseDtoList.add(new TodayHomeResponseDto("My",newsService.getUserReferencedNewsList(user))); | ||
| } | ||
| else{ | ||
| responseDtoList.add(new TodayHomeResponseDto("Recent",newsService.getRecentNewsList(user))); | ||
| responseDtoList.add(new TodayHomeResponseDto("My",newsService.getUserReferencedNewsList(user))); | ||
| } | ||
| return ResponseDto.ok(responseDtoList); | ||
| } |
There was a problem hiding this comment.
이부분 Service method로 빼는게 좋을거같아요!
컨트롤러에서는 return만 하도록..
Comment on lines
29
to
31
| Quiz quiz = quizRepository.findById(solvedQuizRequestDto.getQuizId()).orElseThrow(() -> new CustomException(ErrorCode.QUIZ_NOT_FOUND)); | ||
|
|
||
| SolvedQuiz solvedQuiz = new SolvedQuiz(user,quiz, solvedQuizRequestDto.getSelectedAnswer()); |
Comment on lines
23
to
30
| NewsReadingTime readingTime = newsReadingTimeRepository.findByUserIdAndNewsId(user.getId(), newsId).orElseGet( | ||
| ()-> new NewsReadingTime(user.getId(), newsId) | ||
| ()-> { | ||
| News news = newsRepository.findById(newsId).get(); | ||
| return new NewsReadingTime(user.getId(), news); | ||
| } | ||
| ); | ||
| readingTime.updateReadingTime(secondTime); | ||
| newsReadingTimeRepository.save(readingTime); |
There was a problem hiding this comment.
findById에서 존재하지 않을 경우 처리가 필요할 것 같아요
| ); | ||
| readingTime.updateReadingTime(secondTime); | ||
| newsReadingTimeRepository.save(readingTime); | ||
| } | ||
|
|
||
| public Field mostOfCategoryReadingTime(User user){ |
There was a problem hiding this comment.
getMostReadingTimeCategory 혹은 getCategoryOfMostReadingTime으로 네이밍 바꾸는게 좋을 것 같아요
Comment on lines
38
to
52
| for(NewsReadingTime readingTime : newsReadingTimeList) { | ||
| Field field = readingTime.getNews().getField(); | ||
| if(categoryTimeMap.containsKey(field)) | ||
| categoryTimeMap.put(field, categoryTimeMap.get(field) + readingTime.getSecondTime()); | ||
| else | ||
| categoryTimeMap.put(field, readingTime.getSecondTime()); | ||
| } | ||
| int mostReadingTime = 0; | ||
| Field mostReadingTimeField = Field.DEFAULT; | ||
| for (Field key : categoryTimeMap.keySet()) { | ||
| if (categoryTimeMap.get(key) > mostReadingTime) { | ||
| mostReadingTime = categoryTimeMap.get(key); | ||
| mostReadingTimeField = key; | ||
| } | ||
| } |
There was a problem hiding this comment.
카테고리별 시간 계산하면서 최고 시간까지 같이 계산해버리면 for문을 한번만 써도 될 것 같아요!
Comment on lines
64
to
67
| public ResponseEntity<UserReferencedFieldResponseDto> getUserReferencedField(@ReqUser User user){ | ||
| UserReferencedFieldResponseDto fieldResponseDto = new UserReferencedFieldResponseDto(newsReadingTimeService.mostOfCategoryReadingTime(user)); | ||
| return ResponseDto.ok(fieldResponseDto); | ||
| } |
Y-Joo
approved these changes
Nov 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR 요약
(맞춤형 같은 경우, 최근 10개 가장 많이 읽은 카테고리와 온보딩 과정에서 선호하는 카테고리를 적절히 섞어서 추천)
📌 변경 사항
✅ PR check list
기존에 있는 ~/news/list 쓸 수 있도록 해놨는데 혹시 뭐 잘 못 지웠거나 기존꺼에서 충돌일어나는지
Linked Issue
close #40