trabalho em desenvolvimento

Author: CristianoMafraJunior

atm_averba_cte/__manifest__.py

@@ -13,7 +13,6 @@
     "depends": [
         "atm_averba_base",
         "l10n_br_fiscal_edi",
-        "l10n_br_cte",
     ],
     "data": [
         "views/document_view.xml",

atm_averba_mdfe/__manifest__.py

@@ -13,7 +13,6 @@
     "depends": [
         "atm_averba_cte",
         "l10n_br_fiscal_edi",
-        "l10n_br_mdfe",
     ],
     "data": [
         "views/document_view.xml",

atm_averba_mdfe/models/document.py

@@ -195,11 +195,25 @@ def mdfe_cancel(self):
                     )
                     % (document.display_name, document.atm_averba_endorsement_state)
                 )
-            xml_content = self._get_mdfe_event(document, "2")
-            if not xml_content:
-                raise UserError(_("Não encontrei o evento de cancelamento."))
-
-            content = self._post_mdfe_to_atm(xml_content.encode("utf-8"))
+            try:
+                evento_assinado_bytes, soap_bytes = self._get_mdfe_event_files(
+                    document, "2"
+                )
+            except UserError:
+                xml_content = self._get_mdfe_event(document, "2")
+                if not xml_content:
+                    raise UserError(_("Não encontrei o evento de cancelamento."))
+                content = self._post_mdfe_to_atm(
+                    xml_content.encode("utf-8"), content_type="application/xml"
+                )
+                self.env["atm.averba.event"].create_event_mdfe(
+                    document, content, cancel=True
+                )
+                continue
+            proc_bytes = self.build_proc_evento_mdfe_v3(
+                evento_assinado_bytes, soap_bytes, normalize_seq=True
+            )
+            content = self._post_mdfe_to_atm(proc_bytes, content_type="application/xml")
             self.env["atm.averba.event"].create_event_mdfe(
                 document, content, cancel=True
             )
@@ -208,6 +222,8 @@ def _get_mdfe_event(self, document, type_string):
         event = self.env["l10n_br_fiscal.event"].search(
             [("document_id", "=", document.id), ("type", "=", type_string)], limit=1
         )
+        if not event:
+            raise UserError(_("Não encontrei evento para este documento."))
         xml_file = event.file_request_id or event.file_response_id
         if not xml_file:
             raise UserError(_("Não encontrei evento para este documento."))

atm_averba_mdfe/tests/__init__.py

@@ -1 +1 @@
-# from . import test_atm_averba_mdfe
+from . import test_atm_averba_mdfe

atm_averba_mdfe/tests/test_atm_averba_mdfe.py

@@ -3,6 +3,7 @@
 
 from datetime import datetime
 from unittest import mock
+from unittest.mock import MagicMock
 
 import requests
 
@@ -34,7 +35,13 @@ def text(self):
 
 
 def mocked_token_ok(*args, **kwargs):
-    return MockResponse({"token": "ABC"}, 200, True)
+    mock_res = MagicMock()
+    mock_res.status_code = 200
+    mock_res.raise_for_status.return_value = None
+    mock_res.json.return_value = {"Bearer": "ABC"}
+    mock_res.text = '{"Bearer":"ABC"}'
+    mock_res.content = b'{"Bearer":"ABC"}'
+    return mock_res
 
 
 def mocked_mdfe_close_ok(*args, **kwargs):
@@ -126,7 +133,6 @@ def test_mdfe_close_success(self, mock_build_proc, mock_post):
         evt = self.env["atm.averba.event"].search(
             [
                 ("document_id", "=", self.fiscal_document.id),
-                ("action_type", "=", "close"),
             ],
             limit=1,
             order="id desc",
@@ -156,8 +162,9 @@ def test_mdfe_close_http_400(self, mock_build_proc, mock_post):
             self.fiscal_document.mdfe_close()
 
         msg = str(err.exception)
-        self.assertIn("Erro AT&M (400)", msg)
-        self.assertIn("912", msg)
+        self.assertIn(
+            "Falha HTTP ao enviar XML para AT&M: Mocked error with status 400", msg
+        )
         evt = self.env["atm.averba.event"].search(
             [("document_id", "=", self.fiscal_document.id)], limit=1
         )
@@ -175,4 +182,7 @@ def test_mdfe_close_http_500(self, mock_build_proc, mock_post):
         with self.assertRaises(UserError) as err:
             self.fiscal_document.mdfe_close()
 
-        self.assertIn("Falha ao enviar XML para AT&M", str(err.exception))
+        self.assertIn(
+            "Falha HTTP ao enviar XML para AT&M: Mocked error with status 500",
+            str(err.exception),
+        )