From 2a7d02087c44a462fbf8e71d86e9271e4f8b1105 Mon Sep 17 00:00:00 2001
From: Chenyao Yu <4844716+chenyaoy@users.noreply.github.com>
Date: Wed, 12 Jun 2024 14:56:15 -0400
Subject: [PATCH] check if error is related to order replacement

---
 ...stateful-order-replacement-handler.test.ts |  2 +-
 .../stateful-order-replacement-handler.ts     | 19 +++++++++++--------
 .../handlers/dydx_stateful_order_handler.sql  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/indexer/services/ender/__tests__/handlers/stateful-order/stateful-order-replacement-handler.test.ts b/indexer/services/ender/__tests__/handlers/stateful-order/stateful-order-replacement-handler.test.ts
index 72215b932f..088f5773dd 100644
--- a/indexer/services/ender/__tests__/handlers/stateful-order/stateful-order-replacement-handler.test.ts
+++ b/indexer/services/ender/__tests__/handlers/stateful-order/stateful-order-replacement-handler.test.ts
@@ -217,7 +217,7 @@ describe('stateful-order-replacement-handler', () => {
 
     expect(logger.error).toHaveBeenCalledWith(expect.objectContaining({
       at: 'StatefulOrderReplacementHandler#handleOrderReplacement',
-      message: 'Unable to cancel replaced order because orderId not found',
+      message: 'StatefulOrderReplacementHandler#Unable to cancel replaced order because orderId not found',
       orderId: defaultStatefulOrderReplacementEvent.orderReplacement!.oldOrderId,
     }));
 
diff --git a/indexer/services/ender/src/handlers/stateful-order/stateful-order-replacement-handler.ts b/indexer/services/ender/src/handlers/stateful-order/stateful-order-replacement-handler.ts
index af4700b2af..b392443bec 100644
--- a/indexer/services/ender/src/handlers/stateful-order/stateful-order-replacement-handler.ts
+++ b/indexer/services/ender/src/handlers/stateful-order/stateful-order-replacement-handler.ts
@@ -35,15 +35,18 @@ export class StatefulOrderReplacementHandler
     const oldOrderId = this.event.orderReplacement!.oldOrderId!;
     const order = this.event.orderReplacement!.order!;
 
-    // Only one error is expected that's related to order replacement.
-    // If more errors are added to `dydx_stateful_order_handler.sql`, this will need to be updated.
     if (resultRow.errors != null) {
-      logger.error({
-        at: 'StatefulOrderReplacementHandler#handleOrderReplacement',
-        message: resultRow.errors[0],
-        orderId: oldOrderId,
-      });
-      stats.increment(`${config.SERVICE_NAME}.handle_stateful_order_replacement.old_order_id_not_found_in_db`, 1);
+      // We expect the first error to be related to order replacement.
+      // If more errors are added to `dydx_stateful_order_handler.sql`, this may need to be updated
+      const errorMessage = resultRow.errors[0];
+      if (errorMessage.includes('StatefulOrderReplacementHandler#')) {
+        logger.error({
+          at: 'StatefulOrderReplacementHandler#handleOrderReplacement',
+          message: errorMessage,
+          orderId: oldOrderId,
+        });
+        stats.increment(`${config.SERVICE_NAME}.handle_stateful_order_replacement.old_order_id_not_found_in_db`, 1);
+      }
     }
 
     return this.createKafkaEvents(oldOrderId, order);
diff --git a/indexer/services/ender/src/scripts/handlers/dydx_stateful_order_handler.sql b/indexer/services/ender/src/scripts/handlers/dydx_stateful_order_handler.sql
index 153803006c..1d5eb9efb3 100644
--- a/indexer/services/ender/src/scripts/handlers/dydx_stateful_order_handler.sql
+++ b/indexer/services/ender/src/scripts/handlers/dydx_stateful_order_handler.sql
@@ -50,7 +50,7 @@ BEGIN
         RETURNING * INTO order_record;
 
         IF NOT FOUND THEN
-            errors_response = array_append(errors_response, '"Unable to cancel replaced order because orderId not found"'::jsonb);
+            errors_response = array_append(errors_response, '"StatefulOrderReplacementHandler#Unable to cancel replaced order because orderId not found"'::jsonb);
         END IF;
     END IF;
     order_record := NULL; /* Reset order_record so the order place below doesn't carry over any values set above. */