[Feature] 베스트 셀러 Redis 조회 기능 및 스케쥴링 구현

.github/workflows/jisungin_dev.yml

@@ -114,13 +114,16 @@ jobs:
       # SSH Key로 서버에 접속하고 docker-compose image를 pull 받고 실행하기
       - name: Access Server with SSH Key, pull and execute docker-compose image
         uses: appleboy/[email protected]
+        env:
+          REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.KEY }}
           port: 22
           script: |
             cd jisungin
+            echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" > .env
             sudo docker-compose down
             sudo docker-compose pull
             sudo docker-compose up -d

build.gradle

@@ -35,6 +35,12 @@ dependencies {
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
     // Spring Data JPA
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    // Spring Data Redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    // Spring Retry
+    implementation 'org.springframework.retry:spring-retry'
+    // Spring Aspects
+    implementation 'org.springframework:spring-aspects'
     // Validation
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     // Spring Web
@@ -60,6 +66,11 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.16.2'
     // JsonPath Parse Json Library
     implementation 'com.jayway.jsonpath:json-path:2.9.0'
+    // Json Date Time Formatter
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+    // Test Container
+    testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+    testImplementation "org.testcontainers:junit-jupiter:1.17.3"
 }
 
 tasks.named('bootBuildImage') {

docker-compose.yml

@@ -11,6 +11,17 @@ services:
     networks:
       - my_network
 
+  redis:
+    image: redis
+    container_name: redis-cache
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+    command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}", "--port", "6379"]
+    ports:
+      - 6379:6379
+    networks:
+      - my_network
+
 networks:
   my_network:
     driver: bridge

src/main/java/com/jisungin/JisunginApplication.java

@@ -3,8 +3,14 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.retry.annotation.EnableRetry;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableCaching
+@EnableScheduling
+@EnableRetry
 @ConfigurationPropertiesScan
 public class JisunginApplication {
 

src/main/java/com/jisungin/api/book/BookController.java

@@ -2,11 +2,16 @@
 
 import com.jisungin.api.ApiResponse;
 import com.jisungin.api.book.request.BookCreateRequest;
+import com.jisungin.api.book.request.BookPageRequest;
+import com.jisungin.application.PageResponse;
+import com.jisungin.application.book.BestSellerService;
 import com.jisungin.application.book.BookService;
+import com.jisungin.application.book.response.BestSellerResponse;
 import com.jisungin.application.book.response.BookResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,12 +24,18 @@
 public class BookController {
 
     private final BookService bookService;
+    private final BestSellerService bestSellerService;
 
     @GetMapping("/books/{isbn}")
     public ApiResponse<BookResponse> getBook(@PathVariable("isbn") String isbn) {
         return ApiResponse.ok(bookService.getBook(isbn));
     }
 
+    @GetMapping("/books/best-seller")
+    public ApiResponse<PageResponse<BestSellerResponse>> getBestSellers(@ModelAttribute BookPageRequest page) {
+        return ApiResponse.ok(bestSellerService.getBestSellers(page.toServiceRequest()));
+    }
+
     @PostMapping("/books")
     public ApiResponse<BookResponse> createBook(@RequestBody @Valid BookCreateRequest request) {
         return ApiResponse.ok(bookService.createBook(request.toServiceRequest()));

src/main/java/com/jisungin/api/book/request/BookCreateRequest.java

@@ -7,7 +7,6 @@
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -67,7 +66,7 @@ private LocalDateTime convertToLocalDateTime(String dateTime) {
     }
 
     private String convertToString(String[] authors) {
-        return Arrays.toString(authors);
+        return String.join(", ", authors);
     }
 
 }

src/main/java/com/jisungin/api/book/request/BookPageRequest.java

@@ -0,0 +1,30 @@
+package com.jisungin.api.book.request;
+
+import com.jisungin.application.book.request.BookServicePageRequest;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class BookPageRequest {
+
+    Integer page;
+    Integer size;
+
+    @Builder
+    private BookPageRequest(Integer page, Integer size) {
+        this.page = page != null ? page : 1;
+        this.size = size != null ? size : 5;
+    }
+
+    public BookServicePageRequest toServiceRequest() {
+        return BookServicePageRequest.builder()
+                .page(page)
+                .size(size)
+                .build();
+    }
+
+}

src/main/java/com/jisungin/application/book/BestSellerService.java

@@ -0,0 +1,35 @@
+package com.jisungin.application.book;
+
+import com.jisungin.application.PageResponse;
+import com.jisungin.application.book.event.BestSellerUpdatedEvent;
+import com.jisungin.application.book.request.BookServicePageRequest;
+import com.jisungin.application.book.response.BestSellerResponse;
+import com.jisungin.domain.book.repository.BestSellerRepository;
+import com.jisungin.infra.crawler.Crawler;
+import com.jisungin.infra.crawler.CrawlingBook;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class BestSellerService {
+
+    private final Crawler crawler;
+    private final BestSellerRepository bestSellerRepository;
+    private final ApplicationEventPublisher eventPublisher;
+
+    public PageResponse<BestSellerResponse> getBestSellers(BookServicePageRequest page) {
+        return bestSellerRepository.findBestSellerByPage(page);
+    }
+
+
+    public void updateBestSellers() {
+        Map<Long, CrawlingBook> crawledBooks = crawler.crawlBestSellerBook();
+
+        bestSellerRepository.updateAll(crawledBooks);
+        eventPublisher.publishEvent(new BestSellerUpdatedEvent(crawledBooks));
+    }
+
+}

src/main/java/com/jisungin/application/book/BookService.java

@@ -8,6 +8,7 @@
 import com.jisungin.exception.BusinessException;
 import com.jisungin.exception.ErrorCode;
 import com.jisungin.infra.crawler.Crawler;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,9 +37,17 @@ public BookResponse createBook(BookCreateServiceRequest request) {
             throw new BusinessException(ErrorCode.BOOK_ALREADY_EXIST);
         }
 
-        request.addCrawlingData(crawler.crawlBook(request.getIsbn()));
+        BookCreateServiceRequest newServiceRequest = crawler.crawlBook(request.getIsbn()).toServiceRequest();
 
-        return BookResponse.of(bookRepository.save(request.toEntity()));
+        return BookResponse.of(bookRepository.save(newServiceRequest.toEntity()));
+    }
+
+    @Transactional
+    public void addNewBooks(List<BookCreateServiceRequest> requests) {
+        requests.stream()
+                .filter(request -> !bookRepository.existsBookByIsbn(request.getIsbn()))
+                .map(BookCreateServiceRequest::toEntity)
+                .forEach(bookRepository::save);
     }
 
 }

