feat: implement portfolio batch service

api-server/src/test/java/nexters/payout/apiserver/stock/application/StockQueryServiceTest.java

@@ -111,7 +111,7 @@ void setUp() {
         int lastYear = LocalDate.now().getYear() - 1;
         Instant exDividendDate = LocalDate.now().minusYears(1).plusDays(1).atStartOfDay().toInstant(UTC);
         Stock appl = StockFixture.createStock(AAPL, Sector.TECHNOLOGY, 2.0);
-        Dividend dividend = DividendFixture.createDividendWithPaymentDate(appl.getId(), 0.5, exDividendDate);
+        Dividend dividend = DividendFixture.createDividendWithExDividendDate(appl.getId(), 0.5, exDividendDate);
 
         given(stockRepository.findByTicker(any())).willReturn(Optional.of(appl));
         given(dividendRepository.findAllByStockId(any())).willReturn(List.of(dividend));

api-server/src/test/java/nexters/payout/apiserver/stock/presentation/integration/StockControllerTest.java

@@ -193,8 +193,7 @@ class StockControllerTest extends IntegrationTest {
         Double price = null;
         Double dividend = 12.0;
         Stock tsla = stockRepository.save(StockFixture.createStock(TSLA, Sector.CONSUMER_CYCLICAL, price));
-        Instant paymentDate = LocalDate.of(2023, 4, 5).atStartOfDay().toInstant(UTC);
-        dividendRepository.save(DividendFixture.createDividendWithPaymentDate(tsla.getId(), dividend, paymentDate));
+        dividendRepository.save(DividendFixture.createDividendWithDividend(tsla.getId(), dividend));
 
         // when, then
         StockDetailResponse stockDetailResponse = RestAssured
@@ -210,9 +209,7 @@ class StockControllerTest extends IntegrationTest {
 
         assertAll(
                 () -> assertThat(stockDetailResponse.dividendPerShare()).isEqualTo(dividend),
-                () -> assertThat(stockDetailResponse.dividendYield()).isEqualTo(0),
-                () -> assertThat(stockDetailResponse.earliestPaymentDate()).isEqualTo(LocalDate.of(LocalDate.now().getYear(), 4, 5)),
-                () -> assertThat(stockDetailResponse.dividendMonths()).isEqualTo(List.of(Month.APRIL))
+                () -> assertThat(stockDetailResponse.dividendYield()).isEqualTo(0)
         );
     }
 

batch/src/main/java/nexters/payout/batch/application/DividendBatchService.java

@@ -3,7 +3,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import nexters.payout.batch.application.FinancialClient.DividendData;
+import nexters.payout.batch.application.client.FinancialClient;
+import nexters.payout.batch.application.client.FinancialClient.DividendData;
 import nexters.payout.domain.dividend.domain.Dividend;
 import nexters.payout.domain.dividend.application.DividendCommandService;
 import nexters.payout.domain.stock.domain.Stock;

batch/src/main/java/nexters/payout/batch/application/PortfolioBatchService.java

@@ -0,0 +1,36 @@
+package nexters.payout.batch.application;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import nexters.payout.domain.portfolio.domain.Portfolio;
+import nexters.payout.domain.portfolio.domain.repository.PortfolioRepository;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+@Transactional
+public class PortfolioBatchService {
+
+    private final PortfolioRepository portfolioRepository;
+
+    @Scheduled(cron = "${schedules.cron.portfolio}", zone = "UTC")
+    void deletePortfolio() {
+        log.info("delete portfolio start..");
+        portfolioRepository.deleteAllByIdInQuery(getExpiredPortfolioIds());
+        log.info("delete portfolio end..");
+    }
+
+    private List<UUID> getExpiredPortfolioIds() {
+        return portfolioRepository.findByExpireAtBefore(Instant.now())
+                .stream()
+                .map(Portfolio::getId)
+                .toList();
+    }
+}

batch/src/main/java/nexters/payout/batch/application/StockBatchService.java

@@ -2,7 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nexters.payout.batch.application.FinancialClient.StockData;
+import nexters.payout.batch.application.client.FinancialClient;
+import nexters.payout.batch.application.client.FinancialClient.StockData;
+import nexters.payout.batch.application.client.StockLogo;
 import nexters.payout.domain.stock.application.StockCommandService;
 import nexters.payout.domain.stock.domain.repository.StockRepository;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -24,7 +26,7 @@ public class StockBatchService {
      * UTC 시간대 기준 매일 자정에 모든 종목의 현재가와 거래량을 업데이트합니다.
      */
     @Scheduled(cron = "${schedules.cron.stock}", zone = "UTC")
-    void run() {
+    void updateStock() {
         log.info("update stock start..");
         List<StockData> stockList = financialClient.getLatestStockList();
 

batch/src/main/java/nexters/payout/batch/application/FinancialClient.java → batch/src/main/java/nexters/payout/batch/application/client/FinancialClient.java

@@ -1,4 +1,4 @@
-package nexters.payout.batch.application;
+package nexters.payout.batch.application.client;
 
 import nexters.payout.domain.stock.domain.Sector;
 import nexters.payout.domain.stock.domain.Stock;
@@ -24,11 +24,11 @@ record StockData(
             Integer volume,
             Integer avgVolume
     ) {
-        Stock toDomain() {
+        public Stock toDomain() {
             return new Stock(ticker, name, sector, exchange, industry, price, volume, null);
         }
 
-        Stock toDomain(String logoUrl) {
+        public Stock toDomain(String logoUrl) {
             return new Stock(ticker, name, sector, exchange, industry, price, volume, logoUrl);
         }
     }

batch/src/main/java/nexters/payout/batch/application/StockLogo.java → batch/src/main/java/nexters/payout/batch/application/client/StockLogo.java

@@ -1,4 +1,4 @@
-package nexters.payout.batch.application;
+package nexters.payout.batch.application.client;
 
 public interface StockLogo {
     String getLogoUrl(String ticker);

batch/src/main/java/nexters/payout/batch/infra/fmp/FmpDto.java

@@ -3,7 +3,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import nexters.payout.batch.application.FinancialClient.DividendData;
+import nexters.payout.batch.application.client.FinancialClient.DividendData;
 import nexters.payout.core.time.DateFormat;
 
 @Getter

batch/src/main/java/nexters/payout/batch/infra/fmp/FmpFinancialClient.java

@@ -1,7 +1,7 @@
 package nexters.payout.batch.infra.fmp;
 
 import lombok.extern.slf4j.Slf4j;
-import nexters.payout.batch.application.FinancialClient;
+import nexters.payout.batch.application.client.FinancialClient;
 import nexters.payout.core.time.DateFormat;
 import nexters.payout.core.time.InstantProvider;
 import nexters.payout.domain.stock.domain.Exchange;

batch/src/main/java/nexters/payout/batch/infra/ninjas/NinjasFinancialClient.java

@@ -1,7 +1,7 @@
 package nexters.payout.batch.infra.ninjas;
 
 import lombok.extern.slf4j.Slf4j;
-import nexters.payout.batch.application.StockLogo;
+import nexters.payout.batch.application.client.StockLogo;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 

batch/src/main/resources/application-dev.yml

@@ -28,6 +28,7 @@ financial:
 schedules:
   cron:
     stock: "0 0 3 * * *"
+    portfolio: "-"
     dividend:
       past: "0 0 4 * * 0"
       future: "0 0 4 * * *"

batch/src/main/resources/application-prod.yml

@@ -25,6 +25,7 @@ spring:
 schedules:
   cron:
     stock: "0 0 2 * * *"
+    portfolio: "0 0 0 * * *"
     dividend:
       past: "0 0 4 * * 0"
       future: "0 0 4 * * *"

batch/src/main/resources/application-test.yml

@@ -17,6 +17,7 @@ spring:
 schedules:
   cron:
     stock: "-"
+    portfolio: "-"
     dividend:
       past: "-"
       future: "-"

batch/src/test/java/nexters/payout/batch/application/DividendBatchServiceTest.java

@@ -1,5 +1,6 @@
 package nexters.payout.batch.application;
 
+import nexters.payout.batch.application.client.FinancialClient;
 import nexters.payout.batch.common.AbstractBatchServiceTest;
 import nexters.payout.domain.DividendFixture;
 import nexters.payout.domain.StockFixture;

batch/src/test/java/nexters/payout/batch/application/LatestStockFixture.java

@@ -2,7 +2,7 @@
 
 import nexters.payout.domain.stock.domain.Exchange;
 import nexters.payout.domain.stock.domain.Sector;
-import nexters.payout.batch.application.FinancialClient.StockData;
+import nexters.payout.batch.application.client.FinancialClient.StockData;
 
 public class LatestStockFixture {
     public static StockData createStockData(String ticker, Double price, Integer volume) {

batch/src/test/java/nexters/payout/batch/application/PortfolioBatchServiceTest.java

@@ -0,0 +1,45 @@
+package nexters.payout.batch.application;
+
+import nexters.payout.batch.common.AbstractBatchServiceTest;
+import nexters.payout.domain.PortfolioFixture;
+import nexters.payout.domain.portfolio.domain.Portfolio;
+import nexters.payout.domain.portfolio.domain.PortfolioStock;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static nexters.payout.domain.PortfolioFixture.STOCK_ID;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
+class PortfolioBatchServiceTest extends AbstractBatchServiceTest {
+
+    @Test
+    void 만료기간이_지난_포트폴리오는_삭제한다() {
+        // given
+        portfolioRepository.save(PortfolioFixture.createPortfolio(
+                Instant.now().minus(1, ChronoUnit.DAYS),
+                List.of(new PortfolioStock(STOCK_ID, 1))
+        ));
+        portfolioRepository.save(PortfolioFixture.createPortfolio(
+                Instant.now().minus(2, ChronoUnit.DAYS),
+                List.of(new PortfolioStock(STOCK_ID, 2))
+        ));
+        Portfolio notExpiredPortfolio = portfolioRepository.save(PortfolioFixture.createPortfolio(
+                Instant.now().plus(1, ChronoUnit.DAYS),
+                List.of(new PortfolioStock(STOCK_ID, 1))
+        ));
+
+        // when
+        portfolioBatchService.deletePortfolio();
+
+        // then
+        List<Portfolio> actual = portfolioRepository.findAll();
+        assertAll(
+                () -> assertThat(actual).hasSize(1),
+                () -> assertThat(actual.get(0)).isEqualTo(notExpiredPortfolio)
+        );
+    }
+}

batch/src/test/java/nexters/payout/batch/application/StockBatchServiceTest.java

@@ -1,5 +1,6 @@
 package nexters.payout.batch.application;
 
+import nexters.payout.batch.application.client.FinancialClient;
 import nexters.payout.batch.common.AbstractBatchServiceTest;
 import nexters.payout.domain.StockFixture;
 import nexters.payout.domain.stock.domain.Stock;
@@ -23,7 +24,7 @@ class StockBatchServiceTest extends AbstractBatchServiceTest {
         given(financialClient.getLatestStockList()).willReturn(List.of(stockData));
 
         // when
-        stockBatchService.run();
+        stockBatchService.updateStock();
 
         // then
         Stock actual = stockRepository.findByTicker(stock.getTicker()).get();

batch/src/test/java/nexters/payout/batch/common/AbstractBatchServiceTest.java

@@ -1,9 +1,11 @@
 package nexters.payout.batch.common;
 
 import nexters.payout.batch.application.DividendBatchService;
-import nexters.payout.batch.application.FinancialClient;
+import nexters.payout.batch.application.PortfolioBatchService;
+import nexters.payout.batch.application.client.FinancialClient;
 import nexters.payout.batch.application.StockBatchService;
 import nexters.payout.domain.dividend.domain.repository.DividendRepository;
+import nexters.payout.domain.portfolio.domain.repository.PortfolioRepository;
 import nexters.payout.domain.stock.domain.repository.StockRepository;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,14 +25,21 @@ public abstract class AbstractBatchServiceTest {
     @Autowired
     public DividendRepository dividendRepository;
 
+    @Autowired
+    public PortfolioRepository portfolioRepository;
+
     @Autowired
     public StockBatchService stockBatchService;
 
     @Autowired
     public DividendBatchService dividendBatchService;
 
+    @Autowired
+    public PortfolioBatchService portfolioBatchService;
+
     @AfterEach
     void afterEach() {
+        portfolioRepository.deleteAll();
         dividendRepository.deleteAll();
         stockRepository.deleteAll();
     }

domain/src/main/java/nexters/payout/domain/portfolio/domain/Portfolio.java

@@ -1,9 +1,6 @@
 package nexters.payout.domain.portfolio.domain;
 
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
+import jakarta.persistence.*;
 import lombok.Getter;
 import nexters.payout.domain.BaseEntity;
 
@@ -17,23 +14,18 @@
 @Getter
 public class Portfolio extends BaseEntity {
 
-    @ElementCollection
-    @CollectionTable(name = "portfolio_stock", joinColumns = @JoinColumn(name = "portfolio_id"))
-    private List<PortfolioStock> stocks = new ArrayList<>();
+    @Embedded
+    private PortfolioStocks portfolioStocks;
+
     private Instant expireAt;
 
     public Portfolio() {
         super(null);
     }
 
-    public Portfolio(final UUID id, final Instant expireAt) {
-        super(id);
-        this.expireAt = expireAt;
-    }
-
     public Portfolio(final Instant expireAt, List<PortfolioStock> stocks) {
         super(null);
-        this.stocks = stocks;
+        this.portfolioStocks = new PortfolioStocks(stocks);
         this.expireAt = expireAt;
     }
 

domain/src/main/java/nexters/payout/domain/portfolio/domain/PortfolioStock.java

@@ -15,18 +15,8 @@ public class PortfolioStock {
     private UUID stockId;
     private Integer shares;
 
-
-    public PortfolioStock(final UUID id, final UUID stockId, final Integer shares) {
+    public PortfolioStock(final UUID stockId, final Integer shares) {
         this.stockId = stockId;
         this.shares = shares;
     }
-
-    private PortfolioStock(final UUID stockId, final Integer shares) {
-        this.stockId = stockId;
-        this.shares = shares;
-    }
-
-    public PortfolioStock create(final UUID portfolioId, final UUID stockId, final Integer shares) {
-        return new PortfolioStock(portfolioId, stockId, shares);
-    }
 }

domain/src/main/java/nexters/payout/domain/portfolio/domain/PortfolioStocks.java

@@ -0,0 +1,31 @@
+package nexters.payout.domain.portfolio.domain;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@NoArgsConstructor
+@Embeddable
+public class PortfolioStocks {
+
+    @ElementCollection
+    @CollectionTable(name = "portfolio_stock", joinColumns = @JoinColumn(name = "portfolio_id"))
+    private List<PortfolioStock> portfolioStocks = new ArrayList<>();
+
+    public PortfolioStocks(List<PortfolioStock> stocks) {
+        if (stocks.isEmpty()) {
+            throw new IllegalArgumentException("portfolioStocks must not be empty");
+        }
+        portfolioStocks = stocks;
+    }
+
+    public List<PortfolioStock> getPortfolioStocks() {
+        return Collections.unmodifiableList(portfolioStocks);
+    }
+}

domain/src/main/java/nexters/payout/domain/portfolio/domain/repository/PortfolioRepository.java

@@ -2,9 +2,17 @@
 
 import nexters.payout.domain.portfolio.domain.Portfolio;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import java.time.Instant;
+import java.util.List;
 import java.util.UUID;
 
 public interface PortfolioRepository extends JpaRepository<Portfolio, UUID> {
+    List<Portfolio> findByExpireAtBefore(Instant date);
 
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Portfolio p where p.id in :ids")
+    void deleteAllByIdInQuery(List<UUID> ids);
 }