From bd61714e4a244ca781130c83566158fa3bfef5a0 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 17 Apr 2025 12:38:12 +0900
Subject: [PATCH 01/26] =?UTF-8?q?feat:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signalbuddyfinal/global/config/RedisConfig.java        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
index d67be707..f0f09948 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
@@ -33,6 +33,13 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connec
         return redisTemplate;
     }
 
+    @Bean
+    public RedisTemplate<String, CachedAirQuality> cachedAirQualityRedisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, CachedAirQuality> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
+
     @Bean
     public PlatformTransactionManager transactionManager() {
         return new JpaTransactionManager();

From 4e9c435fc3360fdccaf4363b4de84d7b7a8a7ff3 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 17 Apr 2025 12:38:33 +0900
Subject: [PATCH 02/26] =?UTF-8?q?test:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20service=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/AirQualityServiceTest.java    | 189 ++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java

diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java
new file mode 100644
index 00000000..294ccd0d
--- /dev/null
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java
@@ -0,0 +1,189 @@
+package org.programmers.signalbuddyfinal.domain.air_quality;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.time.LocalDateTime;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
+import org.programmers.signalbuddyfinal.global.config.RedisConfig;
+import org.programmers.signalbuddyfinal.global.db.RedisTestContainer;
+import org.programmers.signalbuddyfinal.global.exception.BusinessException;
+import org.programmers.signalbuddyfinal.global.support.ServiceTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+
+@SpringBootTest
+@ContextConfiguration(initializers = AirQualityServiceTest.MockServerInitializer.class)
+@Import(RedisConfig.class)
+@TestPropertySource(properties = {
+    "schedule.air-quality-api.cron=0 0 0/1 * * ?",
+    "schedule.air-quality-api.lockAtMostFor=10m",
+    "schedule.air-quality-api.lockAtLeastFor=50m"
+})
+
+public class AirQualityServiceTest extends ServiceTest implements RedisTestContainer {
+
+    @Autowired
+    private AirQualityService airQualityService;
+    @Autowired
+    private RedisTemplate<String, CachedAirQuality> redisTemplate;
+    private static MockWebServer mockWebServer;
+    private String key = "air-quality: ";
+    private static CachedAirQuality cache;
+
+    @BeforeAll
+    static void setUp() throws Exception {
+        mockWebServer = new MockWebServer();
+        mockWebServer.start();
+        AirQualityResponse airQualityResponse = AirQualityResponse.builder()
+            .grade("보통")
+            .pm10("61")
+            .pm25("20")
+            .build();
+        cache = new CachedAirQuality(airQualityResponse, true,
+            LocalDateTime.of(2025, 1, 1, 1, 1));
+    }
+
+    @BeforeEach
+    void clearRedis() {
+        RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
+        if (factory != null) {
+            factory.getConnection().serverCommands().flushAll();
+        }
+    }
+
+    @AfterAll
+    static void tearDown() throws Exception {
+        mockWebServer.shutdown();
+    }
+
+    public static class MockServerInitializer implements
+        ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+        @Override
+        public void initialize(ConfigurableApplicationContext applicationContext) {
+            String baseUrl = "http://localhost:" + mockWebServer.getPort();
+            TestPropertyValues.of("air-quality.base-url=" + baseUrl)
+                .applyTo(applicationContext.getEnvironment());
+        }
+    }
+
+    @DisplayName("첫 요청 청공 시 응답 반환 및 캐싱 테스트")
+    @Test
+    void successRequestTest() {
+        createMockWebServer(createResponse());
+
+        AirQualityResponse response = airQualityService.getAirQuality();
+        CachedAirQuality cache = redisTemplate.opsForValue().get(key);
+
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(cache).isNotNull();
+        assertThat(cache.getData().getGrade()).isEqualTo("보통");
+        assertThat(cache.isFresh()).isTrue();
+    }
+
+    @DisplayName("두번 째 요청시 캐싱된 데이터 반환")
+    @Test
+    void successSecondRequestTest() {
+
+        int count = mockWebServer.getRequestCount();
+        createMockWebServer(createResponse());
+        redisTemplate.opsForValue().set(key, cache);
+
+        AirQualityResponse response = airQualityService.getAirQuality();
+
+        assertThat(response).isNotNull();
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(response.getPm10()).isEqualTo("61");
+        assertThat(response.getPm25()).isEqualTo("20");
+        assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
+    }
+
+    @DisplayName("failBack 실패 테스트")
+    @Test
+    void failBackRequestTest() {
+        createMockWebServer(createFailResponse());
+        assertThrows(BusinessException.class, () -> airQualityService.getAirQuality());
+    }
+
+    @DisplayName("failBack 성공 테스트")
+    @Test
+    void failBackSuccessTest() {
+
+        createMockWebServer(createFailResponse());
+        redisTemplate.opsForValue().set(key, cache);
+        CachedAirQuality before = redisTemplate.opsForValue().get(key);
+
+        airQualityService.updateAriQuality();
+        CachedAirQuality after = redisTemplate.opsForValue().get(key);
+
+        assertThat(after.isFresh()).isFalse();
+        assertThat(after.getData()).isEqualTo(before.getData());
+
+    }
+
+    private void createMockWebServer(String response){
+        mockWebServer.enqueue(new MockResponse()
+            .setBody(response)
+            .addHeader("Content-Type", "application/json")
+            .setResponseCode(200)
+        );
+    }
+
+    private String createResponse() {
+        return """
+                {
+                  "ListAvgOfSeoulAirQualityService": {
+                    "list_total_count": 1,
+                    "RESULT": {
+                      "CODE": "INFO-000",
+                      "MESSAGE": "정상 처리되었습니다"
+                    },
+                    "row": [
+                      {
+                        "GRADE": "보통",
+                        "IDEX_MVL": "55",
+                        "POLLUTANT": "O3",
+                        "NITROGEN": 0.017,
+                        "OZONE": 0.036,
+                        "CARBON": 0.4,
+                        "SULFUROUS": 0.003,
+                        "PM10": 23,
+                        "PM25": 12
+                      }
+                    ]
+                  }
+                }
+            """;
+    }
+
+    private String createFailResponse() {
+        return "<RESULT>\n"
+            + "<script/>\n"
+            + "<script/>\n"
+            + "<CODE>ERROR-300</CODE>\n"
+            + "<MESSAGE>\n"
+            + "<![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>\n"
+            + "</MESSAGE>\n"
+            + "</RESULT>";
+    }
+}

From c4f58c4d565c2fdaeb3d230e1f66f315ced8ca74 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Fri, 18 Apr 2025 12:34:39 +0900
Subject: [PATCH 03/26] =?UTF-8?q?test:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20service=20Test=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/AirQualityServiceTest.java    | 189 ------------------
 1 file changed, 189 deletions(-)
 delete mode 100644 src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java

diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java
deleted file mode 100644
index 294ccd0d..00000000
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/AirQualityServiceTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.programmers.signalbuddyfinal.domain.air_quality;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.time.LocalDateTime;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
-import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
-import org.programmers.signalbuddyfinal.global.config.RedisConfig;
-import org.programmers.signalbuddyfinal.global.db.RedisTestContainer;
-import org.programmers.signalbuddyfinal.global.exception.BusinessException;
-import org.programmers.signalbuddyfinal.global.support.ServiceTest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-
-@SpringBootTest
-@ContextConfiguration(initializers = AirQualityServiceTest.MockServerInitializer.class)
-@Import(RedisConfig.class)
-@TestPropertySource(properties = {
-    "schedule.air-quality-api.cron=0 0 0/1 * * ?",
-    "schedule.air-quality-api.lockAtMostFor=10m",
-    "schedule.air-quality-api.lockAtLeastFor=50m"
-})
-
-public class AirQualityServiceTest extends ServiceTest implements RedisTestContainer {
-
-    @Autowired
-    private AirQualityService airQualityService;
-    @Autowired
-    private RedisTemplate<String, CachedAirQuality> redisTemplate;
-    private static MockWebServer mockWebServer;
-    private String key = "air-quality: ";
-    private static CachedAirQuality cache;
-
-    @BeforeAll
-    static void setUp() throws Exception {
-        mockWebServer = new MockWebServer();
-        mockWebServer.start();
-        AirQualityResponse airQualityResponse = AirQualityResponse.builder()
-            .grade("보통")
-            .pm10("61")
-            .pm25("20")
-            .build();
-        cache = new CachedAirQuality(airQualityResponse, true,
-            LocalDateTime.of(2025, 1, 1, 1, 1));
-    }
-
-    @BeforeEach
-    void clearRedis() {
-        RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
-        if (factory != null) {
-            factory.getConnection().serverCommands().flushAll();
-        }
-    }
-
-    @AfterAll
-    static void tearDown() throws Exception {
-        mockWebServer.shutdown();
-    }
-
-    public static class MockServerInitializer implements
-        ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-        @Override
-        public void initialize(ConfigurableApplicationContext applicationContext) {
-            String baseUrl = "http://localhost:" + mockWebServer.getPort();
-            TestPropertyValues.of("air-quality.base-url=" + baseUrl)
-                .applyTo(applicationContext.getEnvironment());
-        }
-    }
-
-    @DisplayName("첫 요청 청공 시 응답 반환 및 캐싱 테스트")
-    @Test
-    void successRequestTest() {
-        createMockWebServer(createResponse());
-
-        AirQualityResponse response = airQualityService.getAirQuality();
-        CachedAirQuality cache = redisTemplate.opsForValue().get(key);
-
-        assertThat(response.getGrade()).isEqualTo("보통");
-        assertThat(cache).isNotNull();
-        assertThat(cache.getData().getGrade()).isEqualTo("보통");
-        assertThat(cache.isFresh()).isTrue();
-    }
-
-    @DisplayName("두번 째 요청시 캐싱된 데이터 반환")
-    @Test
-    void successSecondRequestTest() {
-
-        int count = mockWebServer.getRequestCount();
-        createMockWebServer(createResponse());
-        redisTemplate.opsForValue().set(key, cache);
-
-        AirQualityResponse response = airQualityService.getAirQuality();
-
-        assertThat(response).isNotNull();
-        assertThat(response.getGrade()).isEqualTo("보통");
-        assertThat(response.getPm10()).isEqualTo("61");
-        assertThat(response.getPm25()).isEqualTo("20");
-        assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
-    }
-
-    @DisplayName("failBack 실패 테스트")
-    @Test
-    void failBackRequestTest() {
-        createMockWebServer(createFailResponse());
-        assertThrows(BusinessException.class, () -> airQualityService.getAirQuality());
-    }
-
-    @DisplayName("failBack 성공 테스트")
-    @Test
-    void failBackSuccessTest() {
-
-        createMockWebServer(createFailResponse());
-        redisTemplate.opsForValue().set(key, cache);
-        CachedAirQuality before = redisTemplate.opsForValue().get(key);
-
-        airQualityService.updateAriQuality();
-        CachedAirQuality after = redisTemplate.opsForValue().get(key);
-
-        assertThat(after.isFresh()).isFalse();
-        assertThat(after.getData()).isEqualTo(before.getData());
-
-    }
-
-    private void createMockWebServer(String response){
-        mockWebServer.enqueue(new MockResponse()
-            .setBody(response)
-            .addHeader("Content-Type", "application/json")
-            .setResponseCode(200)
-        );
-    }
-
-    private String createResponse() {
-        return """
-                {
-                  "ListAvgOfSeoulAirQualityService": {
-                    "list_total_count": 1,
-                    "RESULT": {
-                      "CODE": "INFO-000",
-                      "MESSAGE": "정상 처리되었습니다"
-                    },
-                    "row": [
-                      {
-                        "GRADE": "보통",
-                        "IDEX_MVL": "55",
-                        "POLLUTANT": "O3",
-                        "NITROGEN": 0.017,
-                        "OZONE": 0.036,
-                        "CARBON": 0.4,
-                        "SULFUROUS": 0.003,
-                        "PM10": 23,
-                        "PM25": 12
-                      }
-                    ]
-                  }
-                }
-            """;
-    }
-
-    private String createFailResponse() {
-        return "<RESULT>\n"
-            + "<script/>\n"
-            + "<script/>\n"
-            + "<CODE>ERROR-300</CODE>\n"
-            + "<MESSAGE>\n"
-            + "<![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>\n"
-            + "</MESSAGE>\n"
-            + "</RESULT>";
-    }
-}

From 616da9157ea60c36ac6e9322be675271b9859b66 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Fri, 18 Apr 2025 21:10:09 +0900
Subject: [PATCH 04/26] =?UTF-8?q?feat:Object=20=ED=83=80=EC=9E=85=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signalbuddyfinal/global/config/RedisConfig.java        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
index f0f09948..d67be707 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
@@ -33,13 +33,6 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connec
         return redisTemplate;
     }
 
-    @Bean
-    public RedisTemplate<String, CachedAirQuality> cachedAirQualityRedisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<String, CachedAirQuality> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
-        return template;
-    }
-
     @Bean
     public PlatformTransactionManager transactionManager() {
         return new JpaTransactionManager();

From 157d16bb58dbb63afcdd5b0448fc4468a0c3c2f6 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 17 Apr 2025 12:38:12 +0900
Subject: [PATCH 05/26] =?UTF-8?q?feat:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/controller/AirQualityScheduler.java | 2 +-
 .../signalbuddyfinal/global/config/RedisConfig.java        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
index 2fe2a723..a3961919 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
@@ -7,7 +7,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-@Component
+@Configuration
 @RequiredArgsConstructor
 public class AirQualityScheduler {
     private final AirQualityService airQualityService;
diff --git a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
index d67be707..f0f09948 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
@@ -33,6 +33,13 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connec
         return redisTemplate;
     }
 
+    @Bean
+    public RedisTemplate<String, CachedAirQuality> cachedAirQualityRedisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, CachedAirQuality> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
+
     @Bean
     public PlatformTransactionManager transactionManager() {
         return new JpaTransactionManager();

From 8058da58a3037cf422bfb5f165281715792d5fee Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Fri, 18 Apr 2025 21:10:09 +0900
Subject: [PATCH 06/26] =?UTF-8?q?feat:Object=20=ED=83=80=EC=9E=85=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/controller/AirQualityScheduler.java | 2 +-
 .../signalbuddyfinal/global/config/RedisConfig.java        | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
index a3961919..2fe2a723 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
@@ -7,7 +7,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-@Configuration
+@Component
 @RequiredArgsConstructor
 public class AirQualityScheduler {
     private final AirQualityService airQualityService;
diff --git a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
index f0f09948..d67be707 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/global/config/RedisConfig.java
@@ -33,13 +33,6 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connec
         return redisTemplate;
     }
 
-    @Bean
-    public RedisTemplate<String, CachedAirQuality> cachedAirQualityRedisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<String, CachedAirQuality> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
-        return template;
-    }
-
     @Bean
     public PlatformTransactionManager transactionManager() {
         return new JpaTransactionManager();

From 8c38a5e0a92ab39e8db85c12e75b0fea2bcd0fd6 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 23 Apr 2025 13:10:46 +0900
Subject: [PATCH 07/26] =?UTF-8?q?feat:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20=EA=B6=8C=ED=95=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/service/AirQualityServiceTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
index a16936dd..07ae662a 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
@@ -181,4 +181,4 @@ private String createFailResponse() {
                 </RESULT>
             """;
     }
-}
+}
\ No newline at end of file

From 02bba867acc699eeb128774247abfda065e28a7b Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Mon, 12 May 2025 16:11:55 +0900
Subject: [PATCH 08/26] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EA=B8=B0=EB=B0=98=20=EB=AF=B8=EC=84=B8?=
 =?UTF-8?q?=EB=A8=BC=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |   3 +
 .../controller/AirQualityController.java      |  14 +-
 .../controller/AirQualityScheduler.java       |   3 +-
 .../domain/air_quality/dto/AirQuality.java    |  16 -
 .../air_quality/dto/AirQualityItems.java      |  36 --
 .../air_quality/dto/AirQualityResponse.java   |   1 -
 .../domain/air_quality/dto/Observatory.java   |  37 ++
 .../air_quality/dto/ObservatoryResponse.java  |  15 +
 .../air_quality/dto/RegionAirQuality.java     |  60 +++
 .../domain/air_quality/dto/Result.java        |  19 -
 .../air_quality/dto/SeoulAirQuality.java      |  68 +++
 .../exception/AirQualityErrorCode.java        |   4 +-
 .../service/AirQualityService.java            | 159 ++++--
 .../service/CoordinateConverter.java          |  33 ++
 .../service/ObservatoryProvider.java          |  84 ++++
 .../service/RegionAirQualityProvider.java     |  75 +++
 ...ider.java => SeoulAirQualityProvider.java} |  27 +-
 .../global/config/WebClientConfig.java        |  26 +
 .../controller/AirQualityControllerTest.java  |   9 +-
 .../service/AirQualityServiceTest.java        | 468 +++++++++++++-----
 submodule                                     |   2 +-
 21 files changed, 892 insertions(+), 267 deletions(-)
 delete mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQuality.java
 delete mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityItems.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/ObservatoryResponse.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/RegionAirQuality.java
 delete mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Result.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/CoordinateConverter.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
 rename src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/{AirQualityProvider.java => SeoulAirQualityProvider.java} (73%)

diff --git a/build.gradle b/build.gradle
index 83457bb6..d65fd858 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,9 @@ dependencies {
     // Xml
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.0-rc2"
 
+    // 좌표
+    implementation 'org.locationtech.proj4j:proj4j:1.1.1'
+
 }
 
 // JaCoCo 버전 설정
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityController.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityController.java
index 0f3b2059..d59ddae8 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityController.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityController.java
@@ -7,6 +7,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -14,10 +15,13 @@
 @RequiredArgsConstructor
 public class AirQualityController {
 
-    private final AirQualityService airQualityService;
+  private final AirQualityService airQualityService;
 
-    @GetMapping
-    public ResponseEntity<ApiResponse<AirQualityResponse>> getAirQuality() {
-        return ResponseEntity.ok(ApiResponse.createSuccess(airQualityService.getAirQuality()));
-    }
+  @GetMapping
+  public ResponseEntity<ApiResponse<AirQualityResponse>> getAirQuality(
+      @RequestParam double lat,
+      @RequestParam double lng
+  ) {
+    return ResponseEntity.ok(ApiResponse.createSuccess(airQualityService.getAirQuality(lat, lng)));
+  }
 }
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
index 2fe2a723..cd14fa25 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -21,4 +20,4 @@ public class AirQualityScheduler {
     public void updateAirQuality(){
         airQualityService.updateAriQuality();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQuality.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQuality.java
deleted file mode 100644
index b62edb97..00000000
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQuality.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.programmers.signalbuddyfinal.domain.air_quality.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
-import lombok.Getter;
-
-@Getter
-public class AirQuality {
-
-    private int list_total_count;
-
-    @JsonProperty("RESULT")
-    private Result result;
-
-    private List<AirQualityItems> row;
-}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityItems.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityItems.java
deleted file mode 100644
index 27fa505b..00000000
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityItems.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.programmers.signalbuddyfinal.domain.air_quality.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-
-@Getter
-public class AirQualityItems {
-
-    @JsonProperty("GRADE")
-    private String grade;
-
-    @JsonProperty("IDEX_MVL")
-    private String mvl;
-
-    @JsonProperty("POLLUTANT")
-    private String pollutant;
-
-    @JsonProperty("NITROGEN")
-    private String nitrogen;
-
-    @JsonProperty("OZONE")
-    private String ozone;
-
-    @JsonProperty("CARBON")
-    private String carbon;
-
-    @JsonProperty("SULFUROUS")
-    private String sulfurous;
-
-    @JsonProperty("PM10")
-    private String pm10;
-
-    @JsonProperty("PM25")
-    private String pm25;
-
-}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
index fd8b2d60..ddaad60c 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
@@ -10,7 +10,6 @@
 
 @Getter
 @Builder
-@Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class AirQualityResponse implements Serializable {
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
new file mode 100644
index 00000000..f7dd5bee
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
@@ -0,0 +1,37 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.dto;
+
+import lombok.Data;
+import java.util.List;
+
+
+public class Observatory {
+    private Response response;
+
+    @Data
+    public static class Response {
+        private Body body;
+        private Header header;
+    }
+
+    @Data
+    public static class Body {
+        private int totalCount;
+        private List<Item> items;
+        private int pageNo;
+        private int numOfRows;
+    }
+
+    @Data
+    public static class Item {
+        private String stationCode;
+        private double tm;
+        private String addr;
+        private String stationName;
+    }
+
+    @Data
+    public static class Header {
+        private String resultMsg;
+        private String resultCode;
+    }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/ObservatoryResponse.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/ObservatoryResponse.java
new file mode 100644
index 00000000..ec721b8c
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/ObservatoryResponse.java
@@ -0,0 +1,15 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class ObservatoryResponse {
+
+    private String addr;
+
+    private String stationName;
+
+    private String stationCode;
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/RegionAirQuality.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/RegionAirQuality.java
new file mode 100644
index 00000000..8c206d2e
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/RegionAirQuality.java
@@ -0,0 +1,60 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.dto;
+
+import lombok.Builder;
+import java.util.List;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class RegionAirQuality {
+    private Response response;
+
+    @Builder
+    @Getter
+    public static class Response {
+        private Body body;
+        private Header header;
+    }
+
+    @Builder
+    @Getter
+    public static class Body {
+        private int totalCount;
+        private List<Item> items;
+        private int pageNo;
+        private int numOfRows;
+    }
+
+    @Builder
+    @Getter
+    public static class Item {
+        private String so2Grade;
+        private String coFlag;
+        private String khaiValue;
+        private String so2Value;
+        private String coValue;
+        private String pm25Flag;
+        private String pm10Flag;
+        private String pm10Value;
+        private String o3Grade;
+        private String khaiGrade;
+        private String pm25Value;
+        private String no2Flag;
+        private String no2Grade;
+        private String o3Flag;
+        private String pm25Grade;
+        private String so2Flag;
+        private String dataTime;
+        private String coGrade;
+        private String no2Value;
+        private String pm10Grade;
+        private String o3Value;
+    }
+
+    @Builder
+    @Getter
+    public static class Header {
+        private String resultMsg;
+        private String resultCode;
+    }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Result.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Result.java
deleted file mode 100644
index 99acdc40..00000000
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Result.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.programmers.signalbuddyfinal.domain.air_quality.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import lombok.Getter;
-
-@Getter
-@JacksonXmlRootElement(localName = "RESULT")
-public class Result {
-
-    @JsonProperty("CODE")
-    @JacksonXmlProperty(localName = "CODE")
-    private String code;
-
-    @JsonProperty("MESSAGE")
-    @JacksonXmlProperty(localName = "MESSAGE")
-    private String message;
-}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
new file mode 100644
index 00000000..a04135f6
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
@@ -0,0 +1,68 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.List;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class SeoulAirQuality {
+
+    private int list_total_count;
+
+    @JsonProperty("RESULT")
+    private Result result;
+
+    private List<Item> row;
+
+    @Getter
+    @Builder
+    @JacksonXmlRootElement(localName = "RESULT")
+    public static class Result {
+
+        @JsonProperty("CODE")
+        @JacksonXmlProperty(localName = "CODE")
+        private String code;
+
+        @JsonProperty("MESSAGE")
+        @JacksonXmlProperty(localName = "MESSAGE")
+        private String message;
+    }
+
+    @Getter
+    @Builder
+    public static class Item{
+
+            @JsonProperty("GRADE")
+            private String grade;
+
+            @JsonProperty("IDEX_MVL")
+            private String mvl;
+
+            @JsonProperty("POLLUTANT")
+            private String pollutant;
+
+            @JsonProperty("NITROGEN")
+            private String nitrogen;
+
+            @JsonProperty("OZONE")
+            private String ozone;
+
+            @JsonProperty("CARBON")
+            private String carbon;
+
+            @JsonProperty("SULFUROUS")
+            private String sulfurous;
+
+            @JsonProperty("PM10")
+            private String pm10;
+
+            @JsonProperty("PM25")
+            private String pm25;
+
+    }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/exception/AirQualityErrorCode.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/exception/AirQualityErrorCode.java
index 7c60f649..145f70b1 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/exception/AirQualityErrorCode.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/exception/AirQualityErrorCode.java
@@ -12,7 +12,9 @@ public enum AirQualityErrorCode implements ErrorCode {
 
     AIR_QUALITY_SERVICE_UNAVAILABLE(HttpStatus.SERVICE_UNAVAILABLE, "20000",
         "일시적인 문제로 데이터를 불러올 수 없습니다. 잠시 후 다시 시도해 주세요."),
-    AIR_QUALITY_DATA_NOT_READ(HttpStatus.INTERNAL_SERVER_ERROR, "20001", "미세먼지 API 데이터 파싱 에러");
+    AIR_QUALITY_DATA_NOT_READ(HttpStatus.INTERNAL_SERVER_ERROR, "20001", "미세먼지 API 데이터 파싱 에러"),
+    ALL_AIR_QUALITY_DATA_NOT_READ(HttpStatus.INTERNAL_SERVER_ERROR, "20002", "측정소별 미세먼지 API 데이터 파싱 에러"),
+    OBSERVATORY_DATA_NOT_READ(HttpStatus.INTERNAL_SERVER_ERROR, "20003", "관측소 API 데이터 파싱 에러");
 
     private HttpStatus httpStatus;
     private String code;
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
index 03afa2f3..ef098993 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
@@ -5,9 +5,8 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQuality;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.locationtech.proj4j.ProjCoordinate;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.*;
 import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
 import org.programmers.signalbuddyfinal.global.exception.BusinessException;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -18,60 +17,126 @@
 @RequiredArgsConstructor
 public class AirQualityService {
 
-    private final AirQualityProvider airQualityProvider;
-    private final RedisTemplate<Object, Object> redisTemplate;
+  private final SeoulAirQualityProvider airQualityProvider;
+  private final RegionAirQualityProvider regionAirQualityProvider;
+  private final ObservatoryProvider observatoryProvider;
 
-    private static final String key = "air-quality: ";
-    private static final Duration TTL = Duration.ofHours(2);
+  private final RedisTemplate<Object, Object> redisTemplate;
+  private final CoordinateConverter coordinateConverter;
 
-    public AirQualityResponse getAirQuality() {
-        return getCachedAirQuality().orElseGet(this::updateAriQuality);
-    }
+  private static final String key = "air-quality:";
+  private static final Duration TTL = Duration.ofHours(2);
 
-    public AirQualityResponse updateAriQuality() {
-        return requestAirQuality()
-                .map(this::successfulResponse)
-                .orElseGet(this::failBackOrThrow);
+  public AirQualityResponse getAirQuality(double lat, double lng) {
+    ObservatoryResponse observatoryResponse = getObservatory(lat, lng);
+    if (isSeoul(observatoryResponse)) {
+      return getCachedAirQuality("seoul").orElseGet(this::updateAriQuality);
     }
+    return getCachedAirQuality(observatoryResponse.getStationCode()).orElseGet(
+        () -> updateRegionAriQuality(observatoryResponse));
+  }
 
-    private Optional<AirQualityResponse> getCachedAirQuality() {
-        return Optional.ofNullable(getCache())
-                .filter(CachedAirQuality::isFresh)
-                .map(CachedAirQuality::getData);
-    }
+  public AirQualityResponse updateAriQuality() {
+    return requestAirQuality()
+        .map(this::successfulResponse)
+        .orElseGet(() -> failBackOrThrow("seoul"));
+  }
 
-    private AirQualityResponse successfulResponse(AirQuality newAirQuality) {
-        AirQualityResponse response = createResponse(newAirQuality);
-        saveToCache(response, true);
-        return response;
-    }
+  public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatoryResponse) {
+    return requestAllAirQuality(observatoryResponse.getStationName())
+        .map(newAirQuality -> successfulAllResponse(newAirQuality,
+            observatoryResponse.getStationCode()))
+        .orElseGet(() -> failBackOrThrow(observatoryResponse.getStationCode()));
+  }
 
-    private AirQualityResponse failBackOrThrow() {
-        return Optional.ofNullable(getCache())
-                .map(cache -> {
-                    saveToCache(cache.getData(), false);
-                    return cache.getData();
-                })
-                .orElseThrow(() -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
-    }
 
-    private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh) {
-        redisTemplate.opsForValue().set(key, new CachedAirQuality(airQualityResponse, fresh), TTL);
-    }
+  private Optional<AirQualityResponse> getCachedAirQuality(String code) {
+    return Optional.ofNullable(getCache(key + code))
+        .filter(CachedAirQuality::isFresh)
+        .map(CachedAirQuality::getData);
+  }
 
-    private CachedAirQuality getCache() {
-        return (CachedAirQuality) redisTemplate.opsForValue().get(key);
-    }
+  private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
+    AirQualityResponse response = createResponse(newSeoulAirQuality);
+    saveToCache(response, true, "seoul");
+    return response;
+  }
 
-    private Optional<AirQuality> requestAirQuality() {
-        return airQualityProvider.getAirQuality();
-    }
+  private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality, String value) {
+    AirQualityResponse response = createAllResponse(newAirQuality);
+    saveToCache(response, true, value);
+    return response;
+  }
+
+  private AirQualityResponse failBackOrThrow(String value) {
+    String newKey = key + value;
+    return Optional.ofNullable(getCache(newKey))
+        .map(cache -> {
+          saveToCache(cache.getData(), false, value);
+          return cache.getData();
+        })
+        .orElseThrow(
+            () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
+  }
+
+  private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String value) {
+    String newKey = key + value;
+    redisTemplate.opsForValue().set(newKey, new CachedAirQuality(airQualityResponse, fresh), TTL);
+  }
+
+  private CachedAirQuality getCache(String newKey) {
+    return (CachedAirQuality) redisTemplate.opsForValue().get(newKey);
+  }
+
+  private Optional<SeoulAirQuality> requestAirQuality() {
+    return airQualityProvider.getAirQuality();
+  }
+
+  private Optional<RegionAirQuality> requestAllAirQuality(String stationName) {
+    return regionAirQualityProvider.geAllAirQuality(stationName);
+  }
+
+  private AirQualityResponse createResponse(SeoulAirQuality seoulAirQuality) {
+    return AirQualityResponse.builder()
+        .grade(seoulAirQuality.getRow().get(0).getGrade())
+        .pm25(seoulAirQuality.getRow().get(0).getPm25())
+        .pm10(seoulAirQuality.getRow().get(0).getPm10())
+        .build();
+  }
+
+  private AirQualityResponse createAllResponse(RegionAirQuality regionAirQuality) {
+    return AirQualityResponse.builder()
+        .grade(convertGrade(regionAirQuality))
+        .pm25(regionAirQuality.getResponse().getBody().getItems().get(0).getPm25Value())
+        .pm10(regionAirQuality.getResponse().getBody().getItems().get(0).getPm10Value())
+        .build();
+  }
+
+  private ProjCoordinate convertCoordinate(double lng, double lat) {
+    return coordinateConverter.convert(lng, lat);
+  }
+
+  private ObservatoryResponse getObservatory(double lat, double lng) {
+    ProjCoordinate coordinate= convertCoordinate(lat, lng);
+    return observatoryProvider.getObservatory(coordinate.x, coordinate.y);
+  }
+
+  private boolean isSeoul(ObservatoryResponse observatoryResponse) {
+    return observatoryResponse.getAddr().startsWith("서울");
+  }
 
-    private AirQualityResponse createResponse(AirQuality airQuality) {
-        return AirQualityResponse.builder()
-                .grade(airQuality.getRow().get(0).getGrade())
-                .pm25(airQuality.getRow().get(0).getPm25())
-                .pm10(airQuality.getRow().get(0).getPm10())
-                .build();
+  private String convertGrade(RegionAirQuality airQuality) {
+    switch (airQuality.getResponse().getBody().getItems().get(0).getPm10Grade()) {
+      case "1":
+        return "좋음";
+      case "2":
+        return "보통";
+      case "3":
+        return "나쁨";
+      case "4":
+        return "매우 나쁨";
+      default:
+        return "-";
     }
+  }
 }
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/CoordinateConverter.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/CoordinateConverter.java
new file mode 100644
index 00000000..ae608b69
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/CoordinateConverter.java
@@ -0,0 +1,33 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import lombok.RequiredArgsConstructor;
+import org.locationtech.proj4j.CRSFactory;
+import org.locationtech.proj4j.CoordinateReferenceSystem;
+import org.locationtech.proj4j.CoordinateTransform;
+import org.locationtech.proj4j.CoordinateTransformFactory;
+import org.locationtech.proj4j.ProjCoordinate;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class CoordinateConverter {
+
+    private final CoordinateTransform transform;
+
+    public CoordinateConverter() {
+        CRSFactory factory = new CRSFactory();
+        CoordinateReferenceSystem crsWGS84 = factory.createFromName("EPSG:4326");
+        CoordinateReferenceSystem crsTM = factory.createFromName("EPSG:5181");
+
+        CoordinateTransformFactory ctFactory = new CoordinateTransformFactory();
+        this.transform = ctFactory.createTransform(crsWGS84, crsTM);
+    }
+
+    public ProjCoordinate convert(double longitude, double latitude) {
+        ProjCoordinate srcCoord = new ProjCoordinate(longitude, latitude);
+        ProjCoordinate destCoord = new ProjCoordinate();
+
+        transform.transform(srcCoord, destCoord);
+        return destCoord;
+    }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
new file mode 100644
index 00000000..8e2a03e7
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
@@ -0,0 +1,84 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.extern.slf4j.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
+import org.programmers.signalbuddyfinal.global.exception.BusinessException;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.util.StringTokenizer;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ObservatoryProvider {
+
+  @Qualifier("observatoryApiWebClient")
+  private final WebClient webClient;
+  @Value("${observatory.api-key}")
+  private String apiKey;
+  private final ObjectMapper objectMapper;
+  private final XmlMapper xmlMapper = (XmlMapper) new XmlMapper()
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+
+  public ObservatoryResponse getObservatory(double lat, double lng) {
+
+    String body = webClient.get()
+        .uri(uriBuilder -> uriBuilder
+            .path("/{apiKey}/json/{lat}/{lng}/1.1")
+            .build(apiKey, lat, lng)
+        ).accept(MediaType.ALL)
+        .retrieve()
+        .bodyToMono(String.class)
+        .block();
+
+    ObservatoryResponse response = parserObservatory(body);
+    if (response != null) {
+      return response;
+    }
+    return null;
+  }
+
+  private ObservatoryResponse parserObservatory(String body) {
+    try {
+      JsonNode jsonRoot = objectMapper.readTree(body);
+      if (jsonRoot.has("response")) {
+        JsonNode itemsNode = jsonRoot.get("response").get("body").get("items");
+        String fullAddr = itemsNode.get(0).get("addr").asText();
+        StringTokenizer st = new StringTokenizer(fullAddr, " ");
+        String addr = st.nextToken();
+
+        return ObservatoryResponse.builder()
+            .addr(addr)
+            .stationName(itemsNode.get(0).get("stationName").asText())
+            .stationCode(itemsNode.get(0).get("stationCode").asText())
+            .build();
+      }
+    } catch (Exception e) {
+      try {
+        XmlMapper xmlMapper = new XmlMapper();
+        JsonNode rootNode = xmlMapper.readTree(body);
+
+        String code = rootNode.at("/cmmMsgHeader/returnReasonCode").asText();
+        String message = rootNode.at("/cmmMsgHeader/errMsg").asText();
+
+        log.info("측정소 API 응답 실패 - CODE: {}, MESSAGE: {}", code,
+            message);
+        return null;
+      } catch (Exception xmlEx) {
+        throw new BusinessException(AirQualityErrorCode.OBSERVATORY_DATA_NOT_READ);
+      }
+    }
+    return null;
+  }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
new file mode 100644
index 00000000..21970e2b
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
@@ -0,0 +1,75 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.RegionAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
+import org.programmers.signalbuddyfinal.global.exception.BusinessException;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.util.Optional;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RegionAirQualityProvider {
+
+    @Qualifier("allAirQualityApiWebClient")
+    private final WebClient webClient;
+    @Value("${observatory.api-key}")
+    private String apiKey;
+    private final ObjectMapper objectMapper;
+    private final XmlMapper xmlMapper = (XmlMapper) new XmlMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    public Optional<RegionAirQuality> geAllAirQuality(String stationName) {
+
+        String body = webClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/{apiKey}/json/1/1/{stationName}/DAILY/1.0")
+                        .build(apiKey, stationName)
+                ).accept(MediaType.ALL)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+
+        RegionAirQuality response = parserAirQuality(body);
+        if (response != null) {
+            return Optional.of(response);
+        }
+        return Optional.empty();
+    }
+
+    private RegionAirQuality parserAirQuality(String body){
+        try {
+            JsonNode jsonRoot = objectMapper.readTree(body);
+            if (jsonRoot.has("response")) {
+                return objectMapper.readValue(body, RegionAirQuality.class);
+            }
+        }catch (Exception e) {
+            try {
+                XmlMapper xmlMapper = new XmlMapper();
+                JsonNode rootNode = xmlMapper.readTree(body);
+
+                String code = rootNode.at("/cmmMsgHeader/returnReasonCode").asText();
+                String message = rootNode.at("/cmmMsgHeader/errMsg").asText();
+
+                log.info("측정소별 미세먼지 API 응답 실패 - CODE: {}, MESSAGE: {}", code,
+                        message);
+                return null;
+            } catch (Exception xmlEx) {
+                throw new BusinessException(AirQualityErrorCode.ALL_AIR_QUALITY_DATA_NOT_READ);
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityProvider.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityProvider.java
similarity index 73%
rename from src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityProvider.java
rename to src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityProvider.java
index d7ef0b38..0ba56ef3 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityProvider.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityProvider.java
@@ -7,10 +7,7 @@
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.sl.draw.geom.GuideIf.Op;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQuality;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityItems;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.Result;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.SeoulAirQuality;
 import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
 import org.programmers.signalbuddyfinal.global.exception.BusinessException;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -22,7 +19,7 @@
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class AirQualityProvider {
+public class SeoulAirQualityProvider {
 
     @Qualifier("airQualityApiWebClient")
     private final WebClient webClient;
@@ -33,7 +30,7 @@ public class AirQualityProvider {
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
 
-    public Optional<AirQuality> getAirQuality() {
+    public Optional<SeoulAirQuality> getAirQuality() {
 
             String body = webClient.get()
                 .uri(uriBuilder -> uriBuilder
@@ -45,25 +42,27 @@ public Optional<AirQuality> getAirQuality() {
                 .bodyToMono(String.class)
                 .block();
 
-            AirQuality airQuality = parseAirQuality(body);
-        if(airQuality != null) {
-            return Optional.of(airQuality);
+            SeoulAirQuality seoulAirQuality = parseAirQuality(body);
+        if(seoulAirQuality != null) {
+            return Optional.of(seoulAirQuality);
         }
         return Optional.empty();
     }
 
-    private AirQuality parseAirQuality(String body) {
+    private SeoulAirQuality parseAirQuality(String body) {
         try {
             JsonNode jsonRoot = objectMapper.readTree(body);
             if (jsonRoot.has("ListAvgOfSeoulAirQualityService")) {
                 JsonNode service = jsonRoot.get("ListAvgOfSeoulAirQualityService");
-                return objectMapper.treeToValue(service, AirQuality.class);
+                return objectMapper.treeToValue(service, SeoulAirQuality.class);
             }
         } catch (Exception e) {
             try {
-                Result error = xmlMapper.readValue(body, Result.class);
-                log.info("미세먼지 API 응답 실패 - CODE: {}, MESSAGE: {}", error.getCode(),
-                    error.getMessage());
+                JsonNode rootNode = xmlMapper.readTree(body);
+                String code = rootNode.has("CODE") ?rootNode.get("CODE").asText() : "UNKNOWN";
+                String message = rootNode.has("MESSAGE") ? rootNode.get("MESSAGE").asText() : "UNKNOWN";
+                log.info("미세먼지 API 응답 실패 - CODE: {}, MESSAGE: {}", code,
+                    message);
                 return null;
             } catch (Exception xmlEx) {
                 throw new BusinessException(AirQualityErrorCode.AIR_QUALITY_DATA_NOT_READ);
diff --git a/src/main/java/org/programmers/signalbuddyfinal/global/config/WebClientConfig.java b/src/main/java/org/programmers/signalbuddyfinal/global/config/WebClientConfig.java
index adcaa633..8a5df782 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/global/config/WebClientConfig.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/global/config/WebClientConfig.java
@@ -26,6 +26,12 @@ public class WebClientConfig {
     @Value("${air-quality.base-url}")
     private String airQualityApiBaseUrl;
 
+    @Value("${region-air-quality.base-url}")
+    private String allAirQualityApiBaseUrl;
+
+    @Value("${observatory.base-url}")
+    private String observatoryApiBaseUrl;
+
     private final int processors = Runtime.getRuntime().availableProcessors();    // PC의 Processor 개수
     private final HttpClient httpClient = HttpClient.create(
             ConnectionProvider.builder("ApiConnections")
@@ -65,4 +71,24 @@ public WebClient airQualityApiWebClient() {
             .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
             .build();
     }
+
+    // 미세먼지 측정소 API WebClient
+    @Bean
+    public WebClient observatoryApiWebClient() {
+        return WebClient.builder()
+            .baseUrl(observatoryApiBaseUrl)
+            .clientConnector(new ReactorClientHttpConnector(httpClient))
+            .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+            .build();
+    }
+
+    // 전국 미세먼지 API WebClient
+    @Bean
+    public WebClient allAirQualityApiWebClient() {
+        return WebClient.builder()
+            .baseUrl(allAirQualityApiBaseUrl)
+            .clientConnector(new ReactorClientHttpConnector(httpClient))
+            .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+            .build();
+    }
 }
diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityControllerTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityControllerTest.java
index 4e8dd95e..6ea9502a 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityControllerTest.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityControllerTest.java
@@ -24,7 +24,7 @@
 @WebMvcTest(AirQualityController.class)
 public class AirQualityControllerTest extends ControllerTest {
 
-    private final String tag = "AirQuality API";
+    private final String tag = "SeoulAirQuality API";
 
     @MockitoBean
     private AirQualityService airQualityService;
@@ -38,9 +38,12 @@ void getAirQuality() throws Exception {
             .pm10("25")
             .build();
 
-        given(airQualityService.getAirQuality()).willReturn(response);
+        given(airQualityService.getAirQuality(127.4170933,127.4170933)).willReturn(response);
 
-        mockMvc.perform(get("/api/air-quality"))
+        mockMvc.perform(get("/api/air-quality")
+                .param("lat","127.4170933")
+                .param("lng", "127.4170933")
+            )
             .andExpect(status().isOk())
             .andDo(print())
             .andDo(document("미세먼지 조회",
diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
index 07ae662a..e998ce12 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
@@ -2,15 +2,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
+import java.util.List;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.RegionAirQuality;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.SeoulAirQuality;
 import org.programmers.signalbuddyfinal.global.config.RedisConfig;
 import org.programmers.signalbuddyfinal.global.db.RedisTestContainer;
 import org.programmers.signalbuddyfinal.global.exception.BusinessException;
@@ -26,6 +34,8 @@
 import org.springframework.test.context.TestPropertySource;
 
 import java.io.IOException;
+import java.util.Optional;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @SpringBootTest
 @Import(RedisConfig.class)
@@ -37,148 +47,362 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 public class AirQualityServiceTest extends ServiceTest implements RedisTestContainer {
 
-    @Autowired
-    private AirQualityService airQualityService;
+  @Autowired
+  private AirQualityService airQualityService;
 
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
+  @Autowired
+  private RedisTemplate<Object, Object> redisTemplate;
 
-    private static MockWebServer mockWebServer;
+  @MockitoBean
+  private static ObservatoryProvider observatoryProvider;
 
-    private final String key = "air-quality: ";
+  @MockitoBean
+  private RegionAirQualityProvider regionAirQualityProvider;
 
-    private static CachedAirQuality cachedAirQuality;
+  @MockitoBean
+  private SeoulAirQualityProvider seoulAirQualityProvider;
 
-    @BeforeAll
-    static void startMockServer() throws IOException {
-        mockWebServer = new MockWebServer();
-        mockWebServer.start();
+  private static MockWebServer mockWebServer;
 
-        AirQualityResponse response = AirQualityResponse.builder()
-            .grade("보통")
-            .pm10("61")
-            .pm25("20")
-            .build();
-        cachedAirQuality = new CachedAirQuality(response, true);
-    }
+  private final String key = "air-quality:";
 
-    @AfterAll
-    static void stopMockServer() throws IOException {
-        mockWebServer.shutdown();
-    }
+  @BeforeAll
+  static void startMockServer() throws IOException {
+    mockWebServer = new MockWebServer();
+    mockWebServer.start();
+  }
 
-    @DynamicPropertySource
-    static void overrideProperties(DynamicPropertyRegistry registry) {
-        registry.add("air-quality.base-url", () -> "http://localhost:" + mockWebServer.getPort());
-    }
+  @BeforeEach
+  void setup() {
+    flushRedis();
+  }
 
-    @DisplayName("첫 요청 성공 시 응답 반환 및 캐싱 테스트")
-    @Test
-    void successRequestTest() {
-        flushRedis();
-        createMockWebServer(createResponse());
+  @AfterEach
+  void shutDown() throws IOException {
+    mockWebServer.shutdown();
+  }
 
-        AirQualityResponse response = airQualityService.getAirQuality();
-        CachedAirQuality cache = (CachedAirQuality) redisTemplate.opsForValue().get(key);
+  @DynamicPropertySource
+  static void overrideProperties(DynamicPropertyRegistry registry) {
+    registry.add("air-quality.base-url", () -> "http://localhost:" + mockWebServer.getPort());
+  }
 
-        assertThat(response.getGrade()).isEqualTo("보통");
-        assertThat(cache).isNotNull();
-        assertThat(cache.getData().getGrade()).isEqualTo("보통");
-        assertThat(cache.isFresh()).isTrue();
-    }
+  @DisplayName("서울 첫 요청 성공 시 응답 반환 및 캐싱 테스트")
+  @Test
+  void successRequestTest() {
+    createMockWebServer(createSeoulApiResponse());
 
-    @DisplayName("두 번째 요청 시 캐싱된 데이터 반환")
-    @Test
-    void successSecondRequestTest() {
-        flushRedis();
-        int count = mockWebServer.getRequestCount();
-        createMockWebServer(createResponse());
-        redisTemplate.opsForValue().set(key, cachedAirQuality);
-
-       AirQualityResponse response = airQualityService.getAirQuality();
-
-        assertThat(response).isNotNull();
-        assertThat(response.getGrade()).isEqualTo("보통");
-        assertThat(response.getPm10()).isEqualTo("61");
-        assertThat(response.getPm25()).isEqualTo("20");
-        assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
-    }
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+    when(seoulAirQualityProvider.getAirQuality())
+        .thenReturn(Optional.of(createSeoulAirQuality()));
 
-    @DisplayName("failBack 실패 테스트")
-    @Test
-    void failBackRequestTest() {
-        flushRedis();
-        createMockWebServer(createFailResponse());
+    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+    CachedAirQuality cache = getCache("seoul");
 
-        assertThrows(BusinessException.class, () -> airQualityService.getAirQuality());
-    }
+    assertThat(response.getGrade()).isEqualTo("보통");
+    assertThat(cache).isNotNull();
+    assertThat(cache.getData().getGrade()).isEqualTo("보통");
+    assertThat(cache.isFresh()).isTrue();
+  }
+
+  @DisplayName("서울 두 번째 요청 시 캐싱된 데이터 반환")
+  @Test
+  void successSecondRequestTest() {
+    int count = mockWebServer.getRequestCount();
+    createMockWebServer(createSeoulApiResponse());
+    setCache("seoul", true);
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+
+    assertThat(response).isNotNull();
+    assertThat(response.getGrade()).isEqualTo("보통");
+    assertThat(response.getPm10()).isEqualTo("61");
+    assertThat(response.getPm25()).isEqualTo("20");
+    assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
+  }
+
+  @DisplayName("서울 failBack 실패 테스트")
+  @Test
+  void failBackRequestTest() {
+    createMockWebServer(createFailSeoulApiResponse());
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+    assertThrows(BusinessException.class,
+        () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
+  }
+
+  @DisplayName("서울 failBack 성공 테스트")
+  @Test
+  void failBackSuccessTest() {
+    createMockWebServer(createFailSeoulApiResponse());
+    setCache("seoul", true);
+    CachedAirQuality before = getCache("seoul");
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+    airQualityService.updateAriQuality();
+    CachedAirQuality after = getCache("seoul");
+
+    assertThat(after.isFresh()).isFalse();
+    assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
+
+  }
+
+  @Test
+  @DisplayName("서울 외 지역 응답 성공 테스트")
+  void successRegionRequestTest() {
+    createMockWebServer(createFailRegionApiResponse());
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+    when(regionAirQualityProvider.geAllAirQuality(anyString()))
+        .thenReturn(Optional.of(createRegionAirQuality("13", "23")));
+
+    AirQualityResponse response = airQualityService.getAirQuality(127.0421, 37.5716);
+
+    assertThat(response).isNotNull();
+    assertThat(response.getGrade()).isEqualTo("보통");
+    assertThat(response.getPm10()).isEqualTo("23");
+    assertThat(response.getPm25()).isEqualTo("13");
+  }
+
+  @DisplayName("서울외 지역 두 번째 요청 시 캐싱된 데이터 반환")
+  @Test
+  void successSecondRegionRequestTest() {
+    int count = mockWebServer.getRequestCount();
+    createMockWebServer(createRegionApiResponse());
+    setCache("111123", true);
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+
+    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+
+    assertThat(response).isNotNull();
+    assertThat(response.getGrade()).isEqualTo("보통");
+    assertThat(response.getPm10()).isEqualTo("61");
+    assertThat(response.getPm25()).isEqualTo("20");
+    assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
+  }
+
+  @DisplayName("서울외 지역 failBack 실패 테스트")
+  @Test
+  void RegionFailBackRequestTest() {
+    createMockWebServer(createFailRegionApiResponse());
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
 
-    @DisplayName("failBack 성공 테스트")
-    @Test
-    void failBackSuccessTest() {
-        flushRedis();
-        createMockWebServer(createFailResponse());
-        redisTemplate.opsForValue().set(key, cachedAirQuality);
-        CachedAirQuality before = (CachedAirQuality) redisTemplate.opsForValue().get(key);
+    assertThrows(BusinessException.class,
+        () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
+  }
 
-        airQualityService.updateAriQuality();
-        CachedAirQuality after = (CachedAirQuality) redisTemplate.opsForValue().get(key);
+  @DisplayName("서울외 지역 failBack 성공 테스트")
+  @Test
+  void RegionFailBackSuccessTest() {
+    createMockWebServer(createRegionApiResponse());
+    setCache("111123", true);
+    CachedAirQuality before = getCache("111123");
+    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
 
-        assertThat(after.isFresh()).isFalse();
-        assertThat(after.getData()).isEqualTo(before.getData());
+    airQualityService.updateRegionAriQuality(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+    CachedAirQuality after = getCache("111123");
+
+    assertThat(after.isFresh()).isFalse();
+    assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
+
+  }
+
+  private void flushRedis() {
+    RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
+    if (factory != null) {
+      factory.getConnection().serverCommands().flushAll();
     }
+  }
 
-    private void flushRedis() {
-        RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
-        if (factory != null) {
-            factory.getConnection().serverCommands().flushAll();
+  private void createMockWebServer(String response) {
+    mockWebServer.enqueue(new MockResponse()
+        .setBody(response)
+        .addHeader("Content-Type", "application/json")
+        .setResponseCode(200));
+  }
+
+  private String createSeoulApiResponse() {
+    return """
+        {
+          "ListAvgOfSeoulAirQualityService": {
+            "list_total_count": 1,
+            "RESULT": {
+              "CODE": "INFO-000",
+              "MESSAGE": "정상 처리되었습니다"
+            },
+            "row": [
+              {
+                "GRADE": "보통",
+                "IDEX_MVL": "55",
+                "POLLUTANT": "O3",
+                "NITROGEN": 0.017,
+                "OZONE": 0.036,
+                "CARBON": 0.4,
+                "SULFUROUS": 0.003,
+                "PM10": 23,
+                "PM25": 12
+              }
+            ]
+          }
         }
-    }
+        """;
+  }
 
-    private void createMockWebServer(String response) {
-        mockWebServer.enqueue(new MockResponse()
-            .setBody(response)
-            .addHeader("Content-Type", "application/json")
-            .setResponseCode(200));
-    }
 
-    private String createResponse() {
-        return """
-                {
-                  "ListAvgOfSeoulAirQualityService": {
-                    "list_total_count": 1,
-                    "RESULT": {
-                      "CODE": "INFO-000",
-                      "MESSAGE": "정상 처리되었습니다"
-                    },
-                    "row": [
-                      {
-                        "GRADE": "보통",
-                        "IDEX_MVL": "55",
-                        "POLLUTANT": "O3",
-                        "NITROGEN": 0.017,
-                        "OZONE": 0.036,
-                        "CARBON": 0.4,
-                        "SULFUROUS": 0.003,
-                        "PM10": 23,
-                        "PM25": 12
-                      }
-                    ]
-                  }
-                }
-            """;
-    }
+  private String createFailSeoulApiResponse() {
+    return """
+            <RESULT>
+            <script/>
+            <script/>
+            <CODE>ERROR-300</CODE>
+            <MESSAGE>
+            <![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>
+            </MESSAGE>
+            </RESULT>
+      """;
+  }
 
-    private String createFailResponse() {
-        return """
-                <RESULT>
-                <script/>
-                <script/>
-                <CODE>ERROR-300</CODE>
-                <MESSAGE>
-                <![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>
-                </MESSAGE>
-                </RESULT>
-            """;
+  private String createRegionApiResponse(){
+    return """
+      "response": {
+    "body": {
+      "totalCount": 22,
+          "items": [
+      {
+        "so2Grade": "1",
+          "coFlag": null,
+          "khaiValue": "46",
+          "so2Value": "0.002",
+          "coValue": "0.3",
+          "pm25Flag": null,
+          "pm10Flag": null,
+          "pm10Value": "4",
+          "o3Grade": "1",
+          "khaiGrade": "1",
+          "pm25Value": "2",
+          "no2Flag": null,
+          "no2Grade": "1",
+          "o3Flag": null,
+          "pm25Grade": "1",
+          "so2Flag": null,
+          "dataTime": "2025-05-09 24:00",
+          "coGrade": "1",
+          "no2Value": "0.016",
+          "pm10Grade": "1",
+          "o3Value": "0.028"
+      }
+              ],
+      "pageNo": 1,
+          "numOfRows": 1
+    },
+    "header": {
+      "resultMsg": "NORMAL_CODE",
+          "resultCode": "00"
     }
-}
\ No newline at end of file
+  }
+        """;
+  }
+
+  private String createFailRegionApiResponse(){
+    return  """
+        <OpenAPI_ServiceResponse>
+        <script/>
+        <script/>
+        <cmmMsgHeader>
+  <errMsg>SERVICE ERROR</errMsg>
+        <returnAuthMsg>SERVICE_KEY_IS_NOT_REGISTERED_ERROR</returnAuthMsg>
+        <returnReasonCode>30</returnReasonCode>
+        </cmmMsgHeader>
+        </OpenAPI_ServiceResponse>
+      """;
+  }
+
+  private SeoulAirQuality createSeoulAirQuality() {
+    SeoulAirQuality.Item item = SeoulAirQuality.Item.builder()
+        .grade("보통")
+        .mvl("55")
+        .pollutant("O3")
+        .nitrogen("0.017")
+        .ozone("0.036")
+        .carbon("0.4")
+        .sulfurous("0.003")
+        .pm10("23")
+        .pm25("12")
+        .build();
+
+    SeoulAirQuality.Result result = SeoulAirQuality.Result.builder()
+        .code("INFO-000")
+        .message("정상 처리되었습니다")
+        .build();
+
+    return SeoulAirQuality.builder()
+        .list_total_count(1)
+        .result(result)
+        .row(List.of(item))
+        .build();
+  }
+
+  private RegionAirQuality createRegionAirQuality(String pm25, String pm10) {
+    RegionAirQuality.Item item = RegionAirQuality.Item.builder()
+        .so2Grade("1")
+        .pm10Value(pm10)
+        .pm25Value(pm25)
+        .pm10Grade("2")
+        .build();
+
+    RegionAirQuality.Body body = RegionAirQuality.Body.builder()
+        .totalCount(1)
+        .items(List.of(item))
+        .pageNo(1)
+        .numOfRows(1)
+        .build();
+
+    RegionAirQuality.Header header = RegionAirQuality.Header.builder()
+        .resultMsg("NORMAL_CODE")
+        .resultCode("00")
+        .build();
+
+    RegionAirQuality.Response response = RegionAirQuality.Response.builder()
+        .body(body)
+        .header(header)
+        .build();
+
+    return RegionAirQuality.builder()
+        .response(response)
+        .build();
+  }
+
+  private ObservatoryResponse createObservatoryResponse(String stationName, String addr) {
+    return ObservatoryResponse.builder()
+        .stationCode("111123")
+        .stationName(stationName)
+        .addr(addr)
+        .build();
+  }
+
+  private AirQualityResponse createAirQualityResponse() {
+    return AirQualityResponse.builder()
+        .grade("보통")
+        .pm10("61")
+        .pm25("20")
+        .build();
+  }
+
+  private CachedAirQuality getCache(String value) {
+    return (CachedAirQuality) redisTemplate.opsForValue().get(key + value);
+  }
+
+  private void setCache(String value, boolean fresh) {
+    redisTemplate.opsForValue()
+        .set(key + value, new CachedAirQuality(createAirQualityResponse(), fresh));
+  }
+
+}
diff --git a/submodule b/submodule
index db4fbb0d..8401e930 160000
--- a/submodule
+++ b/submodule
@@ -1 +1 @@
-Subproject commit db4fbb0da566ef9bc0b317f932ae7d8d4851f6e0
+Subproject commit 8401e930c997d36baaef3de57daaaa745584361a

From bade1db7740fea50281440c047065adf496b7b68 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Tue, 13 May 2025 10:16:24 +0900
Subject: [PATCH 09/26] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/dto/AirQualityResponse.java               | 1 -
 .../signalbuddyfinal/domain/air_quality/dto/Observatory.java     | 1 -
 .../domain/air_quality/service/RegionAirQualityProvider.java     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
index ddaad60c..3985962c 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/AirQualityResponse.java
@@ -4,7 +4,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
index f7dd5bee..0924feaf 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/Observatory.java
@@ -5,7 +5,6 @@
 
 
 public class Observatory {
-    private Response response;
 
     @Data
     public static class Response {
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
index 21970e2b..d9139469 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityProvider.java
@@ -56,7 +56,6 @@ private RegionAirQuality parserAirQuality(String body){
             }
         }catch (Exception e) {
             try {
-                XmlMapper xmlMapper = new XmlMapper();
                 JsonNode rootNode = xmlMapper.readTree(body);
 
                 String code = rootNode.at("/cmmMsgHeader/returnReasonCode").asText();

From 939c3a096d21533dd547388396fc1405b8550ef7 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Tue, 13 May 2025 10:16:50 +0900
Subject: [PATCH 10/26] =?UTF-8?q?refactor:=20=EB=B3=80=EC=88=98=EB=AA=85?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/dto/SeoulAirQuality.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
index a04135f6..646ec35d 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/dto/SeoulAirQuality.java
@@ -5,14 +5,14 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import java.util.List;
 import lombok.Builder;
-import lombok.Data;
 import lombok.Getter;
 
 @Getter
 @Builder
 public class SeoulAirQuality {
 
-    private int list_total_count;
+    @JsonProperty("list_total_count")
+    private int totalCount;
 
     @JsonProperty("RESULT")
     private Result result;

From a8eddcf973b9c75d07a011b722f01fb119726125 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Tue, 13 May 2025 10:17:33 +0900
Subject: [PATCH 11/26] =?UTF-8?q?feat:=20=EC=B8=A1=EC=A0=95=EC=86=8C=20nul?=
 =?UTF-8?q?l=20=EB=B0=98=ED=99=98=EC=8B=9C=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=EB=B0=9C=EC=83=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AirQualityService.java            | 245 +++++++++---------
 .../service/ObservatoryProvider.java          |   8 +-
 2 files changed, 128 insertions(+), 125 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
index ef098993..6f156aaf 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
@@ -17,126 +17,129 @@
 @RequiredArgsConstructor
 public class AirQualityService {
 
-  private final SeoulAirQualityProvider airQualityProvider;
-  private final RegionAirQualityProvider regionAirQualityProvider;
-  private final ObservatoryProvider observatoryProvider;
-
-  private final RedisTemplate<Object, Object> redisTemplate;
-  private final CoordinateConverter coordinateConverter;
-
-  private static final String key = "air-quality:";
-  private static final Duration TTL = Duration.ofHours(2);
-
-  public AirQualityResponse getAirQuality(double lat, double lng) {
-    ObservatoryResponse observatoryResponse = getObservatory(lat, lng);
-    if (isSeoul(observatoryResponse)) {
-      return getCachedAirQuality("seoul").orElseGet(this::updateAriQuality);
-    }
-    return getCachedAirQuality(observatoryResponse.getStationCode()).orElseGet(
-        () -> updateRegionAriQuality(observatoryResponse));
-  }
-
-  public AirQualityResponse updateAriQuality() {
-    return requestAirQuality()
-        .map(this::successfulResponse)
-        .orElseGet(() -> failBackOrThrow("seoul"));
-  }
-
-  public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatoryResponse) {
-    return requestAllAirQuality(observatoryResponse.getStationName())
-        .map(newAirQuality -> successfulAllResponse(newAirQuality,
-            observatoryResponse.getStationCode()))
-        .orElseGet(() -> failBackOrThrow(observatoryResponse.getStationCode()));
-  }
-
-
-  private Optional<AirQualityResponse> getCachedAirQuality(String code) {
-    return Optional.ofNullable(getCache(key + code))
-        .filter(CachedAirQuality::isFresh)
-        .map(CachedAirQuality::getData);
-  }
-
-  private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
-    AirQualityResponse response = createResponse(newSeoulAirQuality);
-    saveToCache(response, true, "seoul");
-    return response;
-  }
-
-  private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality, String value) {
-    AirQualityResponse response = createAllResponse(newAirQuality);
-    saveToCache(response, true, value);
-    return response;
-  }
-
-  private AirQualityResponse failBackOrThrow(String value) {
-    String newKey = key + value;
-    return Optional.ofNullable(getCache(newKey))
-        .map(cache -> {
-          saveToCache(cache.getData(), false, value);
-          return cache.getData();
-        })
-        .orElseThrow(
+    private final SeoulAirQualityProvider airQualityProvider;
+    private final RegionAirQualityProvider regionAirQualityProvider;
+    private final ObservatoryProvider observatoryProvider;
+
+    private final RedisTemplate<Object, Object> redisTemplate;
+    private final CoordinateConverter coordinateConverter;
+
+    private static final String key = "air-quality:";
+    private static final Duration TTL = Duration.ofHours(2);
+
+    public AirQualityResponse getAirQuality(double lat, double lng) {
+        ObservatoryResponse observatoryResponse = getObservatory(lat, lng).orElseThrow(
             () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
-  }
-
-  private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String value) {
-    String newKey = key + value;
-    redisTemplate.opsForValue().set(newKey, new CachedAirQuality(airQualityResponse, fresh), TTL);
-  }
-
-  private CachedAirQuality getCache(String newKey) {
-    return (CachedAirQuality) redisTemplate.opsForValue().get(newKey);
-  }
-
-  private Optional<SeoulAirQuality> requestAirQuality() {
-    return airQualityProvider.getAirQuality();
-  }
-
-  private Optional<RegionAirQuality> requestAllAirQuality(String stationName) {
-    return regionAirQualityProvider.geAllAirQuality(stationName);
-  }
-
-  private AirQualityResponse createResponse(SeoulAirQuality seoulAirQuality) {
-    return AirQualityResponse.builder()
-        .grade(seoulAirQuality.getRow().get(0).getGrade())
-        .pm25(seoulAirQuality.getRow().get(0).getPm25())
-        .pm10(seoulAirQuality.getRow().get(0).getPm10())
-        .build();
-  }
-
-  private AirQualityResponse createAllResponse(RegionAirQuality regionAirQuality) {
-    return AirQualityResponse.builder()
-        .grade(convertGrade(regionAirQuality))
-        .pm25(regionAirQuality.getResponse().getBody().getItems().get(0).getPm25Value())
-        .pm10(regionAirQuality.getResponse().getBody().getItems().get(0).getPm10Value())
-        .build();
-  }
-
-  private ProjCoordinate convertCoordinate(double lng, double lat) {
-    return coordinateConverter.convert(lng, lat);
-  }
-
-  private ObservatoryResponse getObservatory(double lat, double lng) {
-    ProjCoordinate coordinate= convertCoordinate(lat, lng);
-    return observatoryProvider.getObservatory(coordinate.x, coordinate.y);
-  }
-
-  private boolean isSeoul(ObservatoryResponse observatoryResponse) {
-    return observatoryResponse.getAddr().startsWith("서울");
-  }
-
-  private String convertGrade(RegionAirQuality airQuality) {
-    switch (airQuality.getResponse().getBody().getItems().get(0).getPm10Grade()) {
-      case "1":
-        return "좋음";
-      case "2":
-        return "보통";
-      case "3":
-        return "나쁨";
-      case "4":
-        return "매우 나쁨";
-      default:
-        return "-";
-    }
-  }
+
+        if (isSeoul(observatoryResponse)) {
+            return getCachedAirQuality("seoul").orElseGet(this::updateAriQuality);
+        }
+        return getCachedAirQuality(observatoryResponse.getStationCode()).orElseGet(
+            () -> updateRegionAriQuality(observatoryResponse));
+    }
+
+    public AirQualityResponse updateAriQuality() {
+        return requestAirQuality()
+            .map(this::successfulResponse)
+            .orElseGet(() -> failBackOrThrow("seoul"));
+    }
+
+    public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatoryResponse) {
+        return requestAllAirQuality(observatoryResponse.getStationName())
+            .map(newAirQuality -> successfulAllResponse(newAirQuality,
+                observatoryResponse.getStationCode()))
+            .orElseGet(() -> failBackOrThrow(observatoryResponse.getStationCode()));
+    }
+
+
+    private Optional<AirQualityResponse> getCachedAirQuality(String code) {
+        return Optional.ofNullable(getCache(key + code))
+            .filter(CachedAirQuality::isFresh)
+            .map(CachedAirQuality::getData);
+    }
+
+    private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
+        AirQualityResponse response = createResponse(newSeoulAirQuality);
+        saveToCache(response, true, "seoul");
+        return response;
+    }
+
+    private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality, String value) {
+        AirQualityResponse response = createAllResponse(newAirQuality);
+        saveToCache(response, true, value);
+        return response;
+    }
+
+    private AirQualityResponse failBackOrThrow(String value) {
+        String newKey = key + value;
+        return Optional.ofNullable(getCache(newKey))
+            .map(cache -> {
+                saveToCache(cache.getData(), false, value);
+                return cache.getData();
+            })
+            .orElseThrow(
+                () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
+    }
+
+    private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String value) {
+        String newKey = key + value;
+        redisTemplate.opsForValue()
+            .set(newKey, new CachedAirQuality(airQualityResponse, fresh), TTL);
+    }
+
+    private CachedAirQuality getCache(String newKey) {
+        return (CachedAirQuality) redisTemplate.opsForValue().get(newKey);
+    }
+
+    private Optional<SeoulAirQuality> requestAirQuality() {
+        return airQualityProvider.getAirQuality();
+    }
+
+    private Optional<RegionAirQuality> requestAllAirQuality(String stationName) {
+        return regionAirQualityProvider.geAllAirQuality(stationName);
+    }
+
+    private AirQualityResponse createResponse(SeoulAirQuality seoulAirQuality) {
+        return AirQualityResponse.builder()
+            .grade(seoulAirQuality.getRow().get(0).getGrade())
+            .pm25(seoulAirQuality.getRow().get(0).getPm25())
+            .pm10(seoulAirQuality.getRow().get(0).getPm10())
+            .build();
+    }
+
+    private AirQualityResponse createAllResponse(RegionAirQuality regionAirQuality) {
+        return AirQualityResponse.builder()
+            .grade(convertGrade(regionAirQuality))
+            .pm25(regionAirQuality.getResponse().getBody().getItems().get(0).getPm25Value())
+            .pm10(regionAirQuality.getResponse().getBody().getItems().get(0).getPm10Value())
+            .build();
+    }
+
+    private ProjCoordinate convertCoordinate(double lat, double lng) {
+        return coordinateConverter.convert(lat, lng);
+    }
+
+    private Optional<ObservatoryResponse> getObservatory(double lat, double lng) {
+        ProjCoordinate coordinate = convertCoordinate(lat, lng);
+        return observatoryProvider.getObservatory(coordinate.x, coordinate.y);
+    }
+
+    private boolean isSeoul(ObservatoryResponse observatoryResponse) {
+        return observatoryResponse.getAddr().startsWith("서울");
+    }
+
+    private String convertGrade(RegionAirQuality airQuality) {
+        switch (airQuality.getResponse().getBody().getItems().get(0).getPm10Grade()) {
+            case "1":
+                return "좋음";
+            case "2":
+                return "보통";
+            case "3":
+                return "나쁨";
+            case "4":
+                return "매우 나쁨";
+            default:
+                return "-";
+        }
+    }
 }
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
index 8e2a03e7..47901d89 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/ObservatoryProvider.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import lombok.RequiredArgsConstructor;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
@@ -31,7 +32,7 @@ public class ObservatoryProvider {
       .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
 
-  public ObservatoryResponse getObservatory(double lat, double lng) {
+  public Optional<ObservatoryResponse> getObservatory(double lat, double lng) {
 
     String body = webClient.get()
         .uri(uriBuilder -> uriBuilder
@@ -44,9 +45,9 @@ public ObservatoryResponse getObservatory(double lat, double lng) {
 
     ObservatoryResponse response = parserObservatory(body);
     if (response != null) {
-      return response;
+      return Optional.of(response);
     }
-    return null;
+    return Optional.empty();
   }
 
   private ObservatoryResponse parserObservatory(String body) {
@@ -66,7 +67,6 @@ private ObservatoryResponse parserObservatory(String body) {
       }
     } catch (Exception e) {
       try {
-        XmlMapper xmlMapper = new XmlMapper();
         JsonNode rootNode = xmlMapper.readTree(body);
 
         String code = rootNode.at("/cmmMsgHeader/returnReasonCode").asText();

From 4f5b6fb5e80d6bf5ef3e76e90af34b24324fad81 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Tue, 13 May 2025 10:18:03 +0900
Subject: [PATCH 12/26] =?UTF-8?q?test:=20=EC=B8=A1=EC=84=B1=EC=86=8C=20nul?=
 =?UTF-8?q?l=20=EB=B0=98=ED=99=98=EC=8B=9C=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=EB=B0=9C=EC=83=9D=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AirQualityServiceTest.java        | 720 +++++++++---------
 1 file changed, 366 insertions(+), 354 deletions(-)

diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
index e998ce12..9cf587ad 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
@@ -47,362 +47,374 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 public class AirQualityServiceTest extends ServiceTest implements RedisTestContainer {
 
-  @Autowired
-  private AirQualityService airQualityService;
-
-  @Autowired
-  private RedisTemplate<Object, Object> redisTemplate;
-
-  @MockitoBean
-  private static ObservatoryProvider observatoryProvider;
-
-  @MockitoBean
-  private RegionAirQualityProvider regionAirQualityProvider;
-
-  @MockitoBean
-  private SeoulAirQualityProvider seoulAirQualityProvider;
-
-  private static MockWebServer mockWebServer;
-
-  private final String key = "air-quality:";
-
-  @BeforeAll
-  static void startMockServer() throws IOException {
-    mockWebServer = new MockWebServer();
-    mockWebServer.start();
-  }
-
-  @BeforeEach
-  void setup() {
-    flushRedis();
-  }
-
-  @AfterEach
-  void shutDown() throws IOException {
-    mockWebServer.shutdown();
-  }
-
-  @DynamicPropertySource
-  static void overrideProperties(DynamicPropertyRegistry registry) {
-    registry.add("air-quality.base-url", () -> "http://localhost:" + mockWebServer.getPort());
-  }
-
-  @DisplayName("서울 첫 요청 성공 시 응답 반환 및 캐싱 테스트")
-  @Test
-  void successRequestTest() {
-    createMockWebServer(createSeoulApiResponse());
-
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
-    when(seoulAirQualityProvider.getAirQuality())
-        .thenReturn(Optional.of(createSeoulAirQuality()));
-
-    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
-    CachedAirQuality cache = getCache("seoul");
-
-    assertThat(response.getGrade()).isEqualTo("보통");
-    assertThat(cache).isNotNull();
-    assertThat(cache.getData().getGrade()).isEqualTo("보통");
-    assertThat(cache.isFresh()).isTrue();
-  }
-
-  @DisplayName("서울 두 번째 요청 시 캐싱된 데이터 반환")
-  @Test
-  void successSecondRequestTest() {
-    int count = mockWebServer.getRequestCount();
-    createMockWebServer(createSeoulApiResponse());
-    setCache("seoul", true);
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
-
-    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
-
-    assertThat(response).isNotNull();
-    assertThat(response.getGrade()).isEqualTo("보통");
-    assertThat(response.getPm10()).isEqualTo("61");
-    assertThat(response.getPm25()).isEqualTo("20");
-    assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
-  }
-
-  @DisplayName("서울 failBack 실패 테스트")
-  @Test
-  void failBackRequestTest() {
-    createMockWebServer(createFailSeoulApiResponse());
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
-
-    assertThrows(BusinessException.class,
-        () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
-  }
-
-  @DisplayName("서울 failBack 성공 테스트")
-  @Test
-  void failBackSuccessTest() {
-    createMockWebServer(createFailSeoulApiResponse());
-    setCache("seoul", true);
-    CachedAirQuality before = getCache("seoul");
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
-
-    airQualityService.updateAriQuality();
-    CachedAirQuality after = getCache("seoul");
-
-    assertThat(after.isFresh()).isFalse();
-    assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
-
-  }
-
-  @Test
-  @DisplayName("서울 외 지역 응답 성공 테스트")
-  void successRegionRequestTest() {
-    createMockWebServer(createFailRegionApiResponse());
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
-    when(regionAirQualityProvider.geAllAirQuality(anyString()))
-        .thenReturn(Optional.of(createRegionAirQuality("13", "23")));
-
-    AirQualityResponse response = airQualityService.getAirQuality(127.0421, 37.5716);
-
-    assertThat(response).isNotNull();
-    assertThat(response.getGrade()).isEqualTo("보통");
-    assertThat(response.getPm10()).isEqualTo("23");
-    assertThat(response.getPm25()).isEqualTo("13");
-  }
-
-  @DisplayName("서울외 지역 두 번째 요청 시 캐싱된 데이터 반환")
-  @Test
-  void successSecondRegionRequestTest() {
-    int count = mockWebServer.getRequestCount();
-    createMockWebServer(createRegionApiResponse());
-    setCache("111123", true);
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
-
-    AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
-
-    assertThat(response).isNotNull();
-    assertThat(response.getGrade()).isEqualTo("보통");
-    assertThat(response.getPm10()).isEqualTo("61");
-    assertThat(response.getPm25()).isEqualTo("20");
-    assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
-  }
-
-  @DisplayName("서울외 지역 failBack 실패 테스트")
-  @Test
-  void RegionFailBackRequestTest() {
-    createMockWebServer(createFailRegionApiResponse());
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
-
-    assertThrows(BusinessException.class,
-        () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
-  }
-
-  @DisplayName("서울외 지역 failBack 성공 테스트")
-  @Test
-  void RegionFailBackSuccessTest() {
-    createMockWebServer(createRegionApiResponse());
-    setCache("111123", true);
-    CachedAirQuality before = getCache("111123");
-    when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
-        .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
-
-    airQualityService.updateRegionAriQuality(createObservatoryResponse("설성면", "경기 이천시 설성면"));
-    CachedAirQuality after = getCache("111123");
-
-    assertThat(after.isFresh()).isFalse();
-    assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
-
-  }
-
-  private void flushRedis() {
-    RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
-    if (factory != null) {
-      factory.getConnection().serverCommands().flushAll();
+    @Autowired
+    private AirQualityService airQualityService;
+
+    @Autowired
+    private RedisTemplate<Object, Object> redisTemplate;
+
+    @MockitoBean
+    private static ObservatoryProvider observatoryProvider;
+
+    @MockitoBean
+    private RegionAirQualityProvider regionAirQualityProvider;
+
+    @MockitoBean
+    private SeoulAirQualityProvider seoulAirQualityProvider;
+
+    private static MockWebServer mockWebServer;
+
+    private final String key = "air-quality:";
+
+    @BeforeAll
+    static void startMockServer() throws IOException {
+        mockWebServer = new MockWebServer();
+        mockWebServer.start();
     }
-  }
-
-  private void createMockWebServer(String response) {
-    mockWebServer.enqueue(new MockResponse()
-        .setBody(response)
-        .addHeader("Content-Type", "application/json")
-        .setResponseCode(200));
-  }
-
-  private String createSeoulApiResponse() {
-    return """
-        {
-          "ListAvgOfSeoulAirQualityService": {
-            "list_total_count": 1,
-            "RESULT": {
-              "CODE": "INFO-000",
-              "MESSAGE": "정상 처리되었습니다"
-            },
-            "row": [
-              {
-                "GRADE": "보통",
-                "IDEX_MVL": "55",
-                "POLLUTANT": "O3",
-                "NITROGEN": 0.017,
-                "OZONE": 0.036,
-                "CARBON": 0.4,
-                "SULFUROUS": 0.003,
-                "PM10": 23,
-                "PM25": 12
-              }
-            ]
-          }
+
+    @BeforeEach
+    void setup() {
+        flushRedis();
+    }
+
+    @AfterEach
+    void shutDown() throws IOException {
+        mockWebServer.shutdown();
+    }
+
+    @DynamicPropertySource
+    static void overrideProperties(DynamicPropertyRegistry registry) {
+        registry.add("air-quality.base-url", () -> "http://localhost:" + mockWebServer.getPort());
+    }
+
+    @DisplayName("서울 첫 요청 성공 시 응답 반환 및 캐싱 테스트")
+    @Test
+    void successRequestTest() {
+        createMockWebServer(createSeoulApiResponse());
+
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+        when(seoulAirQualityProvider.getAirQuality())
+            .thenReturn(Optional.of(createSeoulAirQuality()));
+
+        AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+        CachedAirQuality cache = getCache("seoul");
+
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(cache).isNotNull();
+        assertThat(cache.getData().getGrade()).isEqualTo("보통");
+        assertThat(cache.isFresh()).isTrue();
+    }
+
+    @DisplayName("서울 두 번째 요청 시 캐싱된 데이터 반환")
+    @Test
+    void successSecondRequestTest() {
+        int count = mockWebServer.getRequestCount();
+        createMockWebServer(createSeoulApiResponse());
+        setCache("seoul", true);
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+        AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+
+        assertThat(response).isNotNull();
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(response.getPm10()).isEqualTo("61");
+        assertThat(response.getPm25()).isEqualTo("20");
+        assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
+    }
+
+    @DisplayName("서울 failBack 실패 테스트")
+    @Test
+    void failBackRequestTest() {
+        createMockWebServer(createFailSeoulApiResponse());
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+        assertThrows(BusinessException.class,
+            () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
+    }
+
+    @DisplayName("서울 failBack 성공 테스트")
+    @Test
+    void failBackSuccessTest() {
+        createMockWebServer(createFailSeoulApiResponse());
+        setCache("seoul", true);
+        CachedAirQuality before = getCache("seoul");
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
+
+        airQualityService.updateAriQuality();
+        CachedAirQuality after = getCache("seoul");
+
+        assertThat(after.isFresh()).isFalse();
+        assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
+
+    }
+
+    @Test
+    @DisplayName("서울 외 지역 응답 성공 테스트")
+    void successRegionRequestTest() {
+        createMockWebServer(createFailRegionApiResponse());
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+        when(regionAirQualityProvider.geAllAirQuality(anyString()))
+            .thenReturn(Optional.of(createRegionAirQuality("13", "23")));
+
+        AirQualityResponse response = airQualityService.getAirQuality(127.0421, 37.5716);
+
+        assertThat(response).isNotNull();
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(response.getPm10()).isEqualTo("23");
+        assertThat(response.getPm25()).isEqualTo("13");
+    }
+
+    @DisplayName("서울외 지역 두 번째 요청 시 캐싱된 데이터 반환")
+    @Test
+    void successSecondRegionRequestTest() {
+        int count = mockWebServer.getRequestCount();
+        createMockWebServer(createRegionApiResponse());
+        setCache("111123", true);
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+
+        AirQualityResponse response = airQualityService.getAirQuality(127.4170933, 36.35218384);
+
+        assertThat(response).isNotNull();
+        assertThat(response.getGrade()).isEqualTo("보통");
+        assertThat(response.getPm10()).isEqualTo("61");
+        assertThat(response.getPm25()).isEqualTo("20");
+        assertThat(mockWebServer.getRequestCount()).isEqualTo(count);
+    }
+
+    @DisplayName("서울외 지역 failBack 실패 테스트")
+    @Test
+    void RegionFailBackRequestTest() {
+        createMockWebServer(createFailRegionApiResponse());
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+
+        assertThrows(BusinessException.class,
+            () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
+    }
+
+    @DisplayName("서울외 지역 failBack 성공 테스트")
+    @Test
+    void RegionFailBackSuccessTest() {
+        createMockWebServer(createRegionApiResponse());
+        setCache("111123", true);
+        CachedAirQuality before = getCache("111123");
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
+
+        airQualityService.updateRegionAriQuality(
+            createObservatoryResponse("설성면", "경기 이천시 설성면").get());
+        CachedAirQuality after = getCache("111123");
+
+        assertThat(after.isFresh()).isFalse();
+        assertThat(after.getData()).usingRecursiveComparison().isEqualTo(before.getData());
+
+    }
+
+    @DisplayName("Observatory null 입력시 예외 발생 테스트")
+    @Test
+    void observatoryNullTest() {
+        when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
+            .thenReturn(Optional.empty());
+
+        assertThrows(BusinessException.class,
+            () -> airQualityService.getAirQuality(127.4170933, 36.35218384));
+    }
+
+    private void flushRedis() {
+        RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
+        if (factory != null) {
+            factory.getConnection().serverCommands().flushAll();
         }
-        """;
-  }
-
-
-  private String createFailSeoulApiResponse() {
-    return """
-            <RESULT>
-            <script/>
-            <script/>
-            <CODE>ERROR-300</CODE>
-            <MESSAGE>
-            <![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>
-            </MESSAGE>
-            </RESULT>
-      """;
-  }
-
-  private String createRegionApiResponse(){
-    return """
-      "response": {
-    "body": {
-      "totalCount": 22,
-          "items": [
-      {
-        "so2Grade": "1",
-          "coFlag": null,
-          "khaiValue": "46",
-          "so2Value": "0.002",
-          "coValue": "0.3",
-          "pm25Flag": null,
-          "pm10Flag": null,
-          "pm10Value": "4",
-          "o3Grade": "1",
-          "khaiGrade": "1",
-          "pm25Value": "2",
-          "no2Flag": null,
-          "no2Grade": "1",
-          "o3Flag": null,
-          "pm25Grade": "1",
-          "so2Flag": null,
-          "dataTime": "2025-05-09 24:00",
-          "coGrade": "1",
-          "no2Value": "0.016",
-          "pm10Grade": "1",
-          "o3Value": "0.028"
-      }
-              ],
-      "pageNo": 1,
-          "numOfRows": 1
-    },
-    "header": {
-      "resultMsg": "NORMAL_CODE",
-          "resultCode": "00"
     }
-  }
-        """;
-  }
-
-  private String createFailRegionApiResponse(){
-    return  """
-        <OpenAPI_ServiceResponse>
-        <script/>
-        <script/>
-        <cmmMsgHeader>
-  <errMsg>SERVICE ERROR</errMsg>
-        <returnAuthMsg>SERVICE_KEY_IS_NOT_REGISTERED_ERROR</returnAuthMsg>
-        <returnReasonCode>30</returnReasonCode>
-        </cmmMsgHeader>
-        </OpenAPI_ServiceResponse>
-      """;
-  }
-
-  private SeoulAirQuality createSeoulAirQuality() {
-    SeoulAirQuality.Item item = SeoulAirQuality.Item.builder()
-        .grade("보통")
-        .mvl("55")
-        .pollutant("O3")
-        .nitrogen("0.017")
-        .ozone("0.036")
-        .carbon("0.4")
-        .sulfurous("0.003")
-        .pm10("23")
-        .pm25("12")
-        .build();
-
-    SeoulAirQuality.Result result = SeoulAirQuality.Result.builder()
-        .code("INFO-000")
-        .message("정상 처리되었습니다")
-        .build();
-
-    return SeoulAirQuality.builder()
-        .list_total_count(1)
-        .result(result)
-        .row(List.of(item))
-        .build();
-  }
-
-  private RegionAirQuality createRegionAirQuality(String pm25, String pm10) {
-    RegionAirQuality.Item item = RegionAirQuality.Item.builder()
-        .so2Grade("1")
-        .pm10Value(pm10)
-        .pm25Value(pm25)
-        .pm10Grade("2")
-        .build();
-
-    RegionAirQuality.Body body = RegionAirQuality.Body.builder()
-        .totalCount(1)
-        .items(List.of(item))
-        .pageNo(1)
-        .numOfRows(1)
-        .build();
-
-    RegionAirQuality.Header header = RegionAirQuality.Header.builder()
-        .resultMsg("NORMAL_CODE")
-        .resultCode("00")
-        .build();
-
-    RegionAirQuality.Response response = RegionAirQuality.Response.builder()
-        .body(body)
-        .header(header)
-        .build();
-
-    return RegionAirQuality.builder()
-        .response(response)
-        .build();
-  }
-
-  private ObservatoryResponse createObservatoryResponse(String stationName, String addr) {
-    return ObservatoryResponse.builder()
-        .stationCode("111123")
-        .stationName(stationName)
-        .addr(addr)
-        .build();
-  }
-
-  private AirQualityResponse createAirQualityResponse() {
-    return AirQualityResponse.builder()
-        .grade("보통")
-        .pm10("61")
-        .pm25("20")
-        .build();
-  }
-
-  private CachedAirQuality getCache(String value) {
-    return (CachedAirQuality) redisTemplate.opsForValue().get(key + value);
-  }
-
-  private void setCache(String value, boolean fresh) {
-    redisTemplate.opsForValue()
-        .set(key + value, new CachedAirQuality(createAirQualityResponse(), fresh));
-  }
+
+    private void createMockWebServer(String response) {
+        mockWebServer.enqueue(new MockResponse()
+            .setBody(response)
+            .addHeader("Content-Type", "application/json")
+            .setResponseCode(200));
+    }
+
+    private String createSeoulApiResponse() {
+        return """
+            {
+              "ListAvgOfSeoulAirQualityService": {
+                "list_total_count": 1,
+                "RESULT": {
+                  "CODE": "INFO-000",
+                  "MESSAGE": "정상 처리되었습니다"
+                },
+                "row": [
+                  {
+                    "GRADE": "보통",
+                    "IDEX_MVL": "55",
+                    "POLLUTANT": "O3",
+                    "NITROGEN": 0.017,
+                    "OZONE": 0.036,
+                    "CARBON": 0.4,
+                    "SULFUROUS": 0.003,
+                    "PM10": 23,
+                    "PM25": 12
+                  }
+                ]
+              }
+            }
+            """;
+    }
+
+
+    private String createFailSeoulApiResponse() {
+        return """
+                  <RESULT>
+                  <script/>
+                  <script/>
+                  <CODE>ERROR-300</CODE>
+                  <MESSAGE>
+                  <![CDATA[ 필수 값이 누락되어 있습니다. 요청인자를 참고 하십시오. ]]>
+                  </MESSAGE>
+                  </RESULT>
+            """;
+    }
+
+    private String createRegionApiResponse() {
+        return """
+                "response": {
+              "body": {
+                "totalCount": 22,
+                    "items": [
+                {
+                  "so2Grade": "1",
+                    "coFlag": null,
+                    "khaiValue": "46",
+                    "so2Value": "0.002",
+                    "coValue": "0.3",
+                    "pm25Flag": null,
+                    "pm10Flag": null,
+                    "pm10Value": "4",
+                    "o3Grade": "1",
+                    "khaiGrade": "1",
+                    "pm25Value": "2",
+                    "no2Flag": null,
+                    "no2Grade": "1",
+                    "o3Flag": null,
+                    "pm25Grade": "1",
+                    "so2Flag": null,
+                    "dataTime": "2025-05-09 24:00",
+                    "coGrade": "1",
+                    "no2Value": "0.016",
+                    "pm10Grade": "1",
+                    "o3Value": "0.028"
+                }
+                        ],
+                "pageNo": 1,
+                    "numOfRows": 1
+              },
+              "header": {
+                "resultMsg": "NORMAL_CODE",
+                    "resultCode": "00"
+              }
+            }
+            """;
+    }
+
+    private String createFailRegionApiResponse() {
+        return """
+                  <OpenAPI_ServiceResponse>
+                  <script/>
+                  <script/>
+                  <cmmMsgHeader>
+            <errMsg>SERVICE ERROR</errMsg>
+                  <returnAuthMsg>SERVICE_KEY_IS_NOT_REGISTERED_ERROR</returnAuthMsg>
+                  <returnReasonCode>30</returnReasonCode>
+                  </cmmMsgHeader>
+                  </OpenAPI_ServiceResponse>
+            """;
+    }
+
+    private SeoulAirQuality createSeoulAirQuality() {
+        SeoulAirQuality.Item item = SeoulAirQuality.Item.builder()
+            .grade("보통")
+            .mvl("55")
+            .pollutant("O3")
+            .nitrogen("0.017")
+            .ozone("0.036")
+            .carbon("0.4")
+            .sulfurous("0.003")
+            .pm10("23")
+            .pm25("12")
+            .build();
+
+        SeoulAirQuality.Result result = SeoulAirQuality.Result.builder()
+            .code("INFO-000")
+            .message("정상 처리되었습니다")
+            .build();
+
+        return SeoulAirQuality.builder()
+            .totalCount(1)
+            .result(result)
+            .row(List.of(item))
+            .build();
+    }
+
+    private RegionAirQuality createRegionAirQuality(String pm25, String pm10) {
+        RegionAirQuality.Item item = RegionAirQuality.Item.builder()
+            .so2Grade("1")
+            .pm10Value(pm10)
+            .pm25Value(pm25)
+            .pm10Grade("2")
+            .build();
+
+        RegionAirQuality.Body body = RegionAirQuality.Body.builder()
+            .totalCount(1)
+            .items(List.of(item))
+            .pageNo(1)
+            .numOfRows(1)
+            .build();
+
+        RegionAirQuality.Header header = RegionAirQuality.Header.builder()
+            .resultMsg("NORMAL_CODE")
+            .resultCode("00")
+            .build();
+
+        RegionAirQuality.Response response = RegionAirQuality.Response.builder()
+            .body(body)
+            .header(header)
+            .build();
+
+        return RegionAirQuality.builder()
+            .response(response)
+            .build();
+    }
+
+    private Optional<ObservatoryResponse> createObservatoryResponse(String stationName,
+        String addr) {
+        return Optional.of(ObservatoryResponse.builder()
+            .stationCode("111123")
+            .stationName(stationName)
+            .addr(addr)
+            .build());
+    }
+
+    private AirQualityResponse createAirQualityResponse() {
+        return AirQualityResponse.builder()
+            .grade("보통")
+            .pm10("61")
+            .pm25("20")
+            .build();
+    }
+
+    private CachedAirQuality getCache(String value) {
+        return (CachedAirQuality) redisTemplate.opsForValue().get(key + value);
+    }
+
+    private void setCache(String value, boolean fresh) {
+        redisTemplate.opsForValue()
+            .set(key + value, new CachedAirQuality(createAirQualityResponse(), fresh));
+    }
 
 }

From 58c7182c5be7dbba6aa49b9476911050034dfc7a Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 10:57:43 +0900
Subject: [PATCH 13/26] =?UTF-8?q?refactor:=20key+=EC=A7=80=EC=97=AD?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=ED=95=A8=EC=88=98=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/service/AirQualityService.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
index 6f156aaf..1a1a195e 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
@@ -53,7 +53,7 @@ public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatory
 
 
     private Optional<AirQualityResponse> getCachedAirQuality(String code) {
-        return Optional.ofNullable(getCache(key + code))
+        return Optional.ofNullable(getCache(convertKey(code)))
             .filter(CachedAirQuality::isFresh)
             .map(CachedAirQuality::getData);
     }
@@ -71,7 +71,7 @@ private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality,
     }
 
     private AirQualityResponse failBackOrThrow(String value) {
-        String newKey = key + value;
+        String newKey = convertKey(value);
         return Optional.ofNullable(getCache(newKey))
             .map(cache -> {
                 saveToCache(cache.getData(), false, value);
@@ -82,7 +82,7 @@ private AirQualityResponse failBackOrThrow(String value) {
     }
 
     private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String value) {
-        String newKey = key + value;
+        String newKey = convertKey(value);
         redisTemplate.opsForValue()
             .set(newKey, new CachedAirQuality(airQualityResponse, fresh), TTL);
     }
@@ -142,4 +142,8 @@ private String convertGrade(RegionAirQuality airQuality) {
                 return "-";
         }
     }
+
+    private String convertKey(String value){
+        return key + value;
+    }
 }

From 143efd419e7a2ef4d9f568b3f63d0665a91517dc Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 11:17:07 +0900
Subject: [PATCH 14/26] =?UTF-8?q?refactor:=20key=EA=B0=92=20=EB=B3=80?=
 =?UTF-8?q?=ED=99=98=20=EC=9C=84=EC=9E=84=20=EC=88=A8=EA=B8=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AirQualityService.java            | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
index 1a1a195e..1331ee16 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
@@ -53,7 +53,7 @@ public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatory
 
 
     private Optional<AirQualityResponse> getCachedAirQuality(String code) {
-        return Optional.ofNullable(getCache(convertKey(code)))
+        return Optional.ofNullable(getCache(code))
             .filter(CachedAirQuality::isFresh)
             .map(CachedAirQuality::getData);
     }
@@ -70,25 +70,27 @@ private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality,
         return response;
     }
 
-    private AirQualityResponse failBackOrThrow(String value) {
-        String newKey = convertKey(value);
-        return Optional.ofNullable(getCache(newKey))
+    private AirQualityResponse failBackOrThrow(String code) {
+        return Optional.ofNullable(getCache(code))
             .map(cache -> {
-                saveToCache(cache.getData(), false, value);
+                saveToCache(cache.getData(), false, code);
                 return cache.getData();
             })
             .orElseThrow(
                 () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
     }
 
-    private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String value) {
-        String newKey = convertKey(value);
+    private String convertKey(String code) {
+        return key + code;
+    }
+
+    private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String code) {
         redisTemplate.opsForValue()
-            .set(newKey, new CachedAirQuality(airQualityResponse, fresh), TTL);
+            .set(convertKey(code), new CachedAirQuality(airQualityResponse, fresh), TTL);
     }
 
-    private CachedAirQuality getCache(String newKey) {
-        return (CachedAirQuality) redisTemplate.opsForValue().get(newKey);
+    private CachedAirQuality getCache(String code) {
+        return (CachedAirQuality) redisTemplate.opsForValue().get(convertKey(code));
     }
 
     private Optional<SeoulAirQuality> requestAirQuality() {
@@ -142,8 +144,4 @@ private String convertGrade(RegionAirQuality airQuality) {
                 return "-";
         }
     }
-
-    private String convertKey(String value){
-        return key + value;
-    }
 }

From 79d7c740f31d4f8409a2ba11c7d8cb756e3fe05b Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:50:52 +0900
Subject: [PATCH 15/26] =?UTF-8?q?refactor:=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20=EC=BA=90=EC=8B=B1=20Class=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/service/AirQualityCache.java  | 13 +++++
 .../service/AirQualityCacheService.java       | 53 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
new file mode 100644
index 00000000..d205402c
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
@@ -0,0 +1,13 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import java.util.Optional;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+
+public interface AirQualityCache {
+
+    CachedAirQuality get(String regionCode);
+    void save(String key, AirQualityResponse response, boolean fresh);
+    AirQualityResponse failBackOrThrow(String key);
+
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
new file mode 100644
index 00000000..df2cf27c
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
@@ -0,0 +1,53 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import java.time.Duration;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
+import org.programmers.signalbuddyfinal.global.exception.BusinessException;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Component
+public class AirQualityCacheService implements AirQualityCache {
+
+    private final RedisTemplate<Object, Object> redisTemplate;
+
+    private static final String key = "air-quality:";
+    private static final Duration TTL = Duration.ofHours(2);
+
+    @Override
+    public CachedAirQuality get(String code) {
+        return (CachedAirQuality) redisTemplate.opsForValue().get(convertKey(code));
+    }
+
+    @Override
+    public void save(String regionCode, AirQualityResponse airQualityResponse, boolean fresh) {
+        redisTemplate.opsForValue()
+            .set(convertKey(regionCode), new CachedAirQuality(airQualityResponse, fresh), TTL);
+    }
+
+    @Override
+    public AirQualityResponse failBackOrThrow(String regionCode) {
+        return Optional.ofNullable(get(regionCode))
+            .map(cache -> {
+                save(regionCode, getCachedDate(cache), false);
+                return cache.getData();
+            })
+            .orElseThrow(
+                () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
+    }
+
+    private String convertKey(String code) {
+        return key + code;
+    }
+
+    private AirQualityResponse getCachedDate(CachedAirQuality cache) {
+        return cache.getData();
+    }
+}

From d70d7e98da2fb2647697de3e0fcba927256a2155 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:52:10 +0900
Subject: [PATCH 16/26] =?UTF-8?q?refactor:=20=EC=9C=84=EC=B9=98=EB=B3=84?=
 =?UTF-8?q?=20=EB=AF=B8=EC=84=B8=EB=A8=BC=EC=A7=80=20=EA=B5=AC=EB=B6=84?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B6=84=EB=A6=AC=EB=A5=BC=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=9C=20interface=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/service/AirQualityStrategy.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityStrategy.java

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityStrategy.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityStrategy.java
new file mode 100644
index 00000000..81f02ef9
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityStrategy.java
@@ -0,0 +1,15 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import java.util.Optional;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
+
+public interface AirQualityStrategy {
+
+    boolean supports(String address);
+
+    Optional<AirQualityResponse> getCache(String code);
+
+    AirQualityResponse update(ObservatoryResponse obs);
+
+}

From 044f3af3b325d9b1ae9a6a5cf1007e6e50b33221 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:52:38 +0900
Subject: [PATCH 17/26] =?UTF-8?q?refactor:=20=EC=84=9C=EC=9A=B8=20?=
 =?UTF-8?q?=EC=99=B8=20=EC=A7=80=EC=97=AD=20=EB=AF=B8=EC=84=B8=EB=A8=BC?=
 =?UTF-8?q?=EC=A7=80=20Class=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/RegionAirQualityService.java      | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java
new file mode 100644
index 00000000..92f4d280
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java
@@ -0,0 +1,73 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.RegionAirQuality;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Qualifier("regionStrategy")
+public class RegionAirQualityService implements AirQualityStrategy {
+
+    private final AirQualityCacheService airQualityCacheService;
+    private final RegionAirQualityProvider regionAirQualityProvider;
+
+    @Override
+    public boolean supports(String addr) {
+        return !addr.startsWith("서울");
+    }
+
+    @Override
+    public Optional<AirQualityResponse> getCache(String code) {
+        return Optional.ofNullable(airQualityCacheService.get(code))
+            .filter(CachedAirQuality::isFresh)
+            .map(CachedAirQuality::getData);
+    }
+
+    @Override
+    public AirQualityResponse update(ObservatoryResponse observatoryResponse) {
+        return requestAllAirQuality(observatoryResponse.getStationName())
+            .map(newAirQuality -> successfulAllResponse(newAirQuality,
+                observatoryResponse.getStationCode()))
+            .orElseGet(
+                () -> airQualityCacheService.failBackOrThrow(observatoryResponse.getStationCode()));
+    }
+
+    private Optional<RegionAirQuality> requestAllAirQuality(String stationName) {
+        return regionAirQualityProvider.geAllAirQuality(stationName);
+    }
+
+    private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality, String value) {
+        AirQualityResponse response = createAllResponse(newAirQuality);
+        airQualityCacheService.save(value, response, true);
+        return response;
+    }
+
+    private AirQualityResponse createAllResponse(RegionAirQuality regionAirQuality) {
+        return AirQualityResponse.builder()
+            .grade(convertGrade(regionAirQuality))
+            .pm25(regionAirQuality.getResponse().getBody().getItems().get(0).getPm25Value())
+            .pm10(regionAirQuality.getResponse().getBody().getItems().get(0).getPm10Value())
+            .build();
+    }
+
+    private String convertGrade(RegionAirQuality airQuality) {
+        switch (airQuality.getResponse().getBody().getItems().get(0).getPm10Grade()) {
+            case "1":
+                return "좋음";
+            case "2":
+                return "보통";
+            case "3":
+                return "나쁨";
+            case "4":
+                return "매우 나쁨";
+            default:
+                return "-";
+        }
+    }
+}

From 7cdb4b8a37882511148e0870165f3cab27933bb5 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:53:02 +0900
Subject: [PATCH 18/26] =?UTF-8?q?refactor:=20=EC=84=9C=EC=9A=B8=20?=
 =?UTF-8?q?=EB=AF=B8=EC=84=B8=EB=A8=BC=EC=A7=80=20Class=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SeoulAirQualityService.java       | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
new file mode 100644
index 00000000..6efdbb3c
--- /dev/null
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
@@ -0,0 +1,61 @@
+package org.programmers.signalbuddyfinal.domain.air_quality.service;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.SeoulAirQuality;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Qualifier("seoulStrategy")
+public class SeoulAirQualityService implements AirQualityStrategy {
+
+    private final AirQualityCacheService airQualityCacheService;
+    private final SeoulAirQualityProvider airQualityProvider;
+    private final String SEOUL_CODE = "seoul";
+
+    @Override
+    public boolean supports(String addr) {
+        return addr.startsWith("서울");
+    }
+
+    @Override
+    public Optional<AirQualityResponse> getCache(String code) {
+        return Optional.ofNullable(airQualityCacheService.get(SEOUL_CODE))
+            .filter(CachedAirQuality::isFresh)
+            .map(CachedAirQuality::getData);
+    }
+
+    @Override
+    public AirQualityResponse update(ObservatoryResponse obs) {
+        return update();
+    }
+
+    public AirQualityResponse update() {
+        return requestAirQuality()
+            .map(this::successfulResponse)
+            .orElseGet(() -> airQualityCacheService.failBackOrThrow(SEOUL_CODE));
+    }
+
+    private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
+        AirQualityResponse response = createResponse(newSeoulAirQuality);
+        airQualityCacheService.save(SEOUL_CODE, response, true);
+        return response;
+    }
+
+    private Optional<SeoulAirQuality> requestAirQuality() {
+        return airQualityProvider.getAirQuality();
+    }
+
+    private AirQualityResponse createResponse(SeoulAirQuality seoulAirQuality) {
+        return AirQualityResponse.builder()
+            .grade(seoulAirQuality.getRow().get(0).getGrade())
+            .pm25(seoulAirQuality.getRow().get(0).getPm25())
+            .pm10(seoulAirQuality.getRow().get(0).getPm10())
+            .build();
+    }
+}

From c1cf9807d6ce6e3400f42fffee022376419bc1a9 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:53:40 +0900
Subject: [PATCH 19/26] =?UTF-8?q?refactor:=20=EB=B6=84=EB=A6=AC=ED=95=9C?=
 =?UTF-8?q?=20Class=EB=A5=BC=20=ED=98=B8=EC=B6=9C=20Service=EC=97=90=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AirQualityService.java            | 115 ++----------------
 1 file changed, 10 insertions(+), 105 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
index 1331ee16..9fb1b663 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityService.java
@@ -1,6 +1,6 @@
 package org.programmers.signalbuddyfinal.domain.air_quality.service;
 
-import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 
 import lombok.RequiredArgsConstructor;
@@ -9,7 +9,6 @@
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.*;
 import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
 import org.programmers.signalbuddyfinal.global.exception.BusinessException;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -17,104 +16,28 @@
 @RequiredArgsConstructor
 public class AirQualityService {
 
-    private final SeoulAirQualityProvider airQualityProvider;
-    private final RegionAirQualityProvider regionAirQualityProvider;
     private final ObservatoryProvider observatoryProvider;
-
-    private final RedisTemplate<Object, Object> redisTemplate;
     private final CoordinateConverter coordinateConverter;
-
-    private static final String key = "air-quality:";
-    private static final Duration TTL = Duration.ofHours(2);
+    private final List<AirQualityStrategy> strategies;
 
     public AirQualityResponse getAirQuality(double lat, double lng) {
         ObservatoryResponse observatoryResponse = getObservatory(lat, lng).orElseThrow(
             () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
 
-        if (isSeoul(observatoryResponse)) {
-            return getCachedAirQuality("seoul").orElseGet(this::updateAriQuality);
-        }
-        return getCachedAirQuality(observatoryResponse.getStationCode()).orElseGet(
-            () -> updateRegionAriQuality(observatoryResponse));
-    }
-
-    public AirQualityResponse updateAriQuality() {
-        return requestAirQuality()
-            .map(this::successfulResponse)
-            .orElseGet(() -> failBackOrThrow("seoul"));
-    }
-
-    public AirQualityResponse updateRegionAriQuality(ObservatoryResponse observatoryResponse) {
-        return requestAllAirQuality(observatoryResponse.getStationName())
-            .map(newAirQuality -> successfulAllResponse(newAirQuality,
-                observatoryResponse.getStationCode()))
-            .orElseGet(() -> failBackOrThrow(observatoryResponse.getStationCode()));
-    }
-
-
-    private Optional<AirQualityResponse> getCachedAirQuality(String code) {
-        return Optional.ofNullable(getCache(code))
-            .filter(CachedAirQuality::isFresh)
-            .map(CachedAirQuality::getData);
-    }
-
-    private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
-        AirQualityResponse response = createResponse(newSeoulAirQuality);
-        saveToCache(response, true, "seoul");
-        return response;
-    }
-
-    private AirQualityResponse successfulAllResponse(RegionAirQuality newAirQuality, String value) {
-        AirQualityResponse response = createAllResponse(newAirQuality);
-        saveToCache(response, true, value);
-        return response;
-    }
-
-    private AirQualityResponse failBackOrThrow(String code) {
-        return Optional.ofNullable(getCache(code))
-            .map(cache -> {
-                saveToCache(cache.getData(), false, code);
-                return cache.getData();
-            })
+        AirQualityStrategy strategy = strategies.stream()
+            .filter(s -> s.supports(observatoryResponse.getAddr()))
+            .findFirst()
             .orElseThrow(
                 () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
-    }
-
-    private String convertKey(String code) {
-        return key + code;
-    }
-
-    private void saveToCache(AirQualityResponse airQualityResponse, boolean fresh, String code) {
-        redisTemplate.opsForValue()
-            .set(convertKey(code), new CachedAirQuality(airQualityResponse, fresh), TTL);
-    }
-
-    private CachedAirQuality getCache(String code) {
-        return (CachedAirQuality) redisTemplate.opsForValue().get(convertKey(code));
-    }
-
-    private Optional<SeoulAirQuality> requestAirQuality() {
-        return airQualityProvider.getAirQuality();
-    }
 
-    private Optional<RegionAirQuality> requestAllAirQuality(String stationName) {
-        return regionAirQualityProvider.geAllAirQuality(stationName);
-    }
+        return strategy.getCache(getRegionCode(observatoryResponse)).orElseGet(
+            () -> strategy.update(observatoryResponse)
+        );
 
-    private AirQualityResponse createResponse(SeoulAirQuality seoulAirQuality) {
-        return AirQualityResponse.builder()
-            .grade(seoulAirQuality.getRow().get(0).getGrade())
-            .pm25(seoulAirQuality.getRow().get(0).getPm25())
-            .pm10(seoulAirQuality.getRow().get(0).getPm10())
-            .build();
     }
 
-    private AirQualityResponse createAllResponse(RegionAirQuality regionAirQuality) {
-        return AirQualityResponse.builder()
-            .grade(convertGrade(regionAirQuality))
-            .pm25(regionAirQuality.getResponse().getBody().getItems().get(0).getPm25Value())
-            .pm10(regionAirQuality.getResponse().getBody().getItems().get(0).getPm10Value())
-            .build();
+    private String getRegionCode(ObservatoryResponse observatoryResponse) {
+        return observatoryResponse.getStationCode();
     }
 
     private ProjCoordinate convertCoordinate(double lat, double lng) {
@@ -126,22 +49,4 @@ private Optional<ObservatoryResponse> getObservatory(double lat, double lng) {
         return observatoryProvider.getObservatory(coordinate.x, coordinate.y);
     }
 
-    private boolean isSeoul(ObservatoryResponse observatoryResponse) {
-        return observatoryResponse.getAddr().startsWith("서울");
-    }
-
-    private String convertGrade(RegionAirQuality airQuality) {
-        switch (airQuality.getResponse().getBody().getItems().get(0).getPm10Grade()) {
-            case "1":
-                return "좋음";
-            case "2":
-                return "보통";
-            case "3":
-                return "나쁨";
-            case "4":
-                return "매우 나쁨";
-            default:
-                return "-";
-        }
-    }
 }

From d9312791acea3809af187db45386b1791b74c866 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:54:01 +0900
Subject: [PATCH 20/26] =?UTF-8?q?refactor=20:=20=EC=8A=A4=EC=BC=80?=
 =?UTF-8?q?=EC=A4=84=EB=9F=AC=20=EB=B6=84=EB=A6=AC=ED=95=9C=20Class=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/controller/AirQualityScheduler.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
index cd14fa25..d9866ba7 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
@@ -2,14 +2,17 @@
 
 import lombok.RequiredArgsConstructor;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
 import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
+import org.programmers.signalbuddyfinal.domain.air_quality.service.SeoulAirQualityService;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class AirQualityScheduler {
-    private final AirQualityService airQualityService;
+    private final SeoulAirQualityService seoulAirQualityService;
+    private ObservatoryResponse observatoryResponse;
 
     @Scheduled(cron = "${schedule.air-quality-api.cron:0 0/1 * * * ?}")
     @SchedulerLock(
@@ -18,6 +21,6 @@ public class AirQualityScheduler {
         lockAtLeastFor = "${schedule.air-quality-api.lockAtLeastFor:50m}"
     )
     public void updateAirQuality(){
-        airQualityService.updateAriQuality();
+        seoulAirQualityService.update();
     }
 }
\ No newline at end of file

From f49b1b1d79c5ccbe7c0c0f7b9366de3ba461be79 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 14:54:27 +0900
Subject: [PATCH 21/26] =?UTF-8?q?refacter:=20=EB=B6=84=EB=A6=AC=ED=95=9C?=
 =?UTF-8?q?=20Class=20test=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/service/AirQualityServiceTest.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
index 9cf587ad..b1799b00 100644
--- a/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
+++ b/src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityServiceTest.java
@@ -50,6 +50,12 @@ public class AirQualityServiceTest extends ServiceTest implements RedisTestConta
     @Autowired
     private AirQualityService airQualityService;
 
+    @Autowired
+    private SeoulAirQualityService seoulAirQualityService;
+
+    @Autowired
+    private RegionAirQualityService regionAirQualityService;
+
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
 
@@ -62,6 +68,8 @@ public class AirQualityServiceTest extends ServiceTest implements RedisTestConta
     @MockitoBean
     private SeoulAirQualityProvider seoulAirQualityProvider;
 
+
+
     private static MockWebServer mockWebServer;
 
     private final String key = "air-quality:";
@@ -144,7 +152,7 @@ void failBackSuccessTest() {
         when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
             .thenReturn(createObservatoryResponse("서울역", "서울 XXX OOO"));
 
-        airQualityService.updateAriQuality();
+        seoulAirQualityService.update();
         CachedAirQuality after = getCache("seoul");
 
         assertThat(after.isFresh()).isFalse();
@@ -207,7 +215,7 @@ void RegionFailBackSuccessTest() {
         when(observatoryProvider.getObservatory(anyDouble(), anyDouble()))
             .thenReturn(createObservatoryResponse("설성면", "경기 이천시 설성면"));
 
-        airQualityService.updateRegionAriQuality(
+        regionAirQualityService.update(
             createObservatoryResponse("설성면", "경기 이천시 설성면").get());
         CachedAirQuality after = getCache("111123");
 

From fc780b2237446c526476365771875a0faac1e83e Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 17:10:46 +0900
Subject: [PATCH 22/26] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20import=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/controller/AirQualityScheduler.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
index d9866ba7..d55181b8 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityScheduler.java
@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.ObservatoryResponse;
-import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
 import org.programmers.signalbuddyfinal.domain.air_quality.service.SeoulAirQualityService;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

From 3f91e91c46879ed47848941dd0b881123af8a653 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Wed, 14 May 2025 17:12:33 +0900
Subject: [PATCH 23/26] =?UTF-8?q?refactor:=20=ED=95=A8=EC=88=98=EB=AA=85?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AirQualityCacheService.java       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
index df2cf27c..9de73112 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
@@ -8,46 +8,40 @@
 import org.programmers.signalbuddyfinal.domain.air_quality.exception.AirQualityErrorCode;
 import org.programmers.signalbuddyfinal.global.exception.BusinessException;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-@Component
 public class AirQualityCacheService implements AirQualityCache {
 
     private final RedisTemplate<Object, Object> redisTemplate;
 
-    private static final String key = "air-quality:";
+    private static final String PREFIX = "air-quality:";
     private static final Duration TTL = Duration.ofHours(2);
 
     @Override
-    public CachedAirQuality get(String code) {
-        return (CachedAirQuality) redisTemplate.opsForValue().get(convertKey(code));
+    public CachedAirQuality get(String regionCode) {
+        return (CachedAirQuality) redisTemplate.opsForValue().get(formatKey(regionCode));
     }
 
     @Override
     public void save(String regionCode, AirQualityResponse airQualityResponse, boolean fresh) {
         redisTemplate.opsForValue()
-            .set(convertKey(regionCode), new CachedAirQuality(airQualityResponse, fresh), TTL);
+            .set(formatKey(regionCode), new CachedAirQuality(airQualityResponse, fresh), TTL);
     }
 
     @Override
     public AirQualityResponse failBackOrThrow(String regionCode) {
         return Optional.ofNullable(get(regionCode))
             .map(cache -> {
-                save(regionCode, getCachedDate(cache), false);
+                save(regionCode, cache.getData(), false);
                 return cache.getData();
             })
             .orElseThrow(
                 () -> new BusinessException(AirQualityErrorCode.AIR_QUALITY_SERVICE_UNAVAILABLE));
     }
 
-    private String convertKey(String code) {
-        return key + code;
-    }
-
-    private AirQualityResponse getCachedDate(CachedAirQuality cache) {
-        return cache.getData();
+    private String formatKey(String regionCode) {
+        return PREFIX + regionCode;
     }
 }

From ca34278575f9019b4a3d96d1e5c2c5a1486ea8d3 Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 15 May 2025 11:39:21 +0900
Subject: [PATCH 24/26] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../air_quality/service/AirQualityCache.java   |  1 -
 .../service/SeoulAirQualityService.java        | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
index d205402c..ff36295f 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
@@ -1,6 +1,5 @@
 package org.programmers.signalbuddyfinal.domain.air_quality.service;
 
-import java.util.Optional;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
 import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
 
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
index 6efdbb3c..2896701c 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
@@ -16,7 +16,7 @@ public class SeoulAirQualityService implements AirQualityStrategy {
 
     private final AirQualityCacheService airQualityCacheService;
     private final SeoulAirQualityProvider airQualityProvider;
-    private final String SEOUL_CODE = "seoul";
+    private final String REGION_CODE = "seoul";
 
     @Override
     public boolean supports(String addr) {
@@ -25,25 +25,25 @@ public boolean supports(String addr) {
 
     @Override
     public Optional<AirQualityResponse> getCache(String code) {
-        return Optional.ofNullable(airQualityCacheService.get(SEOUL_CODE))
+        return Optional.ofNullable(airQualityCacheService.get(REGION_CODE))
             .filter(CachedAirQuality::isFresh)
             .map(CachedAirQuality::getData);
     }
 
-    @Override
-    public AirQualityResponse update(ObservatoryResponse obs) {
-        return update();
-    }
-
     public AirQualityResponse update() {
         return requestAirQuality()
             .map(this::successfulResponse)
-            .orElseGet(() -> airQualityCacheService.failBackOrThrow(SEOUL_CODE));
+            .orElseGet(() -> airQualityCacheService.failBackOrThrow(REGION_CODE));
+    }
+
+    @Override
+    public AirQualityResponse update(ObservatoryResponse obs) {
+        return update();
     }
 
     private AirQualityResponse successfulResponse(SeoulAirQuality newSeoulAirQuality) {
         AirQualityResponse response = createResponse(newSeoulAirQuality);
-        airQualityCacheService.save(SEOUL_CODE, response, true);
+        airQualityCacheService.save(REGION_CODE, response, true);
         return response;
     }
 

From 729edf9d00b708378f736fdc40db82fc60104c6e Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 22 May 2025 09:47:12 +0900
Subject: [PATCH 25/26] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20interface=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/service/AirQualityCache.java  | 12 ------------
 .../air_quality/service/AirQualityCacheService.java  |  5 +----
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
deleted file mode 100644
index ff36295f..00000000
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCache.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.programmers.signalbuddyfinal.domain.air_quality.service;
-
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
-import org.programmers.signalbuddyfinal.domain.air_quality.dto.CachedAirQuality;
-
-public interface AirQualityCache {
-
-    CachedAirQuality get(String regionCode);
-    void save(String key, AirQualityResponse response, boolean fresh);
-    AirQualityResponse failBackOrThrow(String key);
-
-}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
index 9de73112..15845b2f 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/AirQualityCacheService.java
@@ -12,25 +12,22 @@
 
 @Service
 @RequiredArgsConstructor
-public class AirQualityCacheService implements AirQualityCache {
+public class AirQualityCacheService {
 
     private final RedisTemplate<Object, Object> redisTemplate;
 
     private static final String PREFIX = "air-quality:";
     private static final Duration TTL = Duration.ofHours(2);
 
-    @Override
     public CachedAirQuality get(String regionCode) {
         return (CachedAirQuality) redisTemplate.opsForValue().get(formatKey(regionCode));
     }
 
-    @Override
     public void save(String regionCode, AirQualityResponse airQualityResponse, boolean fresh) {
         redisTemplate.opsForValue()
             .set(formatKey(regionCode), new CachedAirQuality(airQualityResponse, fresh), TTL);
     }
 
-    @Override
     public AirQualityResponse failBackOrThrow(String regionCode) {
         return Optional.ofNullable(get(regionCode))
             .map(cache -> {

From e5b309593fdeeef47412bce3a552658aaa72e5df Mon Sep 17 00:00:00 2001
From: seohyeonmen <iacsbe36@gmail.com>
Date: Thu, 22 May 2025 09:47:40 +0900
Subject: [PATCH 26/26] =?UTF-8?q?refactor:=20=EB=AA=85=ED=99=95=ED=95=9C?=
 =?UTF-8?q?=20=EB=B6=84=EB=A6=AC=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=EC=B2=B4=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/air_quality/service/RegionAirQualityService.java     | 2 +-
 .../domain/air_quality/service/SeoulAirQualityService.java      | 2 +-
 submodule                                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java
index 92f4d280..3ec89633 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/RegionAirQualityService.java
@@ -11,7 +11,7 @@
 
 @Component
 @RequiredArgsConstructor
-@Qualifier("regionStrategy")
+@Qualifier("regionAirQualityStrategy")
 public class RegionAirQualityService implements AirQualityStrategy {
 
     private final AirQualityCacheService airQualityCacheService;
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
index 2896701c..3ec09df9 100644
--- a/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
+++ b/src/main/java/org/programmers/signalbuddyfinal/domain/air_quality/service/SeoulAirQualityService.java
@@ -11,7 +11,7 @@
 
 @Component
 @RequiredArgsConstructor
-@Qualifier("seoulStrategy")
+@Qualifier("seoulAirQualityStrategy")
 public class SeoulAirQualityService implements AirQualityStrategy {
 
     private final AirQualityCacheService airQualityCacheService;
diff --git a/submodule b/submodule
index 8401e930..3542a8a5 160000
--- a/submodule
+++ b/submodule
@@ -1 +1 @@
-Subproject commit 8401e930c997d36baaef3de57daaaa745584361a
+Subproject commit 3542a8a56e07fe1f0baada17c8adf0fb6ab9414c