Merge branch 'main' into main

BrasilAPI · Feb 24, 2024 · 3c88f13 · 3c88f13
2 parents 0794d6a + efb827d
commit 3c88f13
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 18 deletions.
diff --git a/lib/fetchGeocoordinateFromBrazilLocation.js b/lib/fetchGeocoordinateFromBrazilLocation.js
@@ -24,10 +24,14 @@ async function fetchGeocoordinateFromBrazilLocation({
   const agent = getAgent();
   const encodedState = encodeURI(state);
   const encodedCity = encodeURI(city);
-  const encodedStreet = encodeURI(extractAltFromStreet(street));
-
   const country = 'Brasil';
-  const queryString = `format=json&addressdetails=1&country=${country}&state=${encodedState}&city=${encodedCity}&street=${encodedStreet}`;
+
+  let queryString = `format=json&addressdetails=1&country=${country}&state=${encodedState}&city=${encodedCity}`;
+
+  if (street) {
+    const encodedStreet = encodeURI(extractAltFromStreet(street));
+    queryString += `&street=${encodedStreet}`;
+  }
 
   const headers = new Headers({
     'User-Agent': 'brasil-api-cep-v2',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "apollo-server-micro": "2.24.0",
     "axios": "0.21.1",
     "bluebird": "3.7.2",
-    "cep-promise": "4.4.0",
+    "cep-promise": "4.4.1",
     "core-js": "3.33.1",
     "cors": "2.8.5",
     "dayjs": "1.11.7",

diff --git a/pages/api/cep/v2/[cep].js b/pages/api/cep/v2/[cep].js
@@ -23,6 +23,14 @@ async function Cep(request, response) {
       cepFromCepPromise
     );
 
+    if (!cepFromCepPromise.street) {
+      cepFromCepPromise.street = null;
+    }
+
+    if (!cepFromCepPromise.neighborhood) {
+      cepFromCepPromise.neighborhood = null;
+    }
+
     response.status(200);
     response.json({ ...cepFromCepPromise, location });
   } catch (error) {

diff --git a/pages/docs/doc/cep.json b/pages/docs/doc/cep.json
@@ -158,10 +158,12 @@
                         "type": "string"
                     },
                     "neighborhood": {
-                        "type": "string"
+                        "type": "string",
+                        "nullable": true
                     },
                     "street": {
-                        "type": "string"
+                        "type": "string",
+                        "nullable": true
                     },
                     "service": {
                         "type": "string"

diff --git a/pages/docs/doc/cnpj.json b/pages/docs/doc/cnpj.json
@@ -111,7 +111,7 @@
                     "cnae_fiscal_descricao": {
                         "type": "string"
                     },
-                    "descricao_tipo_logradouro": {
+                    "descricao_tipo_de_logradouro": {
                         "type": "string"
                     },
                     "logradouro": {
@@ -261,7 +261,7 @@
                     "data_inicio_atividade": "2013-10-03",
                     "cnae_fiscal": 9430800,
                     "cnae_fiscal_descricao": "Atividades de associações de defesa de direitos sociais",
-                    "descricao_tipo_logradouro": "ALAMEDA",
+                    "descricao_tipo_de_logradouro": "ALAMEDA",
                     "logradouro": "FRANCA",
                     "numero": "144",
                     "complemento": "APT   34",

diff --git a/services/sefaz/index.js b/services/sefaz/index.js
@@ -7,11 +7,28 @@ function parseObject(obj) {
     return newDate.toISOString().slice(0, 10);
   };
 
-  const newObj = Object.fromEntries(
+  const convertKeysToLowerCase = Object.fromEntries(
     Object.entries(obj).map(([k, v]) => [k.toLowerCase(), v])
   );
-  newObj.data_fim = formatDate(newObj.data_fim);
-  newObj.data_inicio = formatDate(newObj.data_inicio);
+
+  const {
+    tipo_ato_ini: tipoAtoIni,
+    numero_ato_ini: numeroAtoIni,
+    ano_ato_ini: anoAtoIni,
+    data_inicio: dataInicio,
+    data_fim: dataFim,
+    ...rest
+  } = convertKeysToLowerCase;
+
+  const newObj = {
+    ...rest,
+    data_inicio: formatDate(dataInicio),
+    data_fim: formatDate(dataFim),
+    tipo_ato: tipoAtoIni,
+    numero_ato: numeroAtoIni,
+    ano_ato: anoAtoIni,
+  };
+
   return newObj;
 }
 

diff --git a/tests/cep-v2.test.js b/tests/cep-v2.test.js
@@ -84,4 +84,25 @@ describe('/cep/v2 (E2E)', () => {
       },
     });
   });
+
+  test('Uma cidade com CEP único, exemplo: 87360000, deve retornar as coordenadas -24.1851885 e -53.0250623', async () => {
+    const requestUrl = `${global.SERVER_URL}/api/cep/v2/87360000`;
+    const response = await axios.get(requestUrl);
+
+    expect(response.data).toEqual({
+      cep: '87360000',
+      state: 'PR',
+      city: 'Goioerê',
+      neighborhood: null,
+      street: null,
+      service: expect.any(String),
+      location: {
+        type: 'Point',
+        coordinates: {
+          longitude: '-53.0250623',
+          latitude: '-24.1851885',
+        },
+      },
+    });
+  });
 });