Merge pull request #224 from CEOS-Developers/dev

version update : dev to main

Author: limgahyun

src/main/java/ceos/backend/domain/application/service/ApplicationService.java

@@ -28,6 +28,7 @@
 import ceos.backend.domain.recruitment.domain.Recruitment;
 import ceos.backend.domain.recruitment.helper.RecruitmentHelper;
 import ceos.backend.domain.recruitment.validator.RecruitmentValidator;
+import ceos.backend.global.common.annotation.TransactionLog;
 import ceos.backend.global.common.dto.PageInfo;
 import ceos.backend.global.common.entity.Part;
 import ceos.backend.global.util.InterviewDateTimeConvertor;
@@ -258,6 +259,7 @@ public GetInterviewAvailability getInterviewAvailability(Long applicationId) {
 
 
     @Transactional
+    @TransactionLog
     public void updateDocumentPassStatus(Long applicationId, UpdatePassStatus updatePassStatus) {
         recruitmentValidator.validateBetweenStartDateDocAndResultDateDoc(); // 기간 검증
         applicationValidator.validateExistingApplicant(applicationId); // 유저 검증
@@ -267,6 +269,7 @@ public void updateDocumentPassStatus(Long applicationId, UpdatePassStatus update
     }
 
     @Transactional
+    @TransactionLog
     public void updateFinalPassStatus(Long applicationId, UpdatePassStatus updatePassStatus) {
         recruitmentValidator.validateBetweenResultDateDocAndResultDateFinal(); // 기간 검증
         applicationValidator.validateExistingApplicant(applicationId); // 유저 검증

src/main/java/ceos/backend/domain/recruitment/domain/Recruitment.java

@@ -55,6 +55,10 @@ public class Recruitment extends BaseEntity {
 
     @NotNull private LocalDate demodayDate;
 
+    private LocalDate startMTDate;
+
+    private LocalDate endMTDate;
+
     private LocalDateTime applicationExcelCreatedAt;
 
     // 생성자
@@ -75,6 +79,8 @@ private Recruitment(
             LocalDate ideathonDate,
             LocalDate hackathonDate,
             LocalDate demodayDate,
+            LocalDate startMTDate,
+            LocalDate endMTDate,
             LocalDateTime applicationExcelCreatedAt) {
         this.generation = generation;
         this.prodStudyUrl = prodStudyUrl;
@@ -91,6 +97,8 @@ private Recruitment(
         this.ideathonDate = ideathonDate;
         this.hackathonDate = hackathonDate;
         this.demodayDate = demodayDate;
+        this.startMTDate = startMTDate;
+        this.endMTDate = endMTDate;
         this.applicationExcelCreatedAt = applicationExcelCreatedAt;
     }
 
@@ -110,6 +118,8 @@ public void updateRecruitment(RecruitmentDTO recruitmentDTO) {
         this.ideathonDate = recruitmentDTO.getIdeathonDate();
         this.hackathonDate = recruitmentDTO.getHackathonDate();
         this.demodayDate = recruitmentDTO.getDemodayDate();
+        this.startMTDate = recruitmentDTO.getStartMTDate();
+        this.endMTDate = recruitmentDTO.getEndMTDate();
     }
 
     public void updateApplicationExcelCreatedAt(LocalDateTime createdAt) {

src/main/java/ceos/backend/domain/recruitment/dto/RecruitmentDTO.java

@@ -24,6 +24,8 @@ public class RecruitmentDTO {
     private LocalDate ideathonDate;
     private LocalDate hackathonDate;
     private LocalDate demodayDate;
+    private LocalDate startMTDate;
+    private LocalDate endMTDate;
 
     @Builder
     public RecruitmentDTO(
@@ -41,7 +43,9 @@ public RecruitmentDTO(
             LocalDate otDate,
             LocalDate ideathonDate,
             LocalDate hackathonDate,
-            LocalDate demodayDate) {
+            LocalDate demodayDate,
+            LocalDate startMTDate,
+            LocalDate endMTDate) {
         this.generation = generation;
         this.prodStudyUrl = prodStudyUrl;
         this.designStudyUrl = designStudyUrl;
@@ -57,6 +61,8 @@ public RecruitmentDTO(
         this.ideathonDate = ideathonDate;
         this.hackathonDate = hackathonDate;
         this.demodayDate = demodayDate;
+        this.startMTDate = startMTDate;
+        this.endMTDate = endMTDate;
     }
 
     public static RecruitmentDTO from(Recruitment recruitment) {
@@ -76,6 +82,8 @@ public static RecruitmentDTO from(Recruitment recruitment) {
                 .ideathonDate(recruitment.getIdeathonDate())
                 .hackathonDate(recruitment.getHackathonDate())
                 .demodayDate(recruitment.getDemodayDate())
+                .startMTDate(recruitment.getStartMTDate())
+                .endMTDate(recruitment.getEndMTDate())
                 .build();
     }
 }

src/main/java/ceos/backend/domain/recruitment/dto/UserRecruitmentDTO.java

@@ -23,6 +23,8 @@ public class UserRecruitmentDTO {
     private LocalDate ideathonDate;
     private LocalDate hackathonDate;
     private LocalDate demodayDate;
+    private LocalDate startMTDate;
+    private LocalDate endMTDate;
 
     @Builder
     public UserRecruitmentDTO(
@@ -39,7 +41,9 @@ public UserRecruitmentDTO(
             LocalDate otDate,
             LocalDate ideathonDate,
             LocalDate hackathonDate,
-            LocalDate demodayDate) {
+            LocalDate demodayDate,
+            LocalDate startMTDate,
+            LocalDate endMTDate) {
         this.generation = generation;
         this.prodStudyUrl = prodStudyUrl;
         this.designStudyUrl = designStudyUrl;
@@ -54,6 +58,8 @@ public UserRecruitmentDTO(
         this.ideathonDate = ideathonDate;
         this.hackathonDate = hackathonDate;
         this.demodayDate = demodayDate;
+        this.startMTDate = startMTDate;
+        this.endMTDate = endMTDate;
     }
 
     public static UserRecruitmentDTO from(Recruitment recruitment) {
@@ -72,6 +78,8 @@ public static UserRecruitmentDTO from(Recruitment recruitment) {
                 .ideathonDate(recruitment.getIdeathonDate())
                 .hackathonDate(recruitment.getHackathonDate())
                 .demodayDate(recruitment.getDemodayDate())
+                .startMTDate(recruitment.getStartMTDate())
+                .endMTDate(recruitment.getEndMTDate())
                 .build();
     }
 }

src/main/java/ceos/backend/global/common/annotation/TransactionLog.java

@@ -0,0 +1,10 @@
+package ceos.backend.global.common.annotation;
+
+import java.lang.annotation.*;
+
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface TransactionLog {
+}

src/main/java/ceos/backend/global/common/aop/TransactionLoggingAspect.java

@@ -0,0 +1,34 @@
+package ceos.backend.global.common.aop;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+
+@Slf4j
+@Aspect
+@Component
+public class TransactionLoggingAspect {
+
+    @Around("@annotation(ceos.backend.global.common.annotation.TransactionLog)")
+    public Object logTxMethod(ProceedingJoinPoint joinPoint) throws Throwable {
+        String methodName = joinPoint.getSignature().toShortString();
+
+        log.info("[TX START] {}", methodName);
+        String txName = TransactionSynchronizationManager.getCurrentTransactionName();
+        log.info("[TX NAME] = {}", txName);
+
+
+        try {
+            Object result = joinPoint.proceed();
+            log.info("[TX COMMIT] {}", methodName);
+            return result;
+        } catch (Exception e) {
+            log.warn("[TX ROLLBACK] {} - Exception: {}", methodName, e.getMessage());
+            throw e;
+        }
+    }
+}

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     properties:
       hibernate:
 #        show_sql: true
-#        format_sql: true
+        format_sql: true
         default_batch_fetch_size: 1000
   data:
     - secret
@@ -25,4 +25,4 @@ springdoc:
 
 logging.level:
   org.hibernate.SQL: debug
-#  org.hibernate.orm.jdbc.bind: trace
+  org.hibernate.orm.jdbc.bind: trace