diff --git a/consumer/src/main/java/com/wootecam/luckyvickyauction/config/RedisStreamConfig.java b/consumer/src/main/java/com/wootecam/luckyvickyauction/config/RedisStreamConfig.java index 2699ab2e..cb0ca0fc 100644 --- a/consumer/src/main/java/com/wootecam/luckyvickyauction/config/RedisStreamConfig.java +++ b/consumer/src/main/java/com/wootecam/luckyvickyauction/config/RedisStreamConfig.java @@ -12,15 +12,6 @@ @Configuration public class RedisStreamConfig { - @Value("${spring.data.redis.host}") - private String redisHost; - - @Value("${spring.data.redis.port}") - private String redisPort; - - @Value("${spring.data.redis.password}") - private String redisPassword; - @Getter @Value("${stream.key}") private String streamKey; diff --git a/consumer/src/main/java/com/wootecam/luckyvickyauction/service/MessageRouterService.java b/consumer/src/main/java/com/wootecam/luckyvickyauction/service/MessageRouterService.java index 52564665..a5738fed 100644 --- a/consumer/src/main/java/com/wootecam/luckyvickyauction/service/MessageRouterService.java +++ b/consumer/src/main/java/com/wootecam/luckyvickyauction/service/MessageRouterService.java @@ -65,8 +65,8 @@ private void refund(String messageType, Map message, Runnable po var objectMessage = objectMapper.readValue((String) message.get(messageType), AuctionRefundRequestMessage.class); auctioneer.refund(objectMessage, postProcess); - } catch (RuntimeException ex) { - log.info("Refund failed : message=" + message.get(messageType)); + } catch (RuntimeException e) { + log.warn("Refund failed : message={}, exception={}", message.get(messageType), e.getMessage()); } } @@ -77,6 +77,8 @@ private void purchase(String messageType, Map message, Runnable try { auctioneer.process(objectMessage, postProcess); } catch (RuntimeException e) { + log.warn("Purchase failed : message={}, exception={}", message.get(messageType), e.getMessage()); + // 경매 입찰(구매) 요청이 실패하면 구매 실패 거래 내역을 생성한다. var command = CreateReceiptCommand.builder() .requestId(objectMessage.getRequestId()) diff --git a/core/src/main/java/com/wootecam/luckyvickyauction/config/JpaConfig.java b/core/src/main/java/com/wootecam/luckyvickyauction/config/JpaConfig.java index dc3260ac..1614836f 100644 --- a/core/src/main/java/com/wootecam/luckyvickyauction/config/JpaConfig.java +++ b/core/src/main/java/com/wootecam/luckyvickyauction/config/JpaConfig.java @@ -5,8 +5,10 @@ import jakarta.persistence.PersistenceContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @Configuration +@EnableJpaAuditing public class JpaConfig { @PersistenceContext diff --git a/core/src/main/java/com/wootecam/luckyvickyauction/infra/entity/receipt/ReceiptEntity.java b/core/src/main/java/com/wootecam/luckyvickyauction/infra/entity/receipt/ReceiptEntity.java index bcbd79df..2ce91ceb 100644 --- a/core/src/main/java/com/wootecam/luckyvickyauction/infra/entity/receipt/ReceiptEntity.java +++ b/core/src/main/java/com/wootecam/luckyvickyauction/infra/entity/receipt/ReceiptEntity.java @@ -2,6 +2,7 @@ import com.wootecam.luckyvickyauction.domain.entity.type.ReceiptStatus; import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Id; @@ -11,10 +12,14 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; @Entity @Table(name = "RECEIPT") @Getter +@EntityListeners(AuditingEntityListener.class) @NoArgsConstructor(access = AccessLevel.PROTECTED) public class ReceiptEntity { @Id @@ -27,7 +32,9 @@ public class ReceiptEntity { private long auctionId; private Long sellerId; private Long buyerId; + @CreatedDate private LocalDateTime createdAt; + @LastModifiedDate private LocalDateTime updatedAt; @Builder diff --git a/core/src/main/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptQueryDslRepositoryImpl.java b/core/src/main/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptQueryDslRepositoryImpl.java index 1db6d1dd..4671c5d8 100644 --- a/core/src/main/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptQueryDslRepositoryImpl.java +++ b/core/src/main/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptQueryDslRepositoryImpl.java @@ -21,7 +21,7 @@ public List findAllByBuyerId(Long buyerId, BuyerReceiptSearchCond .select(receipt) .from(receipt) .where(receipt.buyerId.eq(buyerId)) - .orderBy(receipt.id.desc()) + .orderBy(receipt.createdAt.desc()) .limit(condition.size()) .offset(condition.offset()) .fetch(); @@ -35,7 +35,7 @@ public List findAllBySellerId(Long sellerId, SellerReceiptSearchC .select(receipt) .from(receipt) .where(receipt.sellerId.eq(sellerId)) - .orderBy(receipt.id.desc()) + .orderBy(receipt.createdAt.desc()) .limit(condition.size()) .offset(condition.offset()) .fetch(); diff --git a/core/src/test/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptCoreRepositoryTest.java b/core/src/test/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptCoreRepositoryTest.java index 445d4e99..52f9d9cd 100644 --- a/core/src/test/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptCoreRepositoryTest.java +++ b/core/src/test/java/com/wootecam/luckyvickyauction/infra/repository/receipt/ReceiptCoreRepositoryTest.java @@ -83,8 +83,6 @@ class 거래내역_저장_시에 { .auctionId(1L) .sellerId(1L) .buyerId(2L) - .createdAt(LocalDateTime.now()) - .updatedAt(LocalDateTime.now()) .build(); // when @@ -98,9 +96,7 @@ class 거래내역_저장_시에 { () -> assertThat(saved.getReceiptStatus()).isEqualTo(receipt.getReceiptStatus()), () -> assertThat(saved.getAuctionId()).isEqualTo(receipt.getAuctionId()), () -> assertThat(saved.getSellerId()).isEqualTo(receipt.getSellerId()), - () -> assertThat(saved.getBuyerId()).isEqualTo(receipt.getBuyerId()), - () -> assertThat(saved.getCreatedAt()).isEqualTo(receipt.getCreatedAt()), - () -> assertThat(saved.getUpdatedAt()).isEqualTo(receipt.getUpdatedAt()) + () -> assertThat(saved.getBuyerId()).isEqualTo(receipt.getBuyerId()) ); }