From 357f5337cdcc2194b6ab515a0c8de599f40a5766 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Sun, 1 Feb 2026 11:11:33 +0530
Subject: [PATCH] Fix null order id handling in Razorpay webhook

---
 .../trisolarisserver/controller/RazorpayWebhookCapture.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayWebhookCapture.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayWebhookCapture.kt
index a8179fd..df26942 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayWebhookCapture.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayWebhookCapture.kt
@@ -78,8 +78,8 @@ class RazorpayWebhookCapture(
         val paymentEntity = root.path("payload").path("payment").path("entity")
         val orderEntity = root.path("payload").path("order").path("entity")
         val paymentId = paymentEntity.path("id").asText(null)
-        val orderId = paymentEntity.path("order_id").asText(null).ifBlank { null }
-            ?: orderEntity.path("id").asText(null)
+        val orderId = paymentEntity.path("order_id").asText(null)?.takeIf { it.isNotBlank() }
+            ?: orderEntity.path("id").asText(null)?.takeIf { it.isNotBlank() }
         val status = paymentEntity.path("status").asText(null)
         val amountPaise = paymentEntity.path("amount").asLong(0)
         val currency = paymentEntity.path("currency").asText(property.currency)