From d7097733e009fdbb47ab5229830b6b9eae0ca218 Mon Sep 17 00:00:00 2001
From: gowthaman <gowthaman.b@m2pfintech.com>
Date: Mon, 12 Aug 2024 09:10:24 +0530
Subject: [PATCH] add mdn/mrn filter

---
 .../kotlin/com/restapi/controllers/Filters.kt | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt
index ca3aa0c..7d1f22b 100644
--- a/src/main/kotlin/com/restapi/controllers/Filters.kt
+++ b/src/main/kotlin/com/restapi/controllers/Filters.kt
@@ -2,6 +2,7 @@ package com.restapi.controllers
 
 import com.restapi.domain.*
 import com.restapi.domain.Session.database
+import io.ebean.ExpressionList
 import net.jodah.expiringmap.ExpiringMap
 import java.time.LocalDate
 import java.util.concurrent.TimeUnit
@@ -210,7 +211,7 @@ fun searchPos(commonFilters: CommonFilters, poFilters0: POFilters?): List<Purcha
                 ilike("poNum", "%" + poFilters.poNumLike + "%")
             }
         }
-    if(poFilters.onlyActive){
+    if (poFilters.onlyActive) {
         q.gt("validTill", LocalDate.now().minusDays(1))
     }
     applyFromToHelper(q, commonFilters.from, commonFilters.to, "poDate")
@@ -239,19 +240,25 @@ fun searchIncomingInventory(
     applyVendorHelper(q, commonFilters.vendor)
     applyPlantFilter(q, commonFilters.plant)
     applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
+    applyInwardFilter(q, incomingInventoryFilters)
     return q.findList()
 }
 
+fun applyInwardFilter(q: ExpressionList<IncomingInventory>, incomingInventoryFilters: IncomingInventoryFilters) {
+    if (incomingInventoryFilters.mrnLike.isNotEmpty() && incomingInventoryFilters.mrnLike != "%") {
+        q.eq("mrn", incomingInventoryFilters.mrnLike)
+    }
+}
+
 fun searchOutgoingInventory(
     commonFilters: CommonFilters,
     outgoingInventoryFilters: OutgoingInventoryFilters
 ): List<OutgoingInventory> {
-    val q = database.find(OutgoingInventory::class.java)
-        .where()
-      //  .ilike("mdn", "%" + outgoingInventoryFilters.mdnLike + "%")
-      //  .ilike("purpose", "%" + outgoingInventoryFilters.purposeLike + "%")
-    // .ilike("person", "%" + outgoingInventoryFilters.personLike + "%")
-    //.ilike("vehicle", "%" + outgoingInventoryFilters.vehicleLike + "%")
+    val q = database.find(OutgoingInventory::class.java).where()
+
+    if (outgoingInventoryFilters.mdnLike.isNotEmpty() && outgoingInventoryFilters.mdnLike != "%") {
+        q.eq("mdn", outgoingInventoryFilters.mdnLike)
+    }
     if (outgoingInventoryFilters.outMode != OutMode.ALL) {
         q.eq("outMode", outgoingInventoryFilters.outMode)
     }