From 712543ec3c9899eb75543dfeae8375bd8968bd1e Mon Sep 17 00:00:00 2001
From: gowthaman <gowthaman.b@m2pfintech.com>
Date: Tue, 30 Apr 2024 01:05:54 +0530
Subject: [PATCH] add display, but no edit yet

---
 src/main/kotlin/com/restapi/Main.kt                 | 6 ++++++
 src/main/kotlin/com/restapi/controllers/Entities.kt | 6 ++++++
 src/main/kotlin/com/restapi/controllers/Filters.kt  | 8 ++++----
 src/main/kotlin/com/restapi/domain/db.kt            | 8 ++++----
 src/main/resources/logback.xml                      | 2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/com/restapi/Main.kt b/src/main/kotlin/com/restapi/Main.kt
index 4d006d4..627d980 100644
--- a/src/main/kotlin/com/restapi/Main.kt
+++ b/src/main/kotlin/com/restapi/Main.kt
@@ -125,6 +125,12 @@ fun main(args: Array<String>) {
                     put("/{id}", VendorCtrl::update, Roles(Role.Explicit("ROLE_VENDOR_CREATE")))
                 }
                 path("/incoming") {
+                    get("/plants", IncomingInventoryCtrl::plantsForUser,
+                        Roles(
+                            Role.Explicit("ROLE_INVENTORY_CREATE"),
+                            Role.Explicit("ROLE_INVENTORY_VIEW")
+                        )
+                    )
                     post("", IncomingInventoryCtrl::create, Roles(Role.Explicit("ROLE_INVENTORY_CREATE")))
                     get("/next", IncomingInventoryCtrl::getNextNum, Roles(Role.Explicit("ROLE_INVENTORY_CREATE")))
                     get(
diff --git a/src/main/kotlin/com/restapi/controllers/Entities.kt b/src/main/kotlin/com/restapi/controllers/Entities.kt
index c92b8a0..fa3e11b 100644
--- a/src/main/kotlin/com/restapi/controllers/Entities.kt
+++ b/src/main/kotlin/com/restapi/controllers/Entities.kt
@@ -805,6 +805,12 @@ object RequestForQuote {
 }
 
 object IncomingInventoryCtrl {
+    fun plantsForUser(ctx: Context) {
+        ctx.json(
+            Session.currentUserPlants()
+        )
+    }
+
     fun create(ctx: Context) {
         val ticket = ctx.bodyAsClass<IncomingInventory>()
         database.save(ticket)
diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt
index cc4a6ea..933ef53 100644
--- a/src/main/kotlin/com/restapi/controllers/Filters.kt
+++ b/src/main/kotlin/com/restapi/controllers/Filters.kt
@@ -231,10 +231,10 @@ fun searchIncomingInventory(
 ): List<IncomingInventory> {
     val q = database.find(IncomingInventory::class.java)
         .where()
-        .ge("vendorBillAmount", incomingInventoryFilters.vendorBillAmountExceeds)
-        .le("vendorBillAmount", incomingInventoryFilters.vendorBillAmountLessThan)
-        .ilike("mrn", "%" + incomingInventoryFilters.mrnLike + "%")
-        .ilike("vehicle", "%" + incomingInventoryFilters.vehicleLike + "%")
+        //.ge("vendorBillAmount", incomingInventoryFilters.vendorBillAmountExceeds)
+        //.le("vendorBillAmount", incomingInventoryFilters.vendorBillAmountLessThan)
+        //.ilike("mrn", "%" + incomingInventoryFilters.mrnLike + "%")
+        //.ilike("vehicle", "%" + incomingInventoryFilters.vehicleLike + "%")
     applyFromToHelper(q, commonFilters.from, commonFilters.to, "date")
     applyVendorHelper(q, commonFilters.vendor)
     applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
diff --git a/src/main/kotlin/com/restapi/domain/db.kt b/src/main/kotlin/com/restapi/domain/db.kt
index 0e5c5d1..72ef098 100644
--- a/src/main/kotlin/com/restapi/domain/db.kt
+++ b/src/main/kotlin/com/restapi/domain/db.kt
@@ -182,14 +182,14 @@ object Session {
     fun currentTenant() = currentUser.get().tenant
     fun currentRoles() = currentUser.get().roles
     fun currentToken() = currentUser.get().token
-    fun currentUserPlants() = currentUser.get().plantIds.map {
-        Session.database.find(Plant::class.java)
+    fun currentUserPlants() = currentUser.get().plantIds.mapNotNull {
+        database.find(Plant::class.java)
             .where()
             .eq("plantId", it)
             .findOne()
-    }.filterNotNull()
+    }
 
-    fun jwk() = keypair.toParams(JsonWebKey.OutputControlLevel.PUBLIC_ONLY)
+    fun jwk(): MutableMap<String, Any> = keypair.toParams(JsonWebKey.OutputControlLevel.PUBLIC_ONLY)
 
     fun Database.findDataModelByEntityAndUniqId(entity: String, uniqId: String): DataModel {
         return find(DataModel::class.java)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index ed0ecb9..5ba8f96 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -21,7 +21,7 @@
     </appender>
 
     <!-- SQL and bind values -->
-    <logger name="io.ebean.SQL" level="WARN"/>
+    <logger name="io.ebean.SQL" level="TRACE"/>
 
     <!-- Transaction Commit and Rollback events -->
     <logger name="io.ebean.TXN" level="DEBUG"/>