Merge pull request #15 from 2025-OpenData-Project/feature-2-좌표-기반-코스-구성

[FEAT] 랜딩 페이지에 띄울 관광지 정보 반환 API

Author: kamillcream

src/main/java/com/opendata/domain/apidata/controller/AreaController.java

@@ -1,12 +1,16 @@
 package com.opendata.domain.apidata.controller;
 
+import com.opendata.domain.apidata.dto.AreaCongestionDto;
 import com.opendata.domain.apidata.service.AreaService;
+import com.opendata.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
 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.RestController;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/area")
@@ -20,4 +24,9 @@ public ResponseEntity<Void> getArea()
         areaService.fetchAllAreaAndSave();
         return ResponseEntity.ok().build();
     }
+
+    @GetMapping("/list")
+    public ResponseEntity<ApiResponse<List<AreaCongestionDto>>> getAreaListWithCongestion(){
+        return ResponseEntity.ok(ApiResponse.onSuccess(areaService.fetchAndConvertAreaCongestionDto()));
+    }
 }

src/main/java/com/opendata/domain/apidata/dto/AreaCongestionDto.java

@@ -0,0 +1,7 @@
+package com.opendata.domain.apidata.dto;
+
+public record AreaCongestionDto(
+        String spotName,
+        String congestionLevel
+) {
+}

src/main/java/com/opendata/domain/apidata/service/AreaService.java

@@ -2,15 +2,18 @@
 
 
 import com.opendata.domain.apidata.api.AreaApi;
+import com.opendata.domain.apidata.dto.AreaCongestionDto;
 import com.opendata.domain.apidata.dto.CityDataDto;
 import com.opendata.domain.apidata.entity.Area;
 import com.opendata.domain.apidata.repository.AreaRepository;
+import com.opendata.global.util.DateUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -80,4 +83,21 @@ else if(congestLevel.equals("약간 붐빔"))
         }
         return area;
     }
+
+    public List<AreaCongestionDto> mapToClosestTimeList(List<Area> areas, String currentTime) {
+        return areas.stream()
+                .map(area -> area.getFutures().stream()
+                        .filter(f -> f.getFcstTime().compareTo(currentTime) <= 0)
+                        .max(Comparator.comparing(CityDataDto.FutureData::getFcstTime))
+                        .map(f -> new AreaCongestionDto(area.getName(), f.getFcstCongestLvl()))
+                        .orElse(null)
+                )
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    public List<AreaCongestionDto> fetchAndConvertAreaCongestionDto(){
+        String currentTime = DateUtil.getCurrentFormattedDateTime();
+        return mapToClosestTimeList(areaRepository.findAreaWithCongestionByCurrentTime(currentTime), currentTime);
+    }
 }