[DDING - 126] 동아리 목록 조회 및 폼지 조회 로컬 캐싱 적용 (#297)

Author: 5uhwann

build.gradle

@@ -32,6 +32,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -57,6 +58,7 @@ dependencies {
     implementation 'com.github.f4b6a3:uuid-creator:6.0.0'
     implementation 'software.amazon.awssdk:ses:2.24.0'
     implementation 'com.google.guava:guava:32.1.3-jre'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
 
     //security
     implementation 'org.springframework.boot:spring-boot-starter-security'

src/main/java/ddingdong/ddingdongBE/common/config/cache/CacheConfig.java

@@ -0,0 +1,118 @@
+package ddingdong.ddingdongBE.common.config.cache;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Expiry;
+import ddingdong.ddingdongBE.domain.form.entity.Form;
+import ddingdong.ddingdongBE.domain.form.service.FormService;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+import lombok.RequiredArgsConstructor;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+@EnableCaching
+@RequiredArgsConstructor
+public class CacheConfig {
+
+    private final FormService formService;
+
+    private static final Pattern FORM_CACHE_PATTERN = Pattern.compile("^form_\\d+.*$");
+    private static final Pattern FORM_SECTION_CACHE_PATTERN = Pattern.compile("^form_\\d+_formSection$");
+
+    @Bean
+    public CacheManager cacheManager() {
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        List<CaffeineCache> caches = new ArrayList<>();
+
+        caches.add(new CaffeineCache("clubsCache",
+                Caffeine.newBuilder()
+                        .expireAfterWrite(1, TimeUnit.DAYS)
+                        .maximumSize(100)
+                        .recordStats()
+                        .build()));
+        caches.add(new CaffeineCache("formsCache",
+                Caffeine.newBuilder()
+                        .expireAfter(new FormDynamicExpiry())
+                        .maximumSize(200)
+                        .recordStats()
+                        .build()));
+        caches.add(new CaffeineCache("formSectionsCache",
+                Caffeine.newBuilder()
+                        .expireAfter(new FormDynamicExpiry())
+                        .maximumSize(100)
+                        .recordStats()
+                        .build()));
+
+        cacheManager.setCaches(caches);
+        return cacheManager;
+    }
+
+    public class FormDynamicExpiry implements Expiry<Object, Object> {
+
+        @Override
+        public long expireAfterCreate(Object key, Object value, long currentTime) {
+            return calculateExpiryNanos(key);
+        }
+
+        @Override
+        public long expireAfterUpdate(Object key, Object value, long currentTime, long currentDuration) {
+            return calculateExpiryNanos(key);
+        }
+
+        @Override
+        public long expireAfterRead(Object key, Object value, long currentTime, long currentDuration) {
+            return currentDuration;
+        }
+
+        private long calculateExpiryNanos(Object key) {
+            Long formId = extractFormId(key);
+            if (formId == null) {
+                return TimeUnit.HOURS.toNanos(1); // 기본값: 1시간
+            }
+
+            try {
+                Form form = formService.getById(formId);
+                LocalDate endDate = form.getEndDate();
+                LocalDateTime now = LocalDateTime.now();
+                LocalDateTime endDateTime = endDate.atTime(23, 59, 59);
+
+                Duration duration = Duration.between(now, endDateTime);
+                return Math.min(duration.toNanos(), TimeUnit.DAYS.toNanos(1));
+
+            } catch (Exception e) {
+                return TimeUnit.HOURS.toNanos(1);
+            }
+        }
+
+        /**
+         * 캐시 키에서 폼 ID 추출
+         */
+        private Long extractFormId(Object key) {
+            if (key instanceof String cacheKey) {
+                if (FORM_CACHE_PATTERN.matcher(cacheKey).matches() ||
+                        FORM_SECTION_CACHE_PATTERN.matcher(cacheKey).matches()) {
+                    String[] parts = cacheKey.split("_");
+                    if (parts.length >= 2) {
+                        try {
+                            return Long.parseLong(parts[1]);
+                        } catch (NumberFormatException e) {
+                            return null;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+    }
+}

src/main/java/ddingdong/ddingdongBE/domain/club/controller/UserClubController.java

@@ -8,6 +8,7 @@
 import java.time.LocalDate;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -16,8 +17,8 @@ public class UserClubController implements UserClubApi {
 
     private final FacadeUserClubService facadeUserClubService;
 
-
     @Override
+    @Cacheable(value = "clubsCache", key = "'clubs'")
     public List<UserClubListResponse> getClubs() {
         return facadeUserClubService.findAllWithRecruitTimeCheckPoint(LocalDate.now()).stream()
                 .map(UserClubListResponse::from)

src/main/java/ddingdong/ddingdongBE/domain/club/service/FacadeUserClubServiceImpl.java

@@ -33,7 +33,6 @@ public class FacadeUserClubServiceImpl implements FacadeUserClubService {
 
     @Override
     public List<UserClubListQuery> findAllWithRecruitTimeCheckPoint(LocalDate now) {
-
         List<UserClubListInfo> userClubListInfos = clubService.findAllClubListInfo();
         return userClubListInfos.stream()
                 .map(info -> UserClubListQuery.of(info, checkRecruit(now, info.getStart(), info.getEnd()).getText()))

src/main/java/ddingdong/ddingdongBE/domain/club/service/GeneralClubService.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +22,7 @@ public class GeneralClubService implements ClubService {
 
     @Override
     @Transactional
+    @CacheEvict(value = "clubsCache", allEntries = true)
     public Long save(Club club) {
         Club savedClub = clubRepository.save(club);
         return savedClub.getId();
@@ -62,6 +64,7 @@ public void update(Club club, Club updatedClub) {
 
     @Override
     @Transactional
+    @CacheEvict(value = "clubsCache", allEntries = true)
     public void delete(Long clubId) {
         Club club = getById(clubId);
         clubRepository.delete(club);

src/main/java/ddingdong/ddingdongBE/domain/form/controller/UserFormController.java

@@ -7,6 +7,7 @@
 import ddingdong.ddingdongBE.domain.form.service.dto.query.FormSectionQuery;
 import ddingdong.ddingdongBE.domain.form.service.dto.query.UserFormQuery;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -16,12 +17,14 @@ public class UserFormController implements UserFormApi {
     private final FacadeUserFormService facadeUserFormService;
 
     @Override
+    @Cacheable(value = "formSectionsCache", key = "'form_' + #root.args[0] + '_formSection'")
     public FormSectionResponse getFormSections(Long formId) {
         FormSectionQuery query = facadeUserFormService.getFormSection(formId);
         return FormSectionResponse.from(query);
     }
 
     @Override
+    @Cacheable(value = "formsCache", key = "'form_' + #root.args[0] + '_' + #root.args[1]")
     public UserFormResponse getForm(Long formId, String section) {
         UserFormQuery query = facadeUserFormService.getUserForm(formId, section);
         return UserFormResponse.from(query);

src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java

@@ -9,7 +9,6 @@
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.club.service.ClubService;
 import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;
-import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
 import ddingdong.ddingdongBE.domain.form.entity.FormStatus;
@@ -42,6 +41,8 @@
 import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -56,7 +57,6 @@ public class FacadeCentralFormServiceImpl implements FacadeCentralFormService {
     private final ClubService clubService;
     private final FormStatisticService formStatisticService;
     private final FormApplicationService formApplicationService;
-    private final FileMetaDataService fileMetaDataService;
     private final SesEmailService sesEmailService;
 
     @Transactional
@@ -74,6 +74,11 @@ public void createForm(CreateFormCommand createFormCommand) {
 
     @Transactional
     @Override
+    @Caching(evict = {
+            @CacheEvict(value = "formsCache", key = "'form_' + #root.args[0].formId() + '_*'", allEntries = true),
+            @CacheEvict(value = "formSectionsCache", key = "'form_' + #root.args[0].formId() + '_formSection'"),
+            @CacheEvict(value = "clubsCache", allEntries = true)
+    })
     public void updateForm(UpdateFormCommand command) {
         Club club = clubService.getByUserId(command.user().getId());
         validateDuplicationDateExcludingSelf(club, command.startDate(), command.endDate(), command.formId());
@@ -242,7 +247,9 @@ private void validateDuplicationDateExcludingSelf(
     }
 
     private void validateEndDate(LocalDate startDate, LocalDate endDate) {
-        if (endDate.isBefore(startDate)) { throw new InvalidFormEndDateException(); }
+        if (endDate.isBefore(startDate)) {
+            throw new InvalidFormEndDateException();
+        }
     }
 
     private List<FormField> toUpdateFormFields(Form originform,

src/main/java/ddingdong/ddingdongBE/domain/form/service/GeneralFormService.java

@@ -9,6 +9,8 @@
 import java.util.Comparator;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +23,9 @@ public class GeneralFormService implements FormService {
 
     @Transactional
     @Override
+    @Caching(evict = {
+            @CacheEvict(value = "clubsCache", allEntries = true)
+    })
     public Form create(Form form) {
         return formRepository.save(form);
     }
@@ -33,6 +38,11 @@ public Form getById(Long formId) {
 
     @Transactional
     @Override
+    @Caching(evict = {
+            @CacheEvict(value = "formsCache", key = "'form_' + #root.args[0].id + '_*'", allEntries = true),
+            @CacheEvict(value = "formSectionsCache", key = "'form_' + #root.args[0].id + '_formSection'"),
+            @CacheEvict(value = "clubsCache", allEntries = true)
+    })
     public void delete(Form form) {
         formRepository.delete(form);
     }

src/main/java/ddingdong/ddingdongBE/email/SesEmailService.java

@@ -31,7 +31,7 @@ public class SesEmailService {
 
     @Async
     public CompletableFuture<Void> sendBulkResultEmails(List<FormApplication> formApplications,
-                                                        EmailContent emailContent) {
+            EmailContent emailContent) {
         return CompletableFuture.allOf(
                 formApplications.stream()
                         .map(application -> CompletableFuture.runAsync(() -> {
@@ -43,7 +43,13 @@ public CompletableFuture<Void> sendBulkResultEmails(List<FormApplication> formAp
                                     sendEmail(emailContent, application);
                                     break;
                                 } catch (LimitExceededException e) {
-                                    retryFixedInterval(application, e, attempt, maxRetries, retryDelayMs);
+                                    try {
+                                        retryFixedInterval(application, e, attempt, maxRetries, retryDelayMs);
+                                    } catch (InterruptedException ie) {
+                                        Thread.currentThread().interrupt();
+                                        log.error("이메일 전송 중 인터럽트 발생 - {}", application.getEmail());
+                                        throw new RuntimeException("이메일 전송 중 인터럽트 발생: " + application.getEmail(), ie);
+                                    }
                                 } catch (Exception e) {
                                     log.error("이메일 전송 실패 - {}: {}", application.getEmail(), e.getMessage());
                                     throw new RuntimeException("이메일 전송에 실패했습니다: " + application.getEmail(), e);
@@ -85,21 +91,18 @@ private void sendEmail(EmailContent emailContent, FormApplication application) {
     }
 
     private void retryFixedInterval(FormApplication application,
-                                    LimitExceededException e,
-                                    int attempt,
-                                    int maxRetries,
-                                    long retryDelayMs) {
+            LimitExceededException e,
+            int attempt,
+            int maxRetries,
+            long retryDelayMs) throws InterruptedException {
         if (attempt == maxRetries) {
             log.error("최대 재시도 횟수 초과. 이메일 전송 실패 - {}", application.getEmail());
             throw new RuntimeException("이메일 전송 최대 재시도 횟수 초과: " + application.getEmail(), e);
         }
         log.warn("Rate limit 발생. {}ms 후 재시도 ({}/{}): {}",
                 retryDelayMs, attempt + 1, maxRetries, application.getEmail());
-        try {
-            Thread.sleep(retryDelayMs);
-        } catch (InterruptedException ie) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("재시도 대기 중 인터럽트 발생", ie);
-        }
+
+        // InterruptedException을 다시 던져서 호출자가 처리할 수 있게 함
+        Thread.sleep(retryDelayMs);
     }
 }

src/main/resources/application-local.yml

@@ -17,3 +17,8 @@ spring:
         format_sql: true
         show-sql: true
     defer-datasource-initialization: false
+
+logging:
+  level:
+    org.springframework.cache: TRACE
+    org.springframework.cache.interceptor.CacheInterceptor: TRACE