From 4ad8d6683c831b0a8218562353b5e4b78ed63f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= <sesostris@interlegis.leg.br>
Date: Wed, 13 Apr 2022 09:45:52 -0300
Subject: [PATCH] =?UTF-8?q?Gescon:=20Busca=20CNPJ=20ignorando=20m=C3=A1sca?=
 =?UTF-8?q?ra?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/apps/convenios/models.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/sigi/apps/convenios/models.py b/sigi/apps/convenios/models.py
index 9ae0abc..78ef74e 100644
--- a/sigi/apps/convenios/models.py
+++ b/sigi/apps/convenios/models.py
@@ -510,6 +510,10 @@ class Gescon(models.Model):
         orgaos = self.orgaos_gestores.split()
         subespecies = {tuple(s.split("=")) for s in self.subespecies.split()}
 
+        lista_cnpj = {re.sub("[^\d]", "", o.cnpj).zfill(14): o
+                 for o in Orgao.objects.exclude(cnpj="")
+                 if re.sub("[^\d]", "", o.cnpj) != ''}
+
         for sigla_gescon, sigla_sigi in subespecies:
             self.add_message(_(u"\nImportando subespécie {s}".format(
                 s=sigla_gescon)))
@@ -577,7 +581,7 @@ class Gescon(models.Model):
 
                 if contrato['cnpjCpfFornecedor']:
                     cnpj = contrato['cnpjCpfFornecedor'].zfill(14)
-                    cnpj = "{}.{}.{}/{}-{}".format(cnpj[:2], cnpj[2:5],
+                    cnpj_masked = "{}.{}.{}/{}-{}".format(cnpj[:2], cnpj[2:5],
                                                    cnpj[5:8], cnpj[8:12],
                                                    cnpj[12:])
                 else:
@@ -605,11 +609,15 @@ class Gescon(models.Model):
                 orgao = None
 
                 if cnpj is not None:
-                    try:
-                        orgao = Orgao.objects.get(cnpj=cnpj)
-                    except (
-                        Orgao.DoesNotExist,
-                        Orgao.MultipleObjectsReturned) as e:
+                    if cnpj in lista_cnpj:
+                        orgao = lista_cnpj[cnpj]
+                    else:
+                        try:
+                            orgao = Orgao.objects.get(cnpj=cnpj_masked)
+                        except (
+                            Orgao.DoesNotExist,
+                            Orgao.MultipleObjectsReturned
+                        ) as e:
                             orgao = None
                             pass