From 9056c6d03a9cfdeb29981a94126f34f72a514387 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 17 Feb 2023 11:27:29 +0500
Subject: [PATCH 1/3] Update query to avoid exception

---
 .../custom/xml/CustomLocationMetadataMapper.xml     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomLocationMetadataMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomLocationMetadataMapper.xml
index 9c2116571..555225bce 100755
--- a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomLocationMetadataMapper.xml
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomLocationMetadataMapper.xml
@@ -214,11 +214,14 @@
 			WITH RECURSIVE locations
 			AS
 			( SELECT lm1.geojson_id, lm1.parent_id, lm1.location_id, 0 as level
-				FROM core.location_metadata lm1 WHERE geojson_id  IN
-			 	<foreach collection="identifiers" item="value"  open="(" separator="," close=")">
-	       			#{value}
-	   			</foreach>
-		        AND lm1.status IN ('ACTIVE', 'PENDING_REVIEW')
+				FROM core.location_metadata lm1
+				WHERE lm1.status IN ('ACTIVE', 'PENDING_REVIEW')
+				<if test="identifiers != null">
+					AND geojson_id  IN
+					<foreach collection="identifiers" item="value"  open="(" separator="," close=")">
+						#{value}
+					</foreach>
+				</if>
 				UNION
 				SELECT lm2.geojson_id, lm2.parent_id, lm2.location_id,level+1 as level
 				FROM locations lm1

From ddcbe9c09d1c67e3a2be7c19018b793b51bbabb8 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 17 Feb 2023 11:41:38 +0500
Subject: [PATCH 2/3] Bump up core version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6089186fd..b9f120dd0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.14.5-SNAPSHOT</version>
+	<version>2.14.6-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 178b44fa953476581f8b772151152fd13f5ba763 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 17 Feb 2023 11:46:10 +0500
Subject: [PATCH 3/3] Bump up core version to v2.14.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ab5d2223b..a6fc02ebc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.14.6-SNAPSHOT</version>
+	<version>2.14.7-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>