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

Develop
WE-ARE-RACCOONS · May 27, 2024 · aebd42e · aebd42e
2 parents 2e52edc + ec82b0e
commit aebd42e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/com/postgraduate/batch/done/DoneMentoringSkipListener.java b/src/main/java/com/postgraduate/batch/done/DoneMentoringSkipListener.java
@@ -14,18 +14,18 @@ public class DoneMentoringSkipListener implements SkipListener<DoneMentoring, Do
 
     @Override
     public void onSkipInRead(Throwable t) {
-        log.info("멘토링 자동 완료 ItemReader Skip message : {}", t.getMessage());
+        log.error("멘토링 자동 완료 ItemReader Skip message : {}", t.getMessage());
     }
 
     @Override
     public void onSkipInProcess(DoneMentoring doneMentoring, Throwable t) {
-        log.info("mentoringId : {} 자동 완료 실패, message : {}", doneMentoring.mentoringId(), t.getMessage());
+        log.error("mentoringId : {} 자동 완료 실패, message : {}", doneMentoring.mentoringId(), t.getMessage());
         slackErrorMessage.sendSlackMentoringError(doneMentoring.mentoringId(), t);
     }
 
     @Override
     public void onSkipInWrite(DoneMentoring doneMentoring, Throwable t) {
-        log.info("mentoringId : {} 자동 완료 실패, message : {}", doneMentoring.mentoringId(), t.getMessage());
+        log.error("mentoringId : {} 자동 완료 실패, message : {}", doneMentoring.mentoringId(), t.getMessage());
         slackErrorMessage.sendSlackMentoringError(doneMentoring.mentoringId(), t);
     }
 }
diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalaryItemWriter.java b/src/main/java/com/postgraduate/batch/salary/CreateSalaryItemWriter.java
@@ -16,7 +16,7 @@ public class CreateSalaryItemWriter implements ItemWriter<CreateSalary> {
     private final CreateSalaryRepository createSalaryRepository;
 
     @Override
-    public void write(Chunk<? extends CreateSalary> chunk) throws Exception {
+    public void write(Chunk<? extends CreateSalary> chunk) {
         List<CreateSalary> createSalaries = new ArrayList<>();
         chunk.forEach(createSalaries::add);
         createSalaryRepository.insertAllSalary(createSalaries);

diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalaryJobConfig.java b/src/main/java/com/postgraduate/batch/salary/CreateSalaryJobConfig.java
@@ -4,6 +4,7 @@
 import com.postgraduate.domain.salary.domain.service.SalaryGetService;
 import com.postgraduate.global.slack.SlackSalaryMessage;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.job.builder.JobBuilder;
@@ -19,13 +20,15 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.sql.DataSource;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static com.postgraduate.domain.salary.util.SalaryUtil.getSalaryDate;
 
 @Configuration
+@Slf4j
 @RequiredArgsConstructor
 public class CreateSalaryJobConfig {
     private final JobRepository jobRepository;
@@ -73,7 +76,9 @@ public Step createSalaryStep() throws Exception {
     @Bean(name = "salaryReader")
     public JdbcPagingItemReader<CreateSalary> salaryReader() throws Exception {
         Map<String, Object> parameters = new HashMap<>();
-        parameters.put("salaryDate", getSalaryDate().plusDays(7));
+        LocalDate salaryDate = getSalaryDate().plusDays(7);
+        parameters.put("salaryDate", salaryDate);
+        log.info("salaryReader salaryDate : {}", salaryDate);
         return new JdbcPagingItemReaderBuilder<CreateSalary>()
                 .pageSize(CHUNK_SIZE)
                 .fetchSize(CHUNK_SIZE)

diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalaryRepository.java b/src/main/java/com/postgraduate/batch/salary/CreateSalaryRepository.java
@@ -1,6 +1,7 @@
 package com.postgraduate.batch.salary;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
@@ -14,6 +15,7 @@
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class CreateSalaryRepository {
     private final NamedParameterJdbcTemplate jdbcTemplate;
     private static final String INSERT_SALARY = "insert into salary " +
@@ -32,6 +34,7 @@ private SqlParameterSource[] generateParameterSource(List<CreateSalary> createSa
     }
 
     private Map<String, Object> generateEntityParams(CreateSalary createSalary) {
+        log.info("create salary for seniorId : {}", createSalary.seniorId());
         HashMap<String, Object> parameter = new HashMap<>();
         parameter.put("salaryDate", getSalaryDate().plusDays(7));
         parameter.put("seniorId", createSalary.seniorId());

diff --git a/src/main/java/com/postgraduate/batch/salary/CreateSalarySkipListener.java b/src/main/java/com/postgraduate/batch/salary/CreateSalarySkipListener.java
@@ -14,18 +14,18 @@ public class CreateSalarySkipListener implements SkipListener<CreateSalary, Crea
 
     @Override
     public void onSkipInRead(Throwable t) {
-        log.info("정산 자동 생성 ItemReader Skip message : {}", t.getMessage());
+        log.error("정산 자동 생성 ItemReader Skip message : {}", t.getMessage());
     }
 
     @Override
     public void onSkipInProcess(CreateSalary createSalary, Throwable t) {
-        log.info("seniorId : {} 정산 자동 생성, message : {}", createSalary.seniorId(), t.getMessage());
+        log.error("seniorId : {} 정산 자동 생성, message : {}", createSalary.seniorId(), t.getMessage());
         slackErrorMessage.sendSlackSalaryError(createSalary.seniorId(), t);
     }
 
     @Override
     public void onSkipInWrite(CreateSalary createSalary, Throwable t) {
-        log.info("seniorId : {} 정산 자동 생성, message : {}", createSalary.seniorId(), t.getMessage());
+        log.error("seniorId : {} 정산 자동 생성, message : {}", createSalary.seniorId(), t.getMessage());
         slackErrorMessage.sendSlackSalaryError(createSalary.seniorId(), t);
     }
 }
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
@@ -108,6 +108,9 @@ public Page<Senior> findAllByFieldSenior(String field, String postgradu, Pageabl
     }
 
     private BooleanExpression fieldSpecifier(String fields) {
+        if (fields.contains(ALL))
+            return TRUE;
+
         String[] field = fields.split(",");
         if (fields.contains(ETC))
             return Arrays.stream(field)

diff --git a/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java b/src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java
@@ -128,7 +128,7 @@ public ResponseDto<AllSeniorSearchResponse> getSearchSenior(@RequestParam String
     }
 
     @GetMapping("/field")
-    @Operation(summary = "대학원생 필드 검색", description = "분야 (분야1,분야2 이런식으로, 다른분야 : others), 대학원 필수 (대학원1,대학원2 이런식으로, 다른학교 : others, 전체 : all), 페이지 선택 ")
+    @Operation(summary = "대학원생 필드 검색", description = "분야 (분야1,분야2 이런식으로, 다른분야 : others, 전체 : all), 대학원 필수 (대학원1,대학원2 이런식으로, 다른학교 : others, 전체 : all), 페이지 선택 ")
     public ResponseDto<AllSeniorSearchResponse> getFieldSenior(@RequestParam String field,
                                                                @RequestParam String postgradu,
                                                                @RequestParam(required = false) Integer page) {