From e9dfc4a9b8b1d5d2dfdd6c3c53c4df6564ad71eb Mon Sep 17 00:00:00 2001
From: oluexpert99 <farooq@techservicehub.io>
Date: Fri, 23 Jan 2026 15:13:09 +0100
Subject: [PATCH] FINERACT-2446: Tax Group and Tax Component APIs return HTTP
 500 when no record is found (empty result), instead of returning a proper
 HTTP 404 Not Found

---
 .../fineract/integrationtests/TaxesTest.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/TaxesTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/TaxesTest.java
index baba20f1d..57b557bd7 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/TaxesTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/TaxesTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -29,6 +33,7 @@ import org.apache.fineract.client.models.PostTaxesComponentsResponse;
 import org.apache.fineract.client.models.PostTaxesGroupRequest;
 import org.apache.fineract.client.models.PostTaxesGroupResponse;
 import org.apache.fineract.client.models.PostTaxesGroupTaxComponents;
+import org.apache.fineract.client.util.CallFailedRuntimeException;
 import org.apache.fineract.integrationtests.common.TaxComponentHelper;
 import org.apache.fineract.integrationtests.common.TaxGroupHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -114,4 +119,28 @@ public class TaxesTest {
         return taxComponentRespose.getResourceId();
     }
 
+    @Test
+    void retrieveTaxGroupWithNonExistentId_shouldReturn404() {
+        final Long nonExistentTaxGroupId = 99999L;
+
+        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
+                () -> TaxGroupHelper.retrieveTaxGroup(nonExistentTaxGroupId));
+
+        assertEquals(404, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("error.msg.tax.group.id.invalid"),
+                "Response should contain the error code for tax group not found");
+    }
+
+    @Test
+    void retrieveTaxComponentWithNonExistentId_shouldReturn404() {
+        final Long nonExistentTaxComponentId = 99999L;
+
+        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
+                () -> TaxComponentHelper.retrieveTaxComponent(nonExistentTaxComponentId));
+
+        assertEquals(404, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("error.msg.tax.component.id.invalid"),
+                "Response should contain the error code for tax component not found");
+    }
+
 }