fixup! [FIX] edi_core_oca: handle OperationalError and IntegrityError exceptions to prevent finally block execution in aborted transaction state

Author: Ricardoalso

edi_core_oca/models/edi_backend.py

@@ -242,7 +242,7 @@ def exchange_send(self, exchange_record):
         except (OperationalError, IntegrityError):
             # We don't want the finally block to be executed in this case as
             # the cursor is already in an aborted state and any query will fail.
-            state = "sql_error"
+            res = "__sql_error__"
             raise
         else:
             # TODO: maybe the send handler should return desired message and state
@@ -255,7 +255,7 @@ def exchange_send(self, exchange_record):
             )
             res = message
         finally:
-            if not state == "sql_error":
+            if res != "__sql_error__":
                 exchange_record.write(
                     {
                         "edi_exchange_state": state,
@@ -457,13 +457,13 @@ def exchange_process(self, exchange_record):
         except (OperationalError, IntegrityError):
             # We don't want the finally block to be executed in this case as
             # the cursor is already in an aborted state and any query will fail.
-            state = "sql_error"
+            res = "__sql_error__"
             raise
         else:
             error = traceback = None
             state = "input_processed"
         finally:
-            if state != "sql_error":
+            if res != "__sql_error__":
                 exchange_record.write(
                     {
                         "edi_exchange_state": state,
@@ -525,15 +525,15 @@ def exchange_receive(self, exchange_record):
         except (OperationalError, IntegrityError):
             # We don't want the finally block to be executed in this case as
             # the cursor is already in an aborted state and any query will fail.
-            state = "sql_error"
+            res = "__sql_error__"
             raise
         else:
             message = exchange_record._exchange_status_message("receive_ok")
             error = traceback = None
             state = "input_received"
             res = message
         finally:
-            if not state == "sql_error":
+            if res != "__sql_error__":
                 exchange_record.write(
                     {
                         "edi_exchange_state": state,

edi_core_oca/tests/test_backend_input.py

@@ -3,6 +3,7 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from odoo_test_helper import FakeModelLoader
+from psycopg2 import OperationalError
 
 from .common import EDIBackendCommonTestCase
 
@@ -78,3 +79,12 @@ def test_receive_allow_empty_file_record(self):
         # Check the record
         self.assertEqual(self.record._get_file_content(), "")
         self.assertRecordValues(self.record, [{"edi_exchange_state": "input_received"}])
+
+    def test_receive_record_with_operational_error(self):
+        self.record.edi_exchange_state = "input_pending"
+        with self.assertRaises(OperationalError):
+            self.backend.with_context(
+                test_break_receive=OperationalError("SQL error")
+            ).exchange_receive(self.record)
+        self.assertRecordValues(self.record, [{"edi_exchange_state": "input_pending"}])
+        self.assertFalse(self.record.exchange_error)

edi_core_oca/tests/test_backend_output.py

@@ -7,6 +7,7 @@
 
 from freezegun import freeze_time
 from odoo_test_helper import FakeModelLoader
+from psycopg2 import OperationalError
 
 from odoo import fields, tools
 from odoo.exceptions import UserError
@@ -122,3 +123,13 @@ def test_send_not_generated_record(self):
                 err.exception.args[0], "Record ID=%d has no file to send!" % record.id
             )
             mocked.assert_not_called()
+
+    def test_send_record_with_operational_error(self):
+        self.record.write({"edi_exchange_state": "output_pending"})
+        self.record._set_file_content("TEST %d" % self.record.id)
+        with self.assertRaises(OperationalError):
+            self.backend.with_context(
+                test_break_send=OperationalError("SQL error")
+            ).exchange_send(self.record)
+        self.assertRecordValues(self.record, [{"edi_exchange_state": "output_pending"}])
+        self.assertFalse(self.record.exchange_error)

edi_core_oca/tests/test_backend_process.py

@@ -6,6 +6,7 @@
 
 from freezegun import freeze_time
 from odoo_test_helper import FakeModelLoader
+from psycopg2 import IntegrityError
 
 from odoo import fields
 from odoo.exceptions import UserError
@@ -103,4 +104,13 @@ def test_process_outbound_record(self):
         with self.assertRaises(UserError):
             record.action_exchange_process()
 
+    def test_process_record_with_integrity_error(self):
+        self.record.write({"edi_exchange_state": "input_received"})
+        with self.assertRaises(IntegrityError):
+            self.backend.with_context(
+                test_break_process=IntegrityError("SQL error")
+            ).exchange_process(self.record)
+        self.assertRecordValues(self.record, [{"edi_exchange_state": "input_received"}])
+        self.assertFalse(self.record.exchange_error)
+
     # TODO: test ack file are processed