From 06ffbd86f5cad41c67351119f032b77fb98ae1f7 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Sun, 1 Feb 2026 14:34:03 +0530
Subject: [PATCH] Hide closed Razorpay requests from list

---
 .../RazorpayPaymentRequestsController.kt      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayPaymentRequestsController.kt b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayPaymentRequestsController.kt
index 32d29d8..af9e4d9 100644
--- a/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayPaymentRequestsController.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/controller/RazorpayPaymentRequestsController.kt
@@ -54,7 +54,9 @@ class RazorpayPaymentRequestsController(
             throw ResponseStatusException(HttpStatus.NOT_FOUND, "Booking not found for property")
         }
 
-        val qrItems = qrRequestRepo.findByBookingIdOrderByCreatedAtDesc(bookingId).map { qr ->
+        val qrItems = qrRequestRepo.findByBookingIdOrderByCreatedAtDesc(bookingId)
+            .filter { !isQrClosed(it.status) }
+            .map { qr ->
             RazorpayPaymentRequestResponse(
                 type = "QR",
                 requestId = qr.id!!,
@@ -68,7 +70,9 @@ class RazorpayPaymentRequestsController(
             )
         }
 
-        val linkItems = paymentLinkRequestRepo.findByBookingIdOrderByCreatedAtDesc(bookingId).map { link ->
+        val linkItems = paymentLinkRequestRepo.findByBookingIdOrderByCreatedAtDesc(bookingId)
+            .filter { !isLinkClosed(it.status) }
+            .map { link ->
             RazorpayPaymentRequestResponse(
                 type = "PAYMENT_LINK",
                 requestId = link.id!!,
@@ -173,4 +177,18 @@ class RazorpayPaymentRequestsController(
         val encoded = Base64.getEncoder().encodeToString(raw.toByteArray())
         return "Basic $encoded"
     }
+
+    private fun isQrClosed(status: String?): Boolean {
+        return when (status?.lowercase()) {
+            "closed", "expired", "credited" -> true
+            else -> false
+        }
+    }
+
+    private fun isLinkClosed(status: String?): Boolean {
+        return when (status?.lowercase()) {
+            "cancelled", "canceled", "paid", "expired" -> true
+            else -> false
+        }
+    }
 }