Merge branch 'main' into main

Author: LorhanSohaky

lib/fetchGeocoordinateFromBrazilLocation.js

@@ -10,14 +10,19 @@ function getAgent() {
   return cacheAgent;
 }
 
-async function fetchGeocoordinateFromBrazilLocation({ state, city, street }) {
+async function fetchGeocoordinateFromBrazilLocation({
+  state,
+  city,
+  street,
+  cep,
+}) {
   const agent = getAgent();
   const encodedState = encodeURI(state);
   const encodedCity = encodeURI(city);
   const encodedStreet = encodeURI(street);
 
   const country = 'Brasil';
-  const queryString = `format=json&addressdetails=1&country=${country}&state=${encodedState}&city=${encodedCity}&street=${encodedStreet}&limit=1`;
+  const queryString = `format=json&addressdetails=1&country=${country}&state=${encodedState}&city=${encodedCity}&street=${encodedStreet}`;
 
   const response = await fetch(
     `https://nominatim.openstreetmap.org/search/?${queryString}`,
@@ -26,15 +31,26 @@ async function fetchGeocoordinateFromBrazilLocation({ state, city, street }) {
 
   const jsonData = await response.json();
 
-  if (jsonData.length > 0) {
-    const { lat: latitude, lon: longitude } = jsonData[0];
-    return { type: 'Point', coordinates: { longitude, latitude } };
+  const cleanedCep = cep.replace(/\D/g, '');
+  const exactLocation = jsonData.find(
+    (item) => item.address.postcode.replace(/\D/g, '') === cleanedCep
+  );
+  const approximateLocation = jsonData.find(
+    (item) =>
+      item.address.postcode.replace(/\D/g, '').slice(0, 5) ===
+      cleanedCep.slice(0, 5)
+  );
+  const location = exactLocation || approximateLocation;
+
+  if (!location) {
+    return {
+      type: 'Point',
+      coordinates: { longitude: undefined, latitude: undefined },
+    };
   }
 
-  return {
-    type: 'Point',
-    coordinates: { longitude: undefined, latitude: undefined },
-  };
+  const { lat: latitude, lon: longitude } = location;
+  return { type: 'Point', coordinates: { longitude, latitude } };
 }
 
 export default fetchGeocoordinateFromBrazilLocation;

tests/cep-v2.test.js

@@ -63,4 +63,25 @@ describe('/cep/v2 (E2E)', () => {
       });
     }
   });
+
+  test('Deve retornar as coordenadas -22.883892 e -43.3061123', async () => {
+    const requestUrl = `${global.SERVER_URL}/api/cep/v2/20751120`;
+    const response = await axios.get(requestUrl);
+
+    expect(response.data).toEqual({
+      cep: '20751120',
+      state: 'RJ',
+      city: 'Rio de Janeiro',
+      neighborhood: 'Piedade',
+      street: 'Rua Marcolino',
+      service: expect.any(String),
+      location: {
+        type: 'Point',
+        coordinates: {
+          longitude: '-43.3061123',
+          latitude: '-22.883892',
+        },
+      },
+    });
+  });
 });