Merge pull request #39 from jwpark1211/develop

Develop
jwpark1211 · Jun 15, 2024 · 49ee170 · 49ee170
2 parents c75c98d + a8ef79c
commit 49ee170
Show file tree

Hide file tree

Showing 15 changed files with 311 additions and 44 deletions.
diff --git a/src/main/java/capstone/bookitty/common/RedisConfig.java b/src/main/java/capstone/bookitty/common/RedisConfig.java
@@ -33,7 +33,7 @@ public class RedisConfig {
     @Value("${spring.redis.timeout:60000}")
     private long timeout;
 
-    @Value("${spring.redis.cache.ttl:1800}")
+    @Value("${spring.redis.cache.ttl:10800}") //TTL = 3시간
     private long cacheTtl;
 
     @Bean

diff --git a/src/main/java/capstone/bookitty/domain/controller/BookStateController.java b/src/main/java/capstone/bookitty/domain/controller/BookStateController.java
@@ -59,6 +59,17 @@ public ResponseEntity<? extends BasicResponse> getStateById(
                         bookStateService.findStateByStateId(stateId)));
     }
 
+    @Operation(summary = "isbn과 memberId로 책 상태 가져오기")
+    @GetMapping(path = "/isbn/{isbn}/member/{member-id}")
+    public ResponseEntity<? extends BasicResponse> getStateByMemberIdAndIsbn(
+            @PathVariable("member-id") Long memberId,
+            @PathVariable("isbn") String isbn
+    ){
+        return ResponseEntity.ok()
+                .body(new ResponseCounter<StateInfoResponse>(
+                        bookStateService.findStateByMemberAndIsbn(isbn,memberId)));
+    }
+
     @Operation(summary = "memberId로 책 상태 리스트 가져오기 / page는 requestParam으로 요청할 수 있습니다. / "+
             "size(한 페이지 당 element 수, default = 10), page(요청하는 페이지, 0부터 시작)")
     @GetMapping(path = "/member/{member-id}")
@@ -90,6 +101,7 @@ public ResponseEntity<? extends BasicResponse> updateState(
                         bookStateService.updateState(stateId,request)));
     }
 
+
     @Operation(summary = "state 삭제")
     @DeleteMapping(path = "/{state-id}")
     public ResponseEntity<? extends BasicResponse> deleteState(

diff --git a/src/main/java/capstone/bookitty/domain/controller/OpenApiBookController.java b/src/main/java/capstone/bookitty/domain/controller/OpenApiBookController.java
@@ -1,10 +1,7 @@
 package capstone.bookitty.domain.controller;
 
 import capstone.bookitty.domain.service.OpenApiBookService;
-import capstone.bookitty.global.api.dto.AladinBestSellerResponseDTO;
-import capstone.bookitty.global.api.dto.AladinBookListResponseDTO;
-import capstone.bookitty.global.api.dto.AladinBookSearchResponseDTO;
-import capstone.bookitty.global.api.dto.NaruPopularBookListDto;
+import capstone.bookitty.global.api.dto.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -14,6 +11,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 @Tag(name = "openApi(book)", description = "알라딘 api 입니다.")
 @RestController
 @RequiredArgsConstructor
@@ -66,11 +65,18 @@ public Mono<AladinBestSellerResponseDTO> getBestSellerBlogChoice(){
         return openApiBookService.getBlogChoice();
     }
 
-    @Operation(summary = "사용자별 도서 추천 Top 10")
-    @GetMapping(path = "/recommend/members/{member-id}")
-    public NaruPopularBookListDto getRecommendationByAgeAndGender(
+    //@Operation(summary = "사용자별 도서 추천 Top 10")
+    //@GetMapping(path = "/recommend/members/{member-id}")
+    /*public NaruPopularBookListDto getRecommendationByAgeAndGender(
             @PathVariable("member-id") Long memberId
     ){
         return openApiBookService.getGenderAndAgeRecommendation(memberId);
+    }*/
+
+    @Operation(summary = "사용자별 도서 추천 Top 10")
+    @GetMapping(path = "/recommend/members/{member-id}")
+    public NaruPopularBookListDto getRecommendations(
+            @PathVariable("member-id") long memberId) {
+        return openApiBookService.getTop10ForMember(memberId);
     }
 }
diff --git a/src/main/java/capstone/bookitty/domain/controller/StarController.java b/src/main/java/capstone/bookitty/domain/controller/StarController.java
@@ -81,6 +81,17 @@ public ResponseEntity<? extends BasicResponse> getStarByMemberId(
                         starService.findStarByMemberId(memberId,pageable)));
     }
 
+    @Operation(summary = "member id와 isbn으로 평점 가져오기")
+    @GetMapping(path = "/member/{member-id}/isbn/{isbn}")
+    public ResponseEntity<? extends BasicResponse> getStarByIsbnAndMemberId(
+            @PathVariable("isbn") String isbn,
+            @PathVariable("member-id") Long memberId
+    ){
+        return ResponseEntity.ok()
+                .body(new ResponseCounter<StarInfoResponse>(
+                        starService.findStarByMemberIdAndIsbn(memberId,isbn)));
+    }
+
     @Operation(summary = "평점 수정")
     @PatchMapping(path="/{star-id}")
     public ResponseEntity<? extends BasicResponse> updateStar(

diff --git a/src/main/java/capstone/bookitty/domain/entity/Gender.java b/src/main/java/capstone/bookitty/domain/entity/Gender.java
@@ -4,9 +4,6 @@
 
 @RequiredArgsConstructor
 public enum Gender {
-    MALE("남성"),
-    FEMALE("여성")
-    ;
-
-    private final String gender;
+    MALE, FEMALE
 }
+
diff --git a/src/main/java/capstone/bookitty/domain/repository/BookStateRepository.java b/src/main/java/capstone/bookitty/domain/repository/BookStateRepository.java
@@ -1,12 +1,14 @@
 package capstone.bookitty.domain.repository;
 
 import capstone.bookitty.domain.entity.BookState;
+import capstone.bookitty.domain.entity.Gender;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
-import javax.swing.text.html.Option;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -17,5 +19,12 @@ public interface BookStateRepository extends JpaRepository<BookState,Long> {
     List<BookState> findByMemberId(Long memberId);
     boolean existsByMemberIdAndIsbn(Long memberId, String isbn);
     Optional<BookState> findByMemberIdAndIsbn(Long memberId, String isbn);
+    @Query("SELECT b.isbn, COUNT(b) as stateCount " +
+            "FROM BookState b " +
+            "WHERE b.member.gender = :gender AND b.member.birthDate BETWEEN :startDate AND :endDate " +
+            "GROUP BY b.isbn")
+    List<Object[]> findStateCountByGenderAndBirthDate(@Param("gender") Gender gender,
+                                                      @Param("startDate") LocalDate startDate,
+                                                      @Param("endDate") LocalDate endDate);
 
 }
diff --git a/src/main/java/capstone/bookitty/domain/repository/StarRepository.java b/src/main/java/capstone/bookitty/domain/repository/StarRepository.java
@@ -1,14 +1,28 @@
 package capstone.bookitty.domain.repository;
 
+import capstone.bookitty.domain.entity.BookState;
+import capstone.bookitty.domain.entity.Gender;
 import capstone.bookitty.domain.entity.Star;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface StarRepository extends JpaRepository<Star, Long> {
     boolean existsByMemberIdAndIsbn(Long memberId, String isbn);
     Page<Star> findByIsbn(String isbn, Pageable pageable);
     Page<Star> findByMemberId(Long memberId, Pageable pageable);
+    Optional<Star> findByMemberIdAndIsbn(Long memberId, String isbn);
+    @Query("SELECT s.isbn, SUM(s.score) as totalScore " +
+            "FROM Star s " +
+            "WHERE s.member.gender = :gender AND s.member.birthDate BETWEEN :startDate AND :endDate " +
+            "GROUP BY s.isbn")
+    List<Object[]> findTotalScoreByGenderAndBirthDate(@Param("gender") Gender gender,
+                                                      @Param("startDate") LocalDate startDate,
+                                                      @Param("endDate") LocalDate endDate);
 }
diff --git a/src/main/java/capstone/bookitty/domain/service/BookStateService.java b/src/main/java/capstone/bookitty/domain/service/BookStateService.java
@@ -65,6 +65,13 @@ public Page<StateInfoResponse> findStateByISBN(String isbn, Pageable pageable) {
                 .map(StateInfoResponse::of);
     }
 
+    public StateInfoResponse findStateByMemberAndIsbn(String isbn, Long memberId){
+        BookState state = stateRepository.findByMemberIdAndIsbn(memberId,isbn)
+                .orElseThrow(()-> new EntityNotFoundException(
+                        "BookState with memberID:"+memberId+",Isbn:"+isbn+"not found."));
+        return StateInfoResponse.of(state);
+    }
+
     public StateInfoResponse findStateByStateId(Long stateId) {
         return stateRepository.findById(stateId)
                 .map(StateInfoResponse::of)

diff --git a/src/main/java/capstone/bookitty/domain/service/OpenApiBookService.java b/src/main/java/capstone/bookitty/domain/service/OpenApiBookService.java
@@ -2,11 +2,10 @@
 
 import capstone.bookitty.domain.entity.Gender;
 import capstone.bookitty.domain.entity.Member;
+import capstone.bookitty.domain.repository.BookStateRepository;
 import capstone.bookitty.domain.repository.MemberRepository;
-import capstone.bookitty.global.api.dto.AladinBestSellerResponseDTO;
-import capstone.bookitty.global.api.dto.AladinBookListResponseDTO;
-import capstone.bookitty.global.api.dto.AladinBookSearchResponseDTO;
-import capstone.bookitty.global.api.dto.NaruPopularBookListDto;
+import capstone.bookitty.domain.repository.StarRepository;
+import capstone.bookitty.global.api.dto.*;
 import capstone.bookitty.global.api.openApi.AladinOpenApi;
 import capstone.bookitty.global.api.openApi.NaruOpenApi;
 import jakarta.persistence.EntityNotFoundException;
@@ -17,6 +16,10 @@
 
 import java.time.LocalDate;
 import java.time.Period;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -25,6 +28,8 @@ public class OpenApiBookService {
     private final AladinOpenApi aladinOpenApi;
     private final NaruOpenApi naruOpenApi;
     private final MemberRepository memberRepository;
+    private final StarRepository starRepository;
+    private final BookStateRepository bookStateRepository;
 
     public Mono<AladinBookListResponseDTO> searchByBookISBN(String isbn) {
         return aladinOpenApi.searchByBookISBN(isbn);
@@ -54,15 +59,101 @@ public Mono<AladinBestSellerResponseDTO> getBlogChoice() {
         return aladinOpenApi.getBlogChoice();
     }
 
-    @Cacheable(value = "genderAndAge", key = "#a0",unless="#result == null")
-    public NaruPopularBookListDto getGenderAndAgeRecommendation(Long memberId) {
+    @Cacheable(value = "bookRecommendations", key = "#a0",unless="#result == null")
+    public NaruPopularBookListDto getTop10ForMember(long memberId) {
         Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new EntityNotFoundException("Member not found for ID: " + memberId));
+                .orElseThrow(() -> new IllegalArgumentException("Invalid member ID"));
 
-        int gender = (member.getGender() == Gender.MALE) ? 1 : 2;
-        int age = Period.between(member.getBirthDate(), LocalDate.now()).getYears();
-        age = (age / 10) * 10;
+        Gender gender = member.getGender();
+        LocalDate birthDate = member.getBirthDate();
+        int age = Period.between(birthDate, LocalDate.now()).getYears();
+        String ageGroup = determineAgeGroup(age);
 
-        return naruOpenApi.getPopularBook(gender, age);
+        List<String> top10IsbnList = getTop10IsbnForMember(gender, ageGroup);
+        List<NaruPopularBookDto> bookInfoList = top10IsbnList.stream()
+                .map(this::searchByBookISBN)
+                .map(mono -> mono.block())  // Mono를 block하여 동기적으로 결과를 가져오기
+                .map(this::convertToNaruPopularBookDto)
+                .collect(Collectors.toList());
+
+        // 각 책의 랭킹을 설정
+        for (int i = 0; i < bookInfoList.size(); i++) {
+            bookInfoList.get(i).getDoc().setRanking(i + 1);
+        }
+
+        NaruPopularBookListDto responseWrapper = new NaruPopularBookListDto();
+        NaruPopularBookListDto.PopularBookListResponse response = new NaruPopularBookListDto.PopularBookListResponse();
+        response.setResultNum(bookInfoList.size());
+        response.setDocs(bookInfoList);
+        responseWrapper.setResponse(response);
+
+        return responseWrapper;
+    }
+
+    private String determineAgeGroup(int age) {
+        if (age <= 20) {
+            return "TEEN";
+        } else if (age <= 40) {
+            return "ADULT";
+        } else {
+            return "MIDDLE_AGED";
+        }
+    }
+
+    private NaruPopularBookDto convertToNaruPopularBookDto(AladinBookListResponseDTO aladinBook) {
+        NaruPopularBookDto dto = new NaruPopularBookDto();
+        NaruPopularBookDto.PopularBook popularBook = new NaruPopularBookDto.PopularBook();
+
+        AladinBookListResponseDTO.DetailBook detailBook = aladinBook.getItem().get(0);  // 첫 번째 책 정보 사용
+        popularBook.setBookname(detailBook.getTitle());
+        popularBook.setAuthors(detailBook.getAuthor());
+        popularBook.setPublisher(detailBook.getPublisher());
+        popularBook.setIsbn13(detailBook.getIsbn13());
+        popularBook.setBookImageURL(detailBook.getCover());
+
+        dto.setDoc(popularBook);
+        return dto;
+    }
+
+    private List<String> getTop10IsbnForMember(Gender gender, String ageGroup) {
+        LocalDate endDate = LocalDate.now();
+        LocalDate startDate;
+
+        switch (ageGroup) {
+            case "TEEN":
+                startDate = endDate.minusYears(20);
+                break;
+            case "ADULT":
+                startDate = endDate.minusYears(40);
+                break;
+            case "MIDDLE_AGED":
+                startDate = endDate.minusYears(60);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid age group");
+        }
+
+        List<Object[]> totalScores = starRepository.findTotalScoreByGenderAndBirthDate(gender, startDate, endDate);
+        List<Object[]> stateCounts = bookStateRepository.findStateCountByGenderAndBirthDate(gender, startDate, endDate);
+
+        Map<String, Double> isbnScores = new HashMap<>();
+
+        for (Object[] scoreData : totalScores) {
+            String isbn = (String) scoreData[0];
+            Double score = (Double) scoreData[1];
+            isbnScores.put(isbn, score);
+        }
+
+        for (Object[] stateData : stateCounts) {
+            String isbn = (String) stateData[0];
+            Long count = (Long) stateData[1];
+            isbnScores.merge(isbn, count * 5.0, Double::sum);
+        }
+
+        return isbnScores.entrySet().stream()
+                .sorted((e1, e2) -> e2.getValue().compareTo(e1.getValue()))
+                .limit(10)
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/capstone/bookitty/domain/service/StarService.java b/src/main/java/capstone/bookitty/domain/service/StarService.java
@@ -80,4 +80,11 @@ public Page<StarInfoResponse> findAllStar(Pageable pageable) {
         return starRepository.findAll(pageable)
                 .map(StarInfoResponse::of);
     }
+
+    public StarInfoResponse findStarByMemberIdAndIsbn(Long memberId, String isbn) {
+        Star star = starRepository.findByMemberIdAndIsbn(memberId,isbn)
+                .orElseThrow(()-> new EntityNotFoundException(
+                        "Star with memberID:"+memberId+",Isbn:"+isbn+"not found."));
+        return StarInfoResponse.of(star);
+    }
 }
diff --git a/src/main/java/capstone/bookitty/global/api/dto/AladinBookListResponseDTO.java b/src/main/java/capstone/bookitty/global/api/dto/AladinBookListResponseDTO.java
@@ -1,11 +1,15 @@
 package capstone.bookitty.global.api.dto;
 
+import lombok.Getter;
+
 import java.util.List;
 
+@Getter
 public class AladinBookListResponseDTO {
 
     public List<DetailBook> item;
 
+    @Getter
     public static class DetailBook {
         public String title;
         public String link;

diff --git a/src/main/java/capstone/bookitty/global/api/dto/NaruPopularBookDto.java b/src/main/java/capstone/bookitty/global/api/dto/NaruPopularBookDto.java
@@ -8,13 +8,14 @@
 public class NaruPopularBookDto {
     public PopularBook doc;
 
+    @Getter
+    @Setter
     public static class PopularBook {
         public String bookname;
         public String authors;
         public String publisher;
         public int ranking;
         public String isbn13;
         public String bookImageURL;
-
     }
 }
diff --git a/src/main/java/capstone/bookitty/global/api/dto/NaruPopularBookListDto.java b/src/main/java/capstone/bookitty/global/api/dto/NaruPopularBookListDto.java
@@ -5,10 +5,13 @@
 
 import java.util.List;
 
-@Getter @Setter
+@Getter
+@Setter
 public class NaruPopularBookListDto {
     public PopularBookListResponse response;
 
+    @Getter
+    @Setter
     public static class PopularBookListResponse {
         public int resultNum;
         public List<NaruPopularBookDto> docs;