Merge pull request #40 from eureca-final-capstone-project/develop

main 배포

Author: so-yeon1

src/main/java/eureca/capstone/project/batch/BatchApplication.java

@@ -2,12 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
 @EnableJpaAuditing
+@EnableCaching
 public class BatchApplication {
 
     public static void main(String[] args) {

src/main/java/eureca/capstone/project/batch/common/schedule/ExpireDataCouponScheduler.java

@@ -18,7 +18,7 @@ public class ExpireDataCouponScheduler {
     private final JobLauncher jobLauncher;
     private final Job expireDataCouponJob;
 
-    @Scheduled(cron = "0 10 0 * * *", zone = "Asia/Seoul")
+    @Scheduled(cron = "30 0 0 * * *", zone = "Asia/Seoul")
     public void runExpireDataCouponBatch() {
         try {
             log.info("[runExpireDataCouponBatch] 데이터 충전권 기간만료 배치 실행");

src/main/java/eureca/capstone/project/batch/common/schedule/ExpireEventCouponScheduler.java

@@ -18,7 +18,7 @@ public class ExpireEventCouponScheduler {
     private final JobLauncher jobLauncher;
     private final Job expireEventCouponJob;
 
-    @Scheduled(cron = "0 5 0 * * *", zone = "Asia/Seoul")
+    @Scheduled(cron = "30 0 0 * * *", zone = "Asia/Seoul")
     public void runExpireEventCouponBatch() {
         try {
             log.info("[runExpireEventCouponBatch] 이벤트 쿠폰 기간만료 배치 실행");

src/main/java/eureca/capstone/project/batch/common/service/StatusService.java

@@ -0,0 +1,23 @@
+package eureca.capstone.project.batch.common.service;
+
+import eureca.capstone.project.batch.common.entity.Status;
+import eureca.capstone.project.batch.common.repository.StatusRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class StatusService {
+
+    private final StatusRepository statusRepository;
+
+    @Cacheable(value = "statusByDomainCode", key = "#domain + ':' + #code")
+    public Status getStatus(String domain, String code){
+        log.info("[getStatus] domain: {}, code: {}",domain,code);
+        return statusRepository.findByDomainAndCode(domain,code)
+                .orElseThrow(() -> new IllegalArgumentException(domain + ":" + code + " Status not found"));
+    }
+}

src/main/java/eureca/capstone/project/batch/job/AuctionJobConfig.java

@@ -52,6 +52,7 @@ public class AuctionJobConfig {
     private final CustomRetryListener customRetryListener;
     private final TransactionFeedSearchRepository transactionFeedSearchRepository;
     private final NotificationService notificationService;
+    private final EntityManager entityManager;
 
     private static final int CHUNK_SIZE = 100;
 
@@ -89,6 +90,8 @@ public JpaPagingItemReader<TransactionFeed> auctionFeedReader(
             SELECT tf FROM TransactionFeed tf
             JOIN FETCH tf.status
             JOIN FETCH tf.salesType
+            JOIN FETCH tf.user
+            JOIN FETCH tf.telecomCompany
             WHERE tf.salesType.salesTypeId = :salesTypeId
             AND tf.status.code = 'ON_SALE'
             AND tf.isDeleted = false
@@ -137,7 +140,6 @@ public ItemProcessor<TransactionFeed, AuctionResult> auctionFeedProcessor() {
     @Bean
     public ItemWriter<AuctionResult> auctionFeedWriter() {
         return chunk -> {
-            EntityManager entityManager = entityManagerFactory.createEntityManager();
             for (AuctionResult result : chunk.getItems()) {
                 TransactionFeed managedFeed = entityManager.merge(result.getTransactionFeed());
                 if (result.getType() == AuctionResult.Type.WINNING) {

src/main/java/eureca/capstone/project/batch/job/ExpireDataCouponJobConfig.java

@@ -3,6 +3,7 @@
 
 import eureca.capstone.project.batch.alarm.service.NotificationService;
 import eureca.capstone.project.batch.common.entity.Status;
+import eureca.capstone.project.batch.common.service.StatusService;
 import eureca.capstone.project.batch.component.listener.ExecutionListener;
 import eureca.capstone.project.batch.component.retry.RetryPolicy;
 import eureca.capstone.project.batch.transaction_feed.entity.UserDataCoupon;
@@ -46,6 +47,7 @@ public class ExpireDataCouponJobConfig {
     private final DataSource dataSource;
     private final ExecutionListener executionListener;
     private final RetryPolicy retryPolicy;
+    private final StatusService statusService;
 
     @Bean
     public Job expireDataCouponJob(Step expireDataCouponStep) {
@@ -75,11 +77,10 @@ public Step expireDataCouponStep(
     @Bean
     @StepScope
     public JpaPagingItemReader<UserDataCoupon> expireDataCouponReader(
-            @Value("#{jobParameters['currentTime']}") String currentTime,
-            @Qualifier("getStatuses") Map<String, Status> statusMap) {
+            @Value("#{jobParameters['currentTime']}") String currentTime) {
         LocalDateTime today = LocalDateTime.parse(currentTime);
-        Status expiredStatus = statusMap.get("EXPIRED");
-        Status usedStatus = statusMap.get("USED");
+        Status expiredStatus = statusService.getStatus("COUPON", "EXPIRED");
+        Status usedStatus = statusService.getStatus("COUPON", "USED");
         List<Status> excludedStatuses = List.of(expiredStatus, usedStatus);
 
         Map<String, Object> params = new HashMap<>();
@@ -99,9 +100,8 @@ public JpaPagingItemReader<UserDataCoupon> expireDataCouponReader(
 
 
     @Bean
-    public ItemProcessor<UserDataCoupon, UserDataCoupon> expireDataCouponProcessor(
-            @Qualifier("getStatuses") Map<String, Status> statusMap) {
-            Status expiredStatus = statusMap.get("EXPIRED");
+    public ItemProcessor<UserDataCoupon, UserDataCoupon> expireDataCouponProcessor() {
+            Status expiredStatus = statusService.getStatus("COUPON", "EXPIRED");
 
             return coupon ->{
                 coupon.changeStatus(expiredStatus);

src/main/java/eureca/capstone/project/batch/job/ExpireEventCouponJobConfig.java

@@ -3,6 +3,7 @@
 import eureca.capstone.project.batch.alarm.dto.AlarmCreationDto;
 import eureca.capstone.project.batch.alarm.service.NotificationService;
 import eureca.capstone.project.batch.common.entity.Status;
+import eureca.capstone.project.batch.common.service.StatusService;
 import eureca.capstone.project.batch.component.listener.ExecutionListener;
 import eureca.capstone.project.batch.component.retry.RetryPolicy;
 import eureca.capstone.project.batch.pay.entity.UserEventCoupon;
@@ -46,6 +47,7 @@ public class ExpireEventCouponJobConfig {
     private final DataSource dataSource;
     private final ExecutionListener executionListener;
     private final RetryPolicy retryPolicy;
+    private final StatusService statusService;
 
     @Bean
     public Job expireEventCouponJob(Step expireEventCouponStep) {
@@ -75,11 +77,10 @@ public Step expireEventCouponStep(
     @Bean
     @StepScope
     public JpaPagingItemReader<UserEventCoupon> expireEventCouponReader(
-            @Value("#{jobParameters['currentTime']}") String currentTime,
-            @Qualifier("getStatuses") Map<String, Status> statusMap) {
+            @Value("#{jobParameters['currentTime']}") String currentTime) {
         LocalDateTime today = LocalDateTime.parse(currentTime);
-        Status expiredStatus = statusMap.get("EXPIRED");
-        Status usedStatus = statusMap.get("USED");
+        Status expiredStatus = statusService.getStatus("COUPON", "EXPIRED");
+        Status usedStatus = statusService.getStatus("COUPON", "USED");
         List<Status> excludedStatuses = List.of(expiredStatus, usedStatus);
 
         Map<String, Object> params = new HashMap<>();
@@ -99,14 +100,13 @@ public JpaPagingItemReader<UserEventCoupon> expireEventCouponReader(
 
 
     @Bean
-    public ItemProcessor<UserEventCoupon, UserEventCoupon> expireEventCouponProcessor(
-            @Qualifier("getStatuses") Map<String, Status> statusMap) {
-            Status expiredStatus = statusMap.get("EXPIRED");
-
-            return coupon ->{
-                coupon.changeStatus(expiredStatus);
-                return coupon;
-            };
+    public ItemProcessor<UserEventCoupon, UserEventCoupon> expireEventCouponProcessor() {
+        Status expiredStatus = statusService.getStatus("COUPON", "EXPIRED");
+
+        return coupon ->{
+            coupon.changeStatus(expiredStatus);
+            return coupon;
+        };
     }
 
     @Bean