src/main/java/com/jisungin/application/book/event/BestSellerUpdatedEvent.java

@@ -0,0 +1,16 @@
+package com.jisungin.application.book.event;
+
+import com.jisungin.infra.crawler.CrawlingBook;
+import java.util.Map;
+import lombok.Getter;
+
+@Getter
+public class BestSellerUpdatedEvent {
+
+    private final Map<Long, CrawlingBook> crawledBooks;
+
+    public BestSellerUpdatedEvent(Map<Long, CrawlingBook> crawledBooks) {
+        this.crawledBooks = crawledBooks;
+    }
+
+}

src/main/java/com/jisungin/application/book/event/BestSellerUpdatedEventListener.java

@@ -0,0 +1,29 @@
+package com.jisungin.application.book.event;
+
+import com.jisungin.application.book.BookService;
+import com.jisungin.application.book.request.BookCreateServiceRequest;
+import com.jisungin.infra.crawler.CrawlingBook;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class BestSellerUpdatedEventListener {
+
+    private final BookService bookService;
+
+    @EventListener
+    public void handleBestSellerUpdatedEvent(BestSellerUpdatedEvent event) {
+        Map<Long, CrawlingBook> crawledBook = event.getCrawledBooks();
+
+        List<BookCreateServiceRequest> bookCreateServiceRequests = crawledBook.values().stream()
+                .map(CrawlingBook::toServiceRequest)
+                .toList();
+
+        bookService.addNewBooks(bookCreateServiceRequests);
+    }
+
+}

src/main/java/com/jisungin/application/book/request/BookCreateServiceRequest.java

@@ -46,9 +46,4 @@ public Book toEntity() {
                 .build();
     }
 
-    public void addCrawlingData(CrawlingBook crawlingBook) {
-        this.imageUrl = crawlingBook.getImageUrl();
-        this.contents = crawlingBook.isBlankContent() ? this.contents : crawlingBook.getContent();
-    }
-
 }

src/main/java/com/jisungin/application/book/request/BookServicePageRequest.java

@@ -0,0 +1,26 @@
+package com.jisungin.application.book.request;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class BookServicePageRequest {
+
+    private Integer page;
+    private Integer size;
+
+    @Builder
+    private BookServicePageRequest(Integer page, Integer size) {
+        this.page = page;
+        this.size = size;
+    }
+
+    public Integer extractStartIndex() {
+        return (page * size) - size + 1;
+    }
+
+    public Integer extractEndIndex() {
+        return page * size;
+    }
+
+}

src/main/java/com/jisungin/application/book/response/BestSellerResponse.java

@@ -0,0 +1,45 @@
+package com.jisungin.application.book.response;
+
+import java.time.LocalDateTime;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class BestSellerResponse {
+
+    private Long ranking;
+    private String isbn;
+    private String title;
+    private String publisher;
+    private String thumbnail;
+    private String[] authors;
+    private LocalDateTime dateTime;
+
+    @Builder
+    private BestSellerResponse(Long ranking, String isbn, String title, String publisher, String thumbnail,
+                               String[] authors, LocalDateTime dateTime) {
+        this.ranking = ranking;
+        this.isbn = isbn;
+        this.title = title;
+        this.publisher = publisher;
+        this.thumbnail = thumbnail;
+        this.authors = authors;
+        this.dateTime = dateTime;
+    }
+
+    public static BestSellerResponse of(Long ranking, String isbn, String title, String publisher, String thumbnail,
+                                        String[] authors, LocalDateTime dateTime) {
+        return BestSellerResponse.builder()
+                .ranking(ranking)
+                .isbn(isbn)
+                .title(title)
+                .publisher(publisher)
+                .thumbnail(thumbnail)
+                .authors(authors)
+                .dateTime(dateTime)
+                .build();
+    }
+
+}

src/main/java/com/jisungin/application/book/response/BookResponse.java

@@ -29,7 +29,7 @@ private BookResponse(String title, String content, String isbn, String publisher
         this.publisher = publisher;
         this.imageUrl = imageUrl;
         this.thumbnail = thumbnail;
-        this.authors = convertAuthorsToString(authors);
+        this.authors = convertAuthorsToArr(authors);
         this.ratingAverage = parseRatingAverage(ratingAverage);
         this.dateTime = dateTime;
     }
@@ -62,8 +62,8 @@ public static BookResponse of(Book book, Double ratingAverage) {
                 .build();
     }
 
-    private String[] convertAuthorsToString(String authors) {
-        return authors.split(", ");
+    private String[] convertAuthorsToArr(String authors) {
+        return authors.split(",");
     }
 
     private Double parseRatingAverage(Double ratingAverage) {