Merge pull request #291 from WE-ARE-RACCOONS/develop

Develop
WE-ARE-RACCOONS · Jun 20, 2024 · af07cc7 · af07cc7
2 parents 64c5cc8 + d155ff0
commit af07cc7
Show file tree

Hide file tree

Showing 15 changed files with 237 additions and 105 deletions.
diff --git a/src/main/java/com/postgraduate/admin/application/usecase/AdminBatchUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminBatchUseCase.java
@@ -0,0 +1,37 @@
+package com.postgraduate.admin.application.usecase;
+
+import com.postgraduate.batch.scheduler.JobSchedulerConfig;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class AdminBatchUseCase {
+    private final JobSchedulerConfig jobSchedulerConfig;
+
+    public void startSalaryBatch() {
+        try {
+            jobSchedulerConfig.launchSalaryJob();
+        } catch (Exception e) {
+            log.error("Create Salary Batch Exception : {}", e.getStackTrace());
+        }
+    }
+
+    public void startMentoringDoneBatch() {
+        try {
+            jobSchedulerConfig.launchDoneJob();
+        } catch (Exception e) {
+            log.error("Create Salary Batch Exception : {}", e.getStackTrace());
+        }
+    }
+
+    public void startMentoringCancelBatch() {
+        try {
+            jobSchedulerConfig.launchCancelJob();
+        } catch (Exception e) {
+            log.error("Create Salary Batch Exception : {}", e.getStackTrace());
+        }
+    }
+}
diff --git a/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java b/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java
@@ -27,6 +27,7 @@ public class AdminWithThymeLeafController {
     private final AdminMentoringUseCase adminMentoringUseCase;
     private final AdminSalaryUseCase adminSalaryUseCase;
     private final AdminPaymentUseCase adminPaymentUseCase;
+    private final AdminBatchUseCase adminBatchUseCase;
     private final JwtUseCase jwtUseCase;
 
     @GetMapping("/loginForm")
@@ -166,4 +167,27 @@ public String sendMessage(@RequestBody SendMessageRequest messageRequest) {
         adminUserUseCase.sendMatchingMessage(messageRequest);
         return "adminEmpty";
     }
+
+    @GetMapping("/batch")
+    public String batchManage() {
+        return "adminBatch";
+    }
+
+    @PostMapping("/batch/salary")
+    public String startSalaryBatch() {
+        adminBatchUseCase.startSalaryBatch();
+        return "adminEmpty";
+    }
+
+    @PostMapping("/batch/mentoring/done")
+    public String startMentoringDone() {
+        adminBatchUseCase.startMentoringDoneBatch();
+        return "adminEmpty";
+    }
+
+    @PostMapping("/batch/mentoring/cancel")
+    public String startMentoringCancel() {
+        adminBatchUseCase.startMentoringCancelBatch();
+        return "adminEmpty";
+    }
 }
