@kigi/components 1.24.0 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kigi/components",
-  "version": "1.24.0",
+  "version": "1.25.0",
   "description": "@kigi/components",
   "main": "src/components/index.ts",
   "scripts": {

package/src/components/mbg-address/mbg-address.ts

@@ -342,40 +342,59 @@ class MbgAddressController {
 
   async searchAddressByCEP() {
     if (this.address && this.address.zipCode) {
-      this.mbgAddressService.getCep(this.address.zipCode).then((response) => {
-        if (response && response.data && response.data.cep) {
-          const uf = getStatesBR().filter((state) => state.initial === response.data.uf)[0]
-          const formalCode = response.data.ibge || ''
-          const premisse = this.formatFromPremisse(response.data.logradouro)
-          this.address = {
-            zipCode: this.address.zipCode.replace('-', ''),
-            neighbourhood: response.data.bairro ? response.data.bairro.trim() : 'Centro',
-            localization: this.address.localization
-              ? this.address.localization
-              : (response.data.localidade || '').trim(),
-            premisse: premisse || 'CEP Único',
-            number: this.address.number || '',
-            information: this.address.information || '',
-            premisseSteps: this.address.premisseSteps || '',
-            premisseType: this.getPremisseType(premisse),
-            stateCode: formalCode.substring(0, 2),
-            formalCode,
-            uf,
-          }
-          if (!premisse) {
-            if (this.notFoundPremisse) {
-              this.notFoundPremisse()
-            }
-            this.openModalManual(false, this.address)
-            return
+      const response = await this.mbgAddressService.getCep(this.address.zipCode);
+
+      if (response && response.data && response.data.cep) {
+        let street, neighborhood, city, state, ibgeCode = '';
+
+        if (response.key == 'viacep') {
+          street = response.data.logradouro;
+          neighborhood = response.data.bairro;
+          city = response.data.localization;
+          state = response.data.uf;
+          ibgeCode = response.data.ibge;
+        } else if (response.key == 'brasilApi') {
+          street = response.data.street;
+          neighborhood = response.data.neighborhood;
+          city = response.data.city;
+          state = response.data.state;
+          const responseIbge = await this.mbgAddressService.getIbgeCode(response.data.city)
+          ibgeCode = (responseIbge && responseIbge.data) && responseIbge.data.id.toString();
+        }
+
+        const uf = getStatesBR().filter((state) => state.initial === response.data.uf)[0]
+        const formalCode = ibgeCode || ''
+        const premisse = this.formatFromPremisse(street)
+
+        this.address = {
+          zipCode: this.address.zipCode.replace('-', ''),
+          neighbourhood: neighborhood ? neighborhood.trim() : 'Centro',
+          localization: city
+            ? city
+            : (response.data.localidade || '').trim(),
+          premisse: premisse || 'CEP Único',
+          number: this.address.number || '',
+          information: this.address.information || '',
+          premisseSteps: this.address.premisseSteps || '',
+          premisseType: this.getPremisseType(premisse),
+          stateCode: formalCode.substring(0, 2),
+          formalCode,
+          uf,
+        }
+
+        if (!premisse) {
+          if (this.notFoundPremisse) {
+            this.notFoundPremisse()
           }
-          this.updateSteps()
-          this.createFullName()
-          this.$timeout(() => this.focusInputNumber())
-        } else {
-          this.notFound()
+          this.openModalManual(false, this.address)
+          return
         }
-      })
+        this.updateSteps()
+        this.createFullName()
+        this.$timeout(() => this.focusInputNumber())
+      } else {
+        this.notFound()
+      }
     }
   }
 

package/src/components/mbg-address/services/mbg-address.service.ts

@@ -2,6 +2,9 @@ class MbgAddressService {
   private apiLocation = 'https://anothers.kigisistemas.com.br/services-api'
   private googleKey = 'AIzaSyAATuKM3qZOaw0oArk_zNUJMOtGfwhoUEI'
   private googleAPI = 'https://maps.google.com/maps/api/geocode/json'
+  private viaCepAPI = 'https://viacep.com.br/ws'
+  private brasilAPI = 'https://brasilapi.com.br/api'
+  private ibgeGovAPI = 'https://servicodados.ibge.gov.br/api/v1/localidades/municipios'
 
   constructor(public $http) {}
 
@@ -21,9 +24,26 @@ class MbgAddressService {
     return this.$http.get(`${this.googleAPI}?address=${address}&key=${this.googleKey}`)
   }
 
-  getCep(cep: string) {
-    // return this.$http.get(`${this.apiLocation}/public/busca-cep/${cep}`)
-    return this.$http.get(`https://viacep.com.br/ws/${cep}/json/`)
+  async getCep(zipCode: string) {
+    try {
+      return await this.$http.get(`${this.viaCepAPI}/${zipCode}/json/`).then(res => {
+        res.key = 'viacep';
+        return res;
+      })
+    } catch (error) {
+      return await this.$http.get(`${this.brasilAPI}/cep/v1/${zipCode}`).then(res => {
+        res.key = 'brasilApi';
+        return res;
+      })
+    }
+  }
+
+  async getIbgeCode(municipio: string) {
+    try {
+      return await this.$http.get(`${this.ibgeGovAPI}/${municipio}`)
+    } catch (e) {
+      console.log(`Erro ao obter código do IBGE`)
+    }
   }
 
   getAddress(uf, city, premisse, neighbourhood) {

package/src/components/mbg-homescreen/cards/typeone/typeone.ts

@@ -1,6 +1,5 @@
 import './typeone.scss'
 import template from './typeone.html'
-import { isArray } from '@uirouter/angularjs'
 
 class MbgCardTypeOneController {
   public hideValue: boolean
@@ -28,7 +27,7 @@ class MbgCardTypeOneController {
     this.card.setNewValue = (value) => {
       this.setValue(value)
     }
-    if (this.card.items && this.card.items.length > 0 && !isArray(this.card.items[0])) {
+    if (this.card.items && this.card.items.length > 0 && !Array.isArray(this.card.items[0])) {
       this.card.items = [this.card.items]
     }
   }

package/src/components/mbg-select/mbg-select.ts

@@ -1,4 +1,4 @@
-import { Capitalize } from '@kigi/components/src/helpers/capitalize'
+import { Capitalize } from '../../helpers/capitalize'
 import * as angular from 'angular'
 import './mbg-select.scss'
 import template from './mbg-select.html'