fix: 위치정보 조회 수정 #33

green-pinetree · May 23, 2023 · f522602 · f522602
1 parent 08fdcd7
commit f522602
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/server/src/main/java/app/seok/picnicmap/geolocation/GeoLocationController.java b/server/src/main/java/app/seok/picnicmap/geolocation/GeoLocationController.java
@@ -19,6 +19,7 @@ public GeoLocationResponseDTO getLocation(
     if (ipAddress == null || ipAddress.isEmpty()) {
       ipAddress = request.getRemoteAddr();
     }
+    System.out.println(ipAddress);
     return geoLocationService.getGeoLocation(ipAddress);
   }
 }
diff --git a/server/src/main/java/app/seok/picnicmap/geolocation/GeoLocationService.java b/server/src/main/java/app/seok/picnicmap/geolocation/GeoLocationService.java
@@ -21,24 +21,23 @@ public GeoLocationResponseDTO getGeoLocation(String ipAddress) {
     Optional<GeoLocation> optionalGeoLocation = geoLocationRepository.findRecentRecordByIpAddress(
         ipAddress, startTime);
 
-    GeoLocation geoLocation;
-    if (optionalGeoLocation.isPresent()) {
-      geoLocation = optionalGeoLocation.get();
-    } else {
-      try {
+    GeoLocation geoLocation = new GeoLocation();
+    try {
+      if (optionalGeoLocation.isPresent()) {
+        geoLocation = optionalGeoLocation.get();
+      } else {
         geoLocation = callNcloudApiGeolocation(ipAddress);
         geoLocationRepository.save(geoLocation);
-      } catch (JsonProcessingException e) {
-        geoLocation = new GeoLocation();
-        throw new RuntimeException(e);
       }
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    } finally {
+      if ("서울특별시".equals(geoLocation.getR1())) {
+        return GeoLocationResponseDTO.OkFromGeoLocation(geoLocation);
+      }
+      return GeoLocationResponseDTO.Ok();
     }
 
-    if ("서울특별시".equals(geoLocation.getR1())) {
-      return GeoLocationResponseDTO.OkFromGeoLocation(geoLocation);
-    }
-
-    return GeoLocationResponseDTO.Ok();
   }
 
   private GeoLocation callNcloudApiGeolocation(String ipAddress) throws JsonProcessingException {