diff --git a/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java b/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java
@@ -34,6 +34,7 @@ public class CancelJobConfig {
     private final CancelMentoringProcessor cancelMentoringProcessor;
     private final CancelMentoringWriter cancelMentoringWriter;
     private final EntityManagerFactory entityManagerFactory;
+    private final CancelMentoringSkipListener cancelMentoringSkipListener;
 
     private static final int CHUNK_SIZE = 50;
 
@@ -54,6 +55,7 @@ public Step cancelStep() {
                 .faultTolerant()
                 .skip(Exception.class)
                 .skipLimit(Integer.MAX_VALUE)
+                .listener(cancelMentoringSkipListener)
                 .build();
     }
 

diff --git a/src/main/java/com/postgraduate/batch/cancel/CancelMentoringSkipListener.java b/src/main/java/com/postgraduate/batch/cancel/CancelMentoringSkipListener.java
@@ -0,0 +1,32 @@
+package com.postgraduate.batch.cancel;
+
+import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
+import com.postgraduate.global.slack.SlackErrorMessage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.batch.core.SkipListener;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CancelMentoringSkipListener implements SkipListener<Mentoring, CancelMentoring> {
+    private final SlackErrorMessage slackErrorMessage;
+
+    @Override
+    public void onSkipInRead(Throwable t) {
+        log.error("멘토링 자동 완료 ItemReader Skip message : {}", t.getMessage());
+    }
+
+    @Override
+    public void onSkipInProcess(Mentoring mentoring, Throwable t) {
+        log.error("mentoringId : {} 자동 취소 실패, message : {}", mentoring.getMentoringId(), t.getMessage());
+        slackErrorMessage.sendSlackMentoringError(mentoring.getMentoringId(), t);
+    }
+
+    @Override
+    public void onSkipInWrite(CancelMentoring cancelMentoring, Throwable t) {
+        log.error("mentoringId : {} 자동 취소 실패, message : {}", cancelMentoring.mentoringId(), t.getMessage());
+        slackErrorMessage.sendSlackMentoringError(cancelMentoring.mentoringId(), t);
+    }
+}
diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalaryJobConfig.java b/src/main/java/com/postgraduate/batch/salary/CreateSalaryJobConfig.java
@@ -71,12 +71,14 @@ public Step createSalaryStep() {
                 .skip(Exception.class)
                 .skipLimit(Integer.MAX_VALUE)
                 .listener(createSalarySkipListener)
+                .listener(new CreateSalaryStepListener())
                 .build();
     }
 
     @Bean
     public QueryDslZeroPagingItemReader<CreateSalary> salaryReader() {
         LocalDate date = getSalaryDate().plusDays(7);
+        log.info("not in date : {}", date);
         return new QueryDslZeroPagingItemReader<>(entityManagerFactory, CHUNK_SIZE, queryFactory ->
                 queryFactory.select(Projections.constructor(CreateSalary.class,
                                 senior.seniorId,

diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalaryStepListener.java b/src/main/java/com/postgraduate/batch/salary/CreateSalaryStepListener.java
@@ -0,0 +1,18 @@
+package com.postgraduate.batch.salary;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.batch.core.*;
+
+@Slf4j
+public class CreateSalaryStepListener implements StepExecutionListener {
+    @Override
+    public void beforeStep(StepExecution stepExecution) {
+        log.info("createSalaryStep Start");
+    }
+
+    @Override
+    public ExitStatus afterStep(StepExecution stepExecution) {
+        log.info("salary total read : {} and total write : {}", stepExecution.getReadCount(), stepExecution.getWriteCount());
+        return stepExecution.getExitStatus();
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java b/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java
@@ -16,6 +16,14 @@
 import static com.postgraduate.domain.senior.domain.entity.constant.Status.WAITING;
 
 @Entity
+@Table(indexes = {
+        @Index(name = "senior_total_info_index", columnList = "totalInfo"),
+        @Index(name = "senior_hit_index", columnList = "hit"),
+        @Index(name = "senior_field_index", columnList = "field"),
+        @Index(name = "senior_etc_field_index", columnList = "etcField"),
+        @Index(name = "senior_postgradu_index", columnList = "postgradu"),
+        @Index(name = "senior_etc_postgradu_index", columnList = "etcPostgradu")
+})
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor

diff --git a/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepository.java b/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepository.java
@@ -1,6 +1,5 @@
 package com.postgraduate.domain.senior.domain.repository;
 
-import com.postgraduate.domain.salary.application.dto.SeniorAndAccount;
 import com.postgraduate.domain.senior.domain.entity.Senior;
 import com.postgraduate.domain.user.domain.entity.User;
 import org.springframework.data.domain.Page;
@@ -10,10 +9,8 @@
 import java.util.Optional;
 
 public interface SeniorDslRepository {
-    Page<Senior> findAllBySearchSeniorWithAdmin(String search, Pageable pageable);
     Optional<Senior> findBySeniorId(Long seniorId);
     Optional<Senior> findByUserWithAll(User user);
-    List<SeniorAndAccount> findAllSeniorAndAccount();
     List<Senior> findAllSenior();
     Page<Senior> findAllByFieldSenior(String field, String postgradu, Pageable pageable);
     Page<Senior> findAllBySearchSenior(String search, String sort, Pageable pageable);

diff --git a/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java
@@ -1,9 +1,8 @@
 package com.postgraduate.domain.senior.domain.repository;
 
-import com.postgraduate.domain.account.domain.entity.Account;
-import com.postgraduate.domain.salary.application.dto.SeniorAndAccount;
 import com.postgraduate.domain.senior.domain.entity.Senior;
 import com.postgraduate.domain.user.domain.entity.User;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -13,13 +12,13 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
-import org.springframework.util.StringUtils;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static com.postgraduate.domain.account.domain.entity.QAccount.account;
 import static com.postgraduate.domain.senior.domain.entity.QSenior.senior;
 import static com.postgraduate.domain.user.domain.entity.QUser.user;
 import static com.querydsl.core.types.Order.ASC;
@@ -38,21 +37,36 @@ public class SeniorDslRepositoryImpl implements SeniorDslRepository{
 
     @Override
     public Page<Senior> findAllBySearchSenior(String search, String sort, Pageable pageable) {
-        List<Senior> seniors = queryFactory.selectFrom(senior)
+        List<Tuple> results = queryFactory.select(senior.seniorId, senior.user.nickName, senior.hit)
+                .from(senior)
                 .distinct()
                 .leftJoin(senior.user, user)
-                .fetchJoin()
                 .where(
                         senior.info.totalInfo.like("%" + search + "%")
                                 .or(senior.user.nickName.like("%" + search + "%")),
                         senior.user.isDelete.eq(FALSE)
                 )
                 .orderBy(orderSpecifier(sort))
-                .orderBy(senior.user.nickName.asc()).
-                offset(pageable.getOffset())
+                .orderBy(senior.user.nickName.asc())
+                .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
 
+        if (CollectionUtils.isEmpty(results)) {
+            return new PageImpl<>(new ArrayList<>(), pageable, 0);
+        }
+
+        List<Senior> seniors = queryFactory.selectFrom(senior)
+                .where(senior.seniorId.in(results.stream()
+                        .map(tuple -> tuple.get(senior.seniorId))
+                        .toList()))
+                .leftJoin(senior.user, user)
+                .fetchJoin()
+                .orderBy(orderSpecifier(sort))
+                .orderBy(senior.user.nickName.asc())
+                .fetch();
+
+
         Long total = queryFactory.select(senior.count())
                 .from(senior)
                 .distinct()
@@ -64,7 +78,6 @@ public Page<Senior> findAllBySearchSenior(String search, String sort, Pageable p
                 )
                 .fetchOne();
 
-
         return new PageImpl<>(seniors, pageable, total);
     }
 
@@ -78,10 +91,10 @@ private OrderSpecifier<?> orderSpecifier(String sort) {
 
     @Override
     public Page<Senior> findAllByFieldSenior(String field, String postgradu, Pageable pageable) {
-        List<Senior> seniors = queryFactory.selectFrom(senior)
+        List<Tuple> results = queryFactory.select(senior.seniorId, senior.user.nickName, senior.hit)
+                .from(senior)
                 .distinct()
                 .leftJoin(senior.user, user)
-                .fetchJoin()
                 .where(
                         fieldSpecifier(field),
                         postgraduSpecifier(postgradu),
@@ -93,6 +106,20 @@ public Page<Senior> findAllByFieldSenior(String field, String postgradu, Pageabl
                 .limit(pageable.getPageSize())
                 .fetch();
 
+        if (CollectionUtils.isEmpty(results)) {
+            return new PageImpl<>(new ArrayList<>(), pageable, 0);
+        }
+
+        List<Senior> seniors = queryFactory.selectFrom(senior)
+                .where(senior.seniorId.in(results.stream()
+                        .map(tuple -> tuple.get(senior.seniorId))
+                        .toList()))
+                .leftJoin(senior.user, user)
+                .fetchJoin()
+                .orderBy(senior.hit.desc())
+                .orderBy(senior.user.nickName.asc())
+                .fetch();
+
         Long total = queryFactory.select(senior.count())
                 .from(senior)
                 .distinct()
@@ -142,43 +169,6 @@ private BooleanExpression postgraduSpecifier(String postgradu) {
                 .orElse(FALSE);
     }
 
-    @Override
-    public Page<Senior> findAllBySearchSeniorWithAdmin(String search, Pageable pageable) {
-        List<Senior> seniors = queryFactory.selectFrom(senior)
-                .where(
-                        searchLike(search),
-                        senior.user.isDelete.eq(FALSE)
-                )
-                .distinct()
-                .innerJoin(senior.user, user)
-                .fetchJoin()
-                .orderBy(senior.createdAt.desc())
-                .offset(pageable.getOffset())
-                .limit(pageable.getPageSize())
-                .fetch();
-
-        Long total = queryFactory.select(senior.count())
-                .from(senior)
-                .where(
-                        searchLike(search),
-                        senior.user.isDelete.eq(FALSE)
-                )
-                .distinct()
-                .innerJoin(senior.user, user)
-                .fetchOne();
-
-        return new PageImpl<>(seniors, pageable, total);
-    }
-
-    private BooleanExpression searchLike(String search) {
-        if (StringUtils.hasText(search)) {
-            return senior.user.phoneNumber.contains(search)
-                    .or(senior.user.nickName.contains(search))
-                    .and(senior.profile.isNotNull());
-        }
-        return null;
-    }
-
     @Override
     public Optional<Senior> findByUserWithAll(User seniorUser) {
         return ofNullable(queryFactory.selectFrom(senior)
@@ -190,31 +180,6 @@ public Optional<Senior> findByUserWithAll(User seniorUser) {
         );
     }
 
-    @Override
-    public List<SeniorAndAccount> findAllSeniorAndAccount() {
-        List<Senior> seniors = queryFactory.selectFrom(senior)
-                .where(senior.user.isDelete.isFalse())
-                .fetch();
-        List<Account> accounts = queryFactory.selectFrom(account)
-                .distinct()
-                .where(account.senior.in(seniors))
-                .leftJoin(account.senior, senior)
-                .fetchJoin()
-                .fetch();
-
-        return seniors.stream()
-                .map(senior -> {
-                    Account account = accounts.stream()
-                            .filter(a -> a.getSenior().getSeniorId()
-                                            .equals(senior.getSeniorId())
-                            )
-                            .findFirst()
-                            .orElse(null);
-                    return new SeniorAndAccount(senior, account);
-                })
-                .toList();
-    }
-
     @Override
     public List<Senior> findAllSenior() {
         return queryFactory.selectFrom(senior)