Merge branch 'main' into naziz1/SONIC-740/remove-order-history-logs

edx · Nov 20, 2024 · 0905685 · 0905685
2 parents 9fec519 + c88a65f
commit 0905685
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/commerce_coordinator/apps/commercetools/clients.py b/commerce_coordinator/apps/commercetools/clients.py
@@ -547,7 +547,7 @@ def update_line_item_transition_state_on_fulfillment(self, order_id: str, order_
                 return self.get_order_by_id(order_id)
         except CommercetoolsError as err:
             # Logs & ignores version conflict errors due to duplicate Commercetools messages
-            handle_commercetools_error(err, f"Unable to update LineItemState of order {order_id}")
+            handle_commercetools_error(err, f"Unable to update LineItemState of order {order_id}", True)
             return None
 
     def retire_customer_anonymize_fields(self, customer_id: str, customer_version: int,

diff --git a/commerce_coordinator/apps/commercetools/sub_messages/tasks.py b/commerce_coordinator/apps/commercetools/sub_messages/tasks.py
@@ -104,6 +104,8 @@ def fulfill_order_placed_message_signal_task(
             line_item_state_id,
             TwoUKeys.PROCESSING_FULFILMENT_STATE
         )
+        if not updated_order:
+            return True
 
         # from here we will always be transitioning from a 'Fulfillment Processing' state
         line_item_state_id = client.get_state_by_key(TwoUKeys.PROCESSING_FULFILMENT_STATE).id

diff --git a/commerce_coordinator/apps/commercetools/tests/test_clients.py b/commerce_coordinator/apps/commercetools/tests/test_clients.py
@@ -672,7 +672,7 @@ def test_update_line_item_state_exception(self, mock_state_by_id):
                 status_code=409
             )
 
-            with patch('commerce_coordinator.apps.commercetools.clients.logging.Logger.error') as log_mock:
+            with patch('commerce_coordinator.apps.commercetools.clients.logging.Logger.info') as log_mock:
                 self.client_set.client.update_line_item_transition_state_on_fulfillment(
                     "mock_order_id",
                     1,
@@ -689,7 +689,7 @@ def test_update_line_item_state_exception(self, mock_state_by_id):
                     f"Details: {mock_error_response['errors']}"
                 )
 
-                log_mock.assert_called_once_with(expected_message)
+                log_mock.assert_called_with(expected_message)
 
     @patch('commerce_coordinator.apps.commercetools.clients.CommercetoolsAPIClient.get_state_by_id')
     @patch('commerce_coordinator.apps.commercetools.clients.CommercetoolsAPIClient.get_order_by_id')

diff --git a/commerce_coordinator/apps/commercetools/utils.py b/commerce_coordinator/apps/commercetools/utils.py
@@ -35,9 +35,13 @@ def get_braze_client():
     )
 
 
-def handle_commercetools_error(err: CommercetoolsError, context: str):
+def handle_commercetools_error(err: CommercetoolsError, context: str, is_info=False):
+    """Handles commercetools errors."""
     error_message = f"[CommercetoolsError] {context} - Correlation ID: {err.correlation_id}, Details: {err.errors}"
-    logger.error(error_message)
+    if is_info:
+        logger.info(error_message)
+    else:
+        logger.error(error_message)
 
 
 def send_order_confirmation_email(