Refactors APIService and OnibusService to remove file handling and return coordenadas directly

oDaviML · oDaviML · commit f10aa3c9ffe4 · 2025-12-10T20:04:58.000-03:00
diff --git a/src/data/coordenadas/coordenadas.json b/src/data/coordenadas/coordenadas.json
diff --git a/src/main/java/com/dmware/api_onibusbh/scheduler/CoordenadasScheduler.java b/src/main/java/com/dmware/api_onibusbh/scheduler/CoordenadasScheduler.java
@@ -1,10 +1,11 @@
 package com.dmware.api_onibusbh.scheduler;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.dmware.api_onibusbh.dto.CoordenadaDTO;
 import com.dmware.api_onibusbh.services.APIService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -24,9 +25,9 @@ public CoordenadasScheduler(APIService apiService, OnibusService onibusService)
 
     @Async
     @Scheduled(fixedDelay = 20, timeUnit = TimeUnit.SECONDS)
-    public void fetchCoordenadasOnibus() throws IOException {
-        apiService.getOnibusCoordenadaBH();
-        onibusService.salvaCoordenadas();
+    public void fetchCoordenadasOnibus() {
+        List<CoordenadaDTO> coordenadas = apiService.getOnibusCoordenadaBH();
+        onibusService.salvaCoordenadas(coordenadas);
     }
 
 }
diff --git a/src/main/java/com/dmware/api_onibusbh/services/APIService.java b/src/main/java/com/dmware/api_onibusbh/services/APIService.java
@@ -1,14 +1,10 @@
 package com.dmware.api_onibusbh.services;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Value;
+import com.dmware.api_onibusbh.dto.CoordenadaDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 
@@ -25,11 +21,6 @@
 @Service
 public class APIService {
 
-    @Value("${BASE_PATH}")
-    private String BASE_PATH;
-    @Value("${FILE_NAME}")
-    private String FILE_NAME;
-
     private final WebClientConfig webClientConfig;
     private final ObjectMapper objectMapper;
 
@@ -86,15 +77,15 @@ public List<LinhaDTO> getLinhasAPIBH() {
         }
     }
 
-    public void getOnibusCoordenadaBH() throws IOException {
+    public List<CoordenadaDTO> getOnibusCoordenadaBH() {
         System.out.printf("Acessando diretamente.%n");
         List<String> responses = fetchCoordenadasDirectly();
 
         if (responses == null || responses.size() < 2) {
             throw new IllegalStateException("Não foi possível obter resposta de um ou mais endpoints.");
         }
 
-        processAndSaveCoordenadas(responses);
+        return processAndReturnCoordenadas(responses);
     }
 
     private List<String> fetchCoordenadasDirectly() {
@@ -111,28 +102,21 @@ private List<String> fetchCoordenadasDirectly() {
         return Flux.merge(monoParamD, monoParamSD).collectList().block();
     }
 
-    private void processAndSaveCoordenadas(List<String> responses) throws IOException {
+    private List<CoordenadaDTO> processAndReturnCoordenadas(List<String> responses) {
         String jsonD = responses.get(0);
         String jsonSD = responses.get(1);
+        List<CoordenadaDTO> todasCoordenadas = new ArrayList<>();
 
         try {
-            TypeReference<List<Map<String, Object>>> typeRef = new TypeReference<>() {
-            };
-            List<Map<String, Object>> listD = objectMapper.readValue(jsonD, typeRef);
-            List<Map<String, Object>> listSD = objectMapper.readValue(jsonSD, typeRef);
-
-            List<Map<String, Object>> combinedList = new ArrayList<>(listD);
-            combinedList.addAll(listSD);
-
-            String finalJson = objectMapper.writeValueAsString(combinedList);
+            TypeReference<List<CoordenadaDTO>> typeRef = new TypeReference<>() {};
+            
+            List<CoordenadaDTO> listD = objectMapper.readValue(jsonD, typeRef);
+            List<CoordenadaDTO> listSD = objectMapper.readValue(jsonSD, typeRef);
 
-            Path basePath = Paths.get(BASE_PATH);
-            if (!Files.exists(basePath)) {
-                Files.createDirectories(basePath);
-            }
+            if(listD != null) todasCoordenadas.addAll(listD);
+            if(listSD != null) todasCoordenadas.addAll(listSD);
 
-            Path filePath = basePath.resolve(FILE_NAME);
-            Files.writeString(filePath, finalJson);
+            return todasCoordenadas;
 
         } catch (JsonProcessingException e) {
             throw new RuntimeException("Erro ao processar o JSON das coordenadas.", e);
diff --git a/src/main/java/com/dmware/api_onibusbh/services/OnibusService.java b/src/main/java/com/dmware/api_onibusbh/services/OnibusService.java
@@ -2,30 +2,18 @@
 
 import com.dmware.api_onibusbh.config.WebClientConfig;
 import com.dmware.api_onibusbh.dto.CoordenadaDTO;
-import com.dmware.api_onibusbh.dto.LinhaDTO;
 import com.dmware.api_onibusbh.dto.OnibusDTO;
 import com.dmware.api_onibusbh.entities.LinhaEntity;
 import com.dmware.api_onibusbh.exceptions.CoordenadasNotFoundException;
 import com.dmware.api_onibusbh.exceptions.LinhaNotFoundException;
-import com.dmware.api_onibusbh.exceptions.LinhasNotFoundException;
 import com.dmware.api_onibusbh.repositories.LinhasRepository;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.modelmapper.ModelMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.BinaryOperator;
@@ -37,11 +25,6 @@ public class OnibusService {
 
     private static final Logger logger = LoggerFactory.getLogger(OnibusService.class);
 
-    @Value("${BASE_PATH}")
-    private String BASE_PATH;
-    @Value("${FILE_NAME}")
-    private String FILE_NAME;
-
     @Value("${api.onibus.coordenadas.ttl-minutes:20}")
     private int ttlMinutes;
 
@@ -97,7 +80,7 @@ public List<CoordenadaDTO> listarPorNumeroLinha(Integer numeroLinha, Optional<In
         return coordenadas;
     }
 
-    public void salvaCoordenadas() {
+    public void salvaCoordenadas(List<CoordenadaDTO> todasCoordenadasNovas) {
         logger.info("Iniciando o salvamento das coordenadas...");
         List<LinhaEntity> linhasExistentes;
         try {
@@ -112,11 +95,9 @@ public void salvaCoordenadas() {
             return;
         }
 
-        List<CoordenadaDTO> todasCoordenadasNovas = fetchCoordenadas();
-        
         // Agrupa as coordenadas novas mais recentes por número de linha
         Map<Integer, List<CoordenadaDTO>> mapaNovasCoordenadasPorLinha;
-        if (todasCoordenadasNovas.isEmpty()) {
+        if (todasCoordenadasNovas == null || todasCoordenadasNovas.isEmpty()) {
             logger.info("Nenhuma coordenada nova encontrada. Executando apenas limpeza por TTL.");
             mapaNovasCoordenadasPorLinha = Collections.emptyMap();
         } else {
@@ -186,23 +167,4 @@ public void salvaCoordenadas() {
             logger.info("Nenhuma alteração necessária nas linhas.");
         }
     }
-
-    public List<CoordenadaDTO> fetchCoordenadas() {
-        try {
-            Path file = Paths.get(BASE_PATH, FILE_NAME);
-            if (!Files.exists(file)) {
-                logger.warn("Arquivo de coordenadas não encontrado");
-                throw new CoordenadasNotFoundException();
-            }
-
-            return objectMapper.readValue(
-                    file.toFile(),
-                    new TypeReference<>() {
-                    });
-
-        } catch (CoordenadasNotFoundException | IOException e) {
-            logger.error("Erro ao ler arquivo de coordenadas");
-            throw new RuntimeException(e);
-        }
-    }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -5,8 +5,5 @@ server.address=0.0.0.0
 springdoc.swagger-ui.path=/swagger-ui.html
 spring.data.mongodb.auto-index-creation=true
 spring.data.mongodb.authentication-database=admin
-# File
-BASE_PATH=src/data/coordenadas
-FILE_NAME=coordenadas.json
 # Business
 api.onibus.coordenadas.ttl-minutes=20
