Merge pull request #107 from yeonsu00/develop

develop to main

Author: yeonsu00

.gitignore

@@ -33,6 +33,11 @@ out/
 /nbdist/
 /.nb-gradle/
 
+### Env ###
+.env
+.env.*
+!.env.example
+
 ### VS Code ###
 .vscode/
 /dev.env
@@ -44,3 +49,5 @@ out/
 node_modules/
 apps/taja-simulator/frontend/dist/
 /.omc/
+/apps/taja-api/src/main/java/com/taja/.omc/state/
+/k6/log/

apps/taja-api/src/main/java/com/taja/application/station/StationFacade.java

@@ -51,7 +51,6 @@ public int uploadStationsFromFile(MultipartFile file, LocalDateTime requestedAt)
         return savedStations.size();
     }
 
-    @Transactional(readOnly = true)
     public NearbyStationsResponse findStationsInBounds(double centerLat, double centerLon,
                                                        double latDelta, double lonDelta) {
         double height = (latDelta * 2) * 111.0;

apps/taja-api/src/main/java/com/taja/infrastructure/cache/StationHashRepository.java

@@ -36,6 +36,7 @@ public StationHashRepository(
 
     public static final String STATION_KEY_PREFIX = "stations:";
     public static final String LOCK_PREFIX = "lock:station:";
+    public static final String BULK_LOAD_LOCK_KEY = "lock:station:bulk-load";
 
     @Value("${cache.station.ttl-sec:3600}")
     private long cacheTtlSec;
@@ -169,4 +170,13 @@ public void releaseLock(Integer number) {
         redisTemplateMaster.delete(LOCK_PREFIX + number);
     }
 
+    public boolean acquireBulkLoadLock() {
+        return Boolean.TRUE.equals(
+                redisTemplateMaster.opsForValue().setIfAbsent(BULK_LOAD_LOCK_KEY, "locked", Duration.ofSeconds(5)));
+    }
+
+    public void releaseBulkLoadLock() {
+        redisTemplateMaster.delete(BULK_LOAD_LOCK_KEY);
+    }
+
 }

apps/taja-api/src/main/java/com/taja/infrastructure/cache/StationRedisRepositoryImpl.java

@@ -79,8 +79,23 @@ public List<StationInfo.NearbyAvailableStation> findNearbyAvailableStations(
 
     @Override
     public List<StationInfo.StationFullInfo> findStationInfos(List<StationInfo.StationGeoInfo> geoInfos) {
+        List<Integer> numbers = geoInfos.stream()
+                .map(StationInfo.StationGeoInfo::number)
+                .toList();
+
+        List<Integer> missingNumbers = stationHashRepository.findMissingNumbers(numbers);
+        if (!missingNumbers.isEmpty()) {
+            loadMissingWithSingleFlight(missingNumbers);
+        }
+
         return geoInfos.stream()
-                .map(geo -> getOrRefresh(geo.number(), geo.latitude(), geo.longitude()))
+                .map(geo -> {
+                    Optional<StationInfo.StationHashInfo> hashInfoOpt = stationHashRepository.fetchAllFields(geo.number());
+                    if (hashInfoOpt.isPresent() && stationHashRepository.isThresholdReached(geo.number())) {
+                        CompletableFuture.runAsync(() -> refreshCacheWithLock(geo.number()));
+                    }
+                    return StationInfo.StationFullInfo.from(hashInfoOpt.orElse(null), geo.latitude(), geo.longitude());
+                })
                 .flatMap(Optional::stream)
                 .collect(Collectors.toList());
     }
@@ -108,6 +123,42 @@ public BikeCountInfo getStationStatusByNumber(Integer stationNumber) {
                         .orElse(new BikeCountInfo(stationId, 0, LocalDateTime.now())));
     }
 
+    private static final long SINGLE_FLIGHT_WAIT_MS = 50;
+    private static final int SINGLE_FLIGHT_MAX_ATTEMPTS = 20;
+
+    private void loadMissingWithSingleFlight(List<Integer> missingNumbers) {
+        for (int attempt = 0; attempt < SINGLE_FLIGHT_MAX_ATTEMPTS; attempt++) {
+            if (stationHashRepository.acquireBulkLoadLock()) {
+                try {
+                    List<Integer> stillMissing = stationHashRepository.findMissingNumbers(missingNumbers);
+                    if (!stillMissing.isEmpty()) {
+                        List<Station> stations = stationJpaRepository.findAllByNumberIn(stillMissing);
+                        stationHashRepository.saveStationInfosWithPipeline(stations, LocalDateTime.now());
+                    }
+                    return;
+                } finally {
+                    stationHashRepository.releaseBulkLoadLock();
+                }
+            }
+
+            try {
+                Thread.sleep(SINGLE_FLIGHT_WAIT_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+            missingNumbers = stationHashRepository.findMissingNumbers(missingNumbers);
+            if (missingNumbers.isEmpty()) {
+                return;
+            }
+        }
+
+        if (!missingNumbers.isEmpty()) {
+            List<Station> stations = stationJpaRepository.findAllByNumberIn(missingNumbers);
+            stationHashRepository.saveStationInfosWithPipeline(stations, LocalDateTime.now());
+        }
+    }
+
     private Optional<StationInfo.StationFullInfo> getOrRefresh(Integer number, double lat, double lon) {
         Optional<StationInfo.StationHashInfo> hashInfoOpt = stationHashRepository.fetchAllFields(number);
         Optional<StationInfo.StationFullInfo> stationFullInfo = StationInfo.StationFullInfo.from(hashInfoOpt.orElse(null), lat, lon);

apps/taja-api/src/main/java/com/taja/interfaces/scheduler/StationStatusScheduler.java

@@ -15,7 +15,7 @@ public class StationStatusScheduler {
     private final StationStatusService stationStatusService;
     private final StationInitializationHolder stationInitializationHolder;
 
-    @Scheduled(cron = "0 0/10 * * * *")
+    @Scheduled(cron = "${taja.scheduler.status-collection.cron:0 0/10 * * * *}")
     public void scheduleStationStatusCollection() {
         if (!stationInitializationHolder.isInitialized()) {
             log.debug("대여소 정보 초기화 미완료로 대여소 실시간 상태 수집 스킵");

apps/taja-api/src/main/resources/application-loadtest.yml

@@ -0,0 +1,13 @@
+# ============================================================
+# 부하 측정용 프로파일 (조건 A: 실시간 상태 수집기 off)
+#   실행: --spring.profiles.active=loadtest
+#
+#   - "-" 는 Spring @Scheduled 의 cron 비활성화 특수값(Scheduled.CRON_DISABLED).
+#     10분 주기 실시간 상태 수집 cron만 끈다.
+#   - 부팅 시 StationInitializationScheduler 가 직접 호출하는
+#     status 1회 수집과 대여소 위치(geo) 적재는 그대로 유지된다.
+# ============================================================
+taja:
+  scheduler:
+    status-collection:
+      cron: "-"

apps/taja-api/src/main/resources/application.yml

@@ -93,7 +93,7 @@ management:
   endpoints:
     web:
       exposure:
-        include: health, prometheus
+        include: health, metrics, prometheus
   endpoint:
     prometheus:
       enabled: true

apps/taja-api/src/test/java/com/taja/infrastructure/cache/StationRedisRepositoryImplCacheTest.java

@@ -8,7 +8,6 @@
 import com.taja.domain.station.OperationMode;
 import com.taja.domain.station.Station;
 import com.taja.domain.status.StationStatus;
-import com.taja.global.exception.StationNotFoundException;
 import com.taja.infrastructure.station.StationJpaRepository;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -35,24 +34,27 @@ class StationRedisRepositoryImplCacheTest {
     @InjectMocks
     private StationRedisRepositoryImpl stationRedisRepository;
 
-    @DisplayName("캐시 미스 시 DB에서 조회 후 캐시에 저장하고 반환한다")
+    @DisplayName("캐시 미스 시 DB에서 배치 조회 후 캐시에 저장하고 반환한다")
     @Test
-    void getOrRefresh_whenCacheMiss_loadsFromDbAndSavesToCache() {
+    void findStationInfos_whenCacheMiss_loadsFromDbInBatchAndSavesToCache() {
         // given
         Integer stationNumber = 101;
         double lat = 37.5665;
         double lon = 126.9780;
 
+        when(stationHashRepository.findMissingNumbers(List.of(stationNumber)))
+                .thenReturn(List.of(stationNumber));
+        when(stationHashRepository.acquireBulkLoadLock()).thenReturn(true);
+
+        Station station = createTestStation(stationNumber, lat, lon);
+        when(stationJpaRepository.findAllByNumberIn(List.of(stationNumber)))
+                .thenReturn(List.of(station));
+
         StationInfo.StationHashInfo cachedHashInfo = new StationInfo.StationHashInfo(
                 stationNumber, 1L, "테스트 대여소 101", 0, LocalDateTime.now()
         );
         when(stationHashRepository.fetchAllFields(stationNumber))
-                .thenReturn(Optional.empty())  // 첫 번째: 캐시 미스
-                .thenReturn(Optional.of(cachedHashInfo));  // 두 번째: 캐시 저장 후
-
-        Station station = createTestStation(stationNumber, lat, lon);
-        when(stationJpaRepository.findByNumber(stationNumber))
-                .thenReturn(Optional.of(station));
+                .thenReturn(Optional.of(cachedHashInfo));
 
         // when
         List<StationInfo.StationGeoInfo> geoInfos = List.of(
@@ -63,9 +65,8 @@ void getOrRefresh_whenCacheMiss_loadsFromDbAndSavesToCache() {
         // then
         assertThat(results).hasSize(1);
         assertThat(results.getFirst().number()).isEqualTo(stationNumber);
-        verify(stationJpaRepository).findByNumber(stationNumber);
+        verify(stationJpaRepository).findAllByNumberIn(List.of(stationNumber));
         verify(stationHashRepository).saveStationInfosWithPipeline(anyList(), any(LocalDateTime.class));
-        verify(stationHashRepository, times(2)).fetchAllFields(stationNumber);
     }
 
     @DisplayName("캐시 히트 시 즉시 반환하고 DB 조회하지 않는다")
@@ -198,58 +199,60 @@ void refreshCacheWithLock_whenLockAcquired_refreshesCache() throws InterruptedEx
         verify(stationHashRepository).releaseLock(stationNumber);
     }
 
-    @DisplayName("DB에 대여소가 없으면 예외가 발생한다")
+    @DisplayName("DB에도 대여소가 없으면 해당 대여소를 결과에서 제외한다")
     @Test
-    void getOrRefresh_whenStationNotFoundInDb_throwsException() {
+    void findStationInfos_whenStationNotFoundInDb_excludesStation() {
         // given
         Integer stationNumber = 999;
         double lat = 37.5665;
         double lon = 126.9780;
 
+        when(stationHashRepository.findMissingNumbers(List.of(stationNumber)))
+                .thenReturn(List.of(stationNumber));
+        when(stationHashRepository.acquireBulkLoadLock()).thenReturn(true);
+        when(stationJpaRepository.findAllByNumberIn(List.of(stationNumber)))
+                .thenReturn(List.of());  // DB에도 없음
         when(stationHashRepository.fetchAllFields(stationNumber))
                 .thenReturn(Optional.empty());
-        when(stationJpaRepository.findByNumber(stationNumber))
-                .thenReturn(Optional.empty());
 
         List<StationInfo.StationGeoInfo> geoInfos = List.of(
                 new StationInfo.StationGeoInfo(stationNumber, lat, lon)
         );
 
-        // when & then
-        assertThatThrownBy(() -> stationRedisRepository.findStationInfos(geoInfos))
-                .isInstanceOf(StationNotFoundException.class)
-                .hasMessageContaining("999 번 대여소를 찾을 수 없습니다");
-        verify(stationJpaRepository).findByNumber(stationNumber);
-        verify(stationHashRepository, never()).saveStationInfosWithPipeline(anyList(), any());
+        // when
+        List<StationInfo.StationFullInfo> results = stationRedisRepository.findStationInfos(geoInfos);
+
+        // then
+        assertThat(results).isEmpty();
+        verify(stationJpaRepository).findAllByNumberIn(List.of(stationNumber));
     }
 
-    @DisplayName("여러 대여소 조회 시 각각 캐시 상태에 따라 처리한다")
+    @DisplayName("여러 대여소 조회 시 캐시 미스된 것만 DB에서 배치 조회한다")
     @Test
-    void findStationInfos_whenMultipleStations_processesEachIndependently() {
+    void findStationInfos_whenMultipleStations_loadsOnlyMissingFromDb() {
         // given
         StationInfo.StationGeoInfo geo1 = new StationInfo.StationGeoInfo(201, 37.5665, 126.9780);
         StationInfo.StationGeoInfo geo2 = new StationInfo.StationGeoInfo(202, 37.5670, 126.9785);
 
-        // 첫 번째: 캐시 히트
+        // 202번만 캐시 미스
+        when(stationHashRepository.findMissingNumbers(List.of(201, 202)))
+                .thenReturn(List.of(202));
+        when(stationHashRepository.findMissingNumbers(List.of(202)))
+                .thenReturn(List.of(202));
+        when(stationHashRepository.acquireBulkLoadLock()).thenReturn(true);
+
+        Station station2 = createTestStation(202, 37.5670, 126.9785);
+        when(stationJpaRepository.findAllByNumberIn(List.of(202)))
+                .thenReturn(List.of(station2));
+
         StationInfo.StationHashInfo hashInfo1 = new StationInfo.StationHashInfo(
                 201, 1L, "테스트 대여소 201", 5, LocalDateTime.now()
         );
-        when(stationHashRepository.fetchAllFields(201))
-                .thenReturn(Optional.of(hashInfo1));
-        when(stationHashRepository.isThresholdReached(201))
-                .thenReturn(false);
-
-        // 두 번째: 캐시 미스
         StationInfo.StationHashInfo hashInfo2 = new StationInfo.StationHashInfo(
                 202, 2L, "테스트 대여소 202", 0, null
         );
-        when(stationHashRepository.fetchAllFields(202))
-                .thenReturn(Optional.empty())
-                .thenReturn(Optional.of(hashInfo2));
-
-        Station station2 = createTestStation(202, 37.5670, 126.9785);
-        when(stationJpaRepository.findByNumber(202))
-                .thenReturn(Optional.of(station2));
+        when(stationHashRepository.fetchAllFields(201)).thenReturn(Optional.of(hashInfo1));
+        when(stationHashRepository.fetchAllFields(202)).thenReturn(Optional.of(hashInfo2));
 
         // when
         List<StationInfo.StationFullInfo> results = stationRedisRepository.findStationInfos(List.of(geo1, geo2));
@@ -258,7 +261,7 @@ void findStationInfos_whenMultipleStations_processesEachIndependently() {
         assertThat(results).hasSize(2);
         assertThat(results.get(0).number()).isEqualTo(201);
         assertThat(results.get(1).number()).isEqualTo(202);
-        verify(stationJpaRepository, times(1)).findByNumber(202);  // 두 번째만 DB 조회
+        verify(stationJpaRepository).findAllByNumberIn(List.of(202));  // 미스된 것만 배치 조회
     }
 
     @DisplayName("update 시 캐시 누락된 대여소가 있으면 DB에서 정적 정보를 조회해 재적재한 뒤 갱신한다")

apps/taja-api/src/test/java/com/taja/infrastructure/station/StationRedisRepositoryImplTest.java

@@ -127,13 +127,11 @@ void findStationInfos_whenHashDataIsMissing() {
                 new StationInfo.StationGeoInfo(201, 37.6, 127.1)
         );
 
-        // 캐시에 데이터가 없음 → 저장 후 재조회
-        StationInfo.StationHashInfo cachedHashInfo = new StationInfo.StationHashInfo(201, 1L, "테스트 대여소", 0, null);
-        when(stationHashRepository.fetchAllFields(201))
-                .thenReturn(Optional.empty())  // 첫 번째 호출: 캐시 미스
-                .thenReturn(Optional.of(cachedHashInfo));  // 두 번째 호출: 캐시 저장 후 조회
+        // 캐시에 데이터가 없음 → 배치 조회 후 저장, 재조회
+        when(stationHashRepository.findMissingNumbers(List.of(201)))
+                .thenReturn(List.of(201));
+        when(stationHashRepository.acquireBulkLoadLock()).thenReturn(true);
 
-        // DB에서 조회
         Station station = Station.builder()
                 .stationId(1L)
                 .number(201)
@@ -144,8 +142,12 @@ void findStationInfos_whenHashDataIsMissing() {
                 .longitude(127.1)
                 .operationMode(OperationMode.LCD_QR)
                 .build();
-        when(stationJpaRepository.findByNumber(201))
-                .thenReturn(Optional.of(station));
+        when(stationJpaRepository.findAllByNumberIn(List.of(201)))
+                .thenReturn(List.of(station));
+
+        StationInfo.StationHashInfo cachedHashInfo = new StationInfo.StationHashInfo(201, 1L, "테스트 대여소", 0, null);
+        when(stationHashRepository.fetchAllFields(201))
+                .thenReturn(Optional.of(cachedHashInfo));
 
         // when
         List<StationInfo.StationFullInfo> results = stationRedisRepository.findStationInfos(geoInfos);
@@ -155,6 +157,7 @@ void findStationInfos_whenHashDataIsMissing() {
         StationInfo.StationFullInfo result = results.getFirst();
         assertThat(result.number()).isEqualTo(201);
         assertThat(result.stationId()).isEqualTo(1L);
+        verify(stationJpaRepository).findAllByNumberIn(List.of(201));
         verify(stationHashRepository).saveStationInfosWithPipeline(anyList(), any(LocalDateTime.class));
     }
 
@@ -177,26 +180,28 @@ void findStations_WithinShape_excludeStation_whenMemberIsNotNumeric() {
         assertThat(results.getFirst().number()).isEqualTo(101);
     }
 
-    @DisplayName("날짜 형식이 잘못되었을 때, 예외가 발생한다.")
+    @DisplayName("캐시와 DB 모두에 대여소가 없으면 해당 대여소를 결과에서 제외한다.")
     @Test
-    void findStationInfos_whenDateFormatIsInvalid_throwsException() {
+    void findStationInfos_whenStationMissingInCacheAndDb_excludesStation() {
         // given
         List<StationInfo.StationGeoInfo> geoInfos = List.of(
                 new StationInfo.StationGeoInfo(102, 37.503, 127.003)
         );
 
-        // StationHashRepository에서 파싱 실패로 Optional.empty() 반환
+        when(stationHashRepository.findMissingNumbers(List.of(102)))
+                .thenReturn(List.of(102));
+        when(stationHashRepository.acquireBulkLoadLock()).thenReturn(true);
+        when(stationJpaRepository.findAllByNumberIn(List.of(102)))
+                .thenReturn(List.of());  // DB에도 없음
         when(stationHashRepository.fetchAllFields(102))
                 .thenReturn(Optional.empty());
-        when(stationJpaRepository.findByNumber(102))
-                .thenReturn(Optional.empty());
 
-        // when & then
-        assertThatThrownBy(() -> stationRedisRepository.findStationInfos(geoInfos))
-                .isInstanceOf(StationNotFoundException.class)
-                .hasMessageContaining("102 번 대여소를 찾을 수 없습니다");
-        verify(stationJpaRepository).findByNumber(102);
-        verify(stationHashRepository, never()).saveStationInfosWithPipeline(anyList(), any());
+        // when
+        List<StationInfo.StationFullInfo> results = stationRedisRepository.findStationInfos(geoInfos);
+
+        // then
+        assertThat(results).isEmpty();
+        verify(stationJpaRepository).findAllByNumberIn(List.of(102));
     }
 
     @DisplayName("getStationStatusByNumber는 Redis에 데이터가 있으면 Redis 값을 반환한다")

docker-compose.loadtest.yml

@@ -0,0 +1,13 @@
+# ============================================================
+# 부하 측정(조건 A) 오버라이드 — 앱을 Docker로 실행
+#   - SPRING_PROFILES_ACTIVE=loadtest : 10분 주기 status cron off (부팅 1회 수집은 유지)
+#   - 8080 을 호스트로 공개 : k6(localhost:8080) + Prometheus(host.docker.internal:8080) 접근용
+#
+#   실행: docker compose -f docker-compose.yml -f docker-compose.loadtest.yml up -d --build app
+# ============================================================
+services:
+  app:
+    ports:
+      - "8080:8080"
+    environment:
+      SPRING_PROFILES_ACTIVE: loadtest