Excel to Db

api.http

@@ -93,16 +93,20 @@ Authorization: {{auth-token}}
 DELETE  http://localhost:9001/api/vehicle/KA01HD6667
 Authorization: {{auth-token}}
 
-### get po for id
+### get products
 GET  http://localhost:9001/api/vendor/product
 Authorization: {{auth-token}}
 
-### get product for id
-GET  http://localhost:9001/api/vendor/product/7
+### get products by hsn code
+GET  http://localhost:9001/api/vendor/product/#123
 Authorization: {{auth-token}}
 
-### get row
-GET http://localhost:9001/api/vendor/product/7
+### create excel for products
+POST  http://localhost:9001/api/vendor/product/product-excel
+Authorization: {{auth-token}}
+
+### excel read
+GET http://localhost:9001/api/vendor/product/validation
 Authorization: Bearer {{auth-token}}
 
 ### create product
@@ -130,5 +134,9 @@ Authorization: {{auth-token}}
 
 
 ### delete a row
-DELETE  http://localhost:9001/api/vendor/product/2
+DELETE  http://localhost:9001/api/vendor/product/#1
+Authorization: {{auth-token}}
+
+###
+POST http://localhost:9001/api/vendor/product/import
 Authorization: {{auth-token}}

build.gradle.kts

@@ -36,8 +36,8 @@ dependencies {
     implementation("org.yaml:snakeyaml:2.2")
     implementation("io.minio:minio:8.5.7")
     implementation("org.apache.httpcomponents:httpclient:4.5.14")
-    implementation("org.apache.poi:poi:5.0.0")
-    implementation("org.apache.poi:poi-ooxml:5.0.0")
+    implementation("org.apache.poi:poi:5.2.3")
+    implementation("org.apache.poi:poi-ooxml:5.2.3")
     api ("net.cactusthorn.config:config-core:0.81")
     api ("net.cactusthorn.config:config-yaml:0.81")
     kapt("net.cactusthorn.config:config-compiler:0.81")

src/main/kotlin/com/restapi/Main.kt

@@ -7,7 +7,7 @@ import com.restapi.config.Auth.validateAuthToken
 import com.restapi.controllers.*
 import com.restapi.domain.DataNotFoundException
 import com.restapi.domain.Product
-import com.restapi.domain.Session
+import com.restapi.domain.Session.a
 import com.restapi.domain.Session.currentTenant
 import com.restapi.domain.Session.currentUser
 import com.restapi.domain.Session.objectMapper
@@ -25,6 +25,7 @@ import io.javalin.http.util.RateLimitUtil
 import io.javalin.json.JavalinJackson
 import org.jose4j.jwt.consumer.InvalidJwtException
 import org.slf4j.LoggerFactory
+import java.io.InputStream
 import java.security.MessageDigest
 import java.time.LocalDateTime
 import java.util.*
@@ -112,78 +113,158 @@ fun main(args: Array<String>) {
                     it.json(mapOf("status" to true))
                 }
 
-                path("/vendor"){
-                    path("/"){
+                path("/vendor") {
+                    path("/") {
                         post("", Vendor::create, Roles(Role.Explicit(listOf("ROLE_VENDOR_CREATE", "ROLE_ADMIN"))))
-                        get("", Vendor::get, Roles(Role.Explicit(listOf("ROLE_VENDOR_VIEW", "ROLE_VENDOR_CREATE", "ROLE_ADMIN"))))
-                        get("quotes/{id}", Vendor::getQuotes, Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_QUOTE_VIEW", "ROLE_QUOTE_CREATE", "ROLE_VENDOR_VIEW"))))
-                        get("pos/{id}", Vendor::getPos, Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_PO_VIEW", "ROLE_PO_CREATE`"))))
+                        get(
+                            "",
+                            Vendor::get,
+                            Roles(Role.Explicit(listOf("ROLE_VENDOR_VIEW", "ROLE_VENDOR_CREATE", "ROLE_ADMIN")))
+                        )
+                        get(
+                            "quotes/{id}",
+                            Vendor::getQuotes,
+                            Roles(
+                                Role.Explicit(
+                                    listOf(
+                                        "ROLE_ADMIN",
+                                        "ROLE_QUOTE_VIEW",
+                                        "ROLE_QUOTE_CREATE",
+                                        "ROLE_VENDOR_VIEW"
+                                    )
+                                )
+                            )
+                        )
+                        get(
+                            "pos/{id}",
+                            Vendor::getPos,
+                            Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_PO_VIEW", "ROLE_PO_CREATE`")))
+                        )
                         put("/rate/{id}/{rating}", Vendor::rate, Roles(Role.Explicit(listOf("ROLE_VENDOR_CREATE"))))
                     }
-                    path("/po"){
+                    path("/po") {
                         post("", PurchaseOrder::create, Roles(Role.Explicit(listOf("ROLE_PO_CREATE", "ROLE_ADMIN"))))
-                        get("/{id}", PurchaseOrder::get, Roles(Role.Explicit(listOf("ROLE_PO_CREATE", "ROLE_PO_VIEW", "ROLE_QUOTE_CREATE"))))
-                        put("/approve/{id}", PurchaseOrder::approve, Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_APPROVE"))))
-                        put("/reject/{id}", PurchaseOrder::reject, Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_APPROVE"))))
-                        get("/refQuote/{id}", PurchaseOrder::quoteReference, Roles(Role.Explicit(listOf("ROLE_PO_CREATE", "ROLE_PO_VIEW"))))
+                        get(
+                            "/{id}",
+                            PurchaseOrder::get,
+                            Roles(Role.Explicit(listOf("ROLE_PO_CREATE", "ROLE_PO_VIEW", "ROLE_QUOTE_CREATE")))
+                        )
+                        put(
+                            "/approve/{id}",
+                            PurchaseOrder::approve,
+                            Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_APPROVE")))
+                        )
+                        put(
+                            "/reject/{id}",
+                            PurchaseOrder::reject,
+                            Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_APPROVE")))
+                        )
+                        get(
+                            "/refQuote/{id}",
+                            PurchaseOrder::quoteReference,
+                            Roles(Role.Explicit(listOf("ROLE_PO_CREATE", "ROLE_PO_VIEW")))
+                        )
                     }
-                    path("/quote"){
+                    path("/quote") {
                         post("", Quotation::create, Roles(Role.Explicit(listOf("ROLE_QUOTE_CREATE", "ROLE_ADMIN"))))
-                        get("/{id}", Quotation::get, Roles(Role.Explicit(listOf("ROLE_QUOTE_VIEW", "ROLE_ADMIN", "ROLE_PO_CREATE", "ROLE_QUOTE_CREATE"))))
-                        get("/po/{id}", Quotation::generatePO, Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_PO_CRETE"))))
-                        get("/rfq/{rfqNum}", Quotation::reqForQuote, Roles(Role.Explicit(listOf("ROLE_QUOTE_CREATE", "ROLE_QUOTE_VIEW"))))
-                        delete("/{id}", Quotation::delete, Roles(Role.Explicit(listOf("ROLE_QUOTE_CREATE", "ROLE_ADMIN"))))
+                        get(
+                            "/{id}",
+                            Quotation::get,
+                            Roles(
+                                Role.Explicit(
+                                    listOf(
+                                        "ROLE_QUOTE_VIEW",
+                                        "ROLE_ADMIN",
+                                        "ROLE_PO_CREATE",
+                                        "ROLE_QUOTE_CREATE"
+                                    )
+                                )
+                            )
+                        )
+                        get(
+                            "/po/{id}",
+                            Quotation::generatePO,
+                            Roles(Role.Explicit(listOf("ROLE_ADMIN", "ROLE_PO_CRETE")))
+                        )
+                        get(
+                            "/rfq/{rfqNum}",
+                            Quotation::reqForQuote,
+                            Roles(Role.Explicit(listOf("ROLE_QUOTE_CREATE", "ROLE_QUOTE_VIEW")))
+                        )
+                        delete(
+                            "/{id}",
+                            Quotation::delete,
+                            Roles(Role.Explicit(listOf("ROLE_QUOTE_CREATE", "ROLE_ADMIN")))
+                        )
                     }
-                    path("/product"){
+                    path("/product") {
                         post("", ProductCtrl::create, Roles(Role.Explicit(listOf("ROLE_PRODUCT_CREATE", "ROLE_ADMIN"))))
-                        //get("/{hsnCode}", ProductCtrl::get, Roles(Role.Explicit(listOf("ROLE_PRODUCT_VIEW", "ROLE_ADMIN"))))
+                        get("/{hsnCode}", ProductCtrl::get, Roles(Role.Explicit(listOf("ROLE_PRODUCT_VIEW", "ROLE_ADMIN"))))
+                        patch("/{id}", ProductCtrl::patch, Roles(Role.Explicit(listOf("ROLE_PRODUCT_UPDATE", "ROLE_ADMIN"))))
                         put("/{id}", ProductCtrl::update, Roles(Role.Explicit(listOf("ROLE_PRODUCT_UPDATE", "ROLE_ADMIN"))))
-                        //patch("/{id}", ProductCtrl::patch, Roles(Role.Explicit(listOf("ROLE_PRODUCT_UPDATE", "ROLE_ADMIN"))))
                         delete("/{id}", ProductCtrl::delete, Roles(Role.Explicit(listOf("ROLE_PRODUCT_DELETE", "ROLE_ADMIN"))))
                         get("", ProductCtrl::getAll, Roles(Role.Explicit(listOf("ROLE_PRODUCT_VIEW", "ROLE_ADMIN"))))
+                        post("/product-excel", ProductCtrl::prodExcel)
+                        post("/import") {ctx -> ctx.json(excelToDb())}
                     }
-                    path("/doc"){
-                        post("", Document::create, Roles(Role.Explicit(listOf("ROLE_DOC_CREATE", "ROLE_ADMIN"))))
-                        //why type and refid are clubbed ??
-                        get("/{type}/{refId}", Document::getWithRefId, Roles(Role.Explicit(listOf("ROLE_DOC_VIEW", "ROLE_ADMIN", "ROLE_PRODUCT_CREATE"))))
-                        get("/{id}", Document::get, Roles(Role.Explicit(listOf("ROLE_DOC_VIEW", "ROLE_ADMIN", "ROLE_PRODUCT_CREATE"))))
-                        get("/print/{id}", Document::print, Roles(Role.Explicit(listOf("ROLE_DOC_CREATE", "ROLE_DOC_VIEW"))))
-                        delete("/{id}", Document::delete, Roles(Role.Explicit(listOf("ROLE_DOC_CREATE"))))
-                    }
-                    path("/reqForQuote"){
-                        post("", RequestForQuote::create, Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE"))))
-                        get("/{id}", RequestForQuote::get, Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE", "ROLE_RFQ_VIEW"))))
-                        put("/{id}", RequestForQuote::update, Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE"))))
+                        path("/doc") {
+                            post("", Document::create, Roles(Role.Explicit(listOf("ROLE_DOC_CREATE", "ROLE_ADMIN"))))
+                            //why type and refid are clubbed ??
+                            get(
+                                "/{type}/{refId}",
+                                Document::getWithRefId,
+                                Roles(Role.Explicit(listOf("ROLE_DOC_VIEW", "ROLE_ADMIN", "ROLE_PRODUCT_CREATE")))
+                            )
+                            get(
+                                "/{id}",
+                                Document::get,
+                                Roles(Role.Explicit(listOf("ROLE_DOC_VIEW", "ROLE_ADMIN", "ROLE_PRODUCT_CREATE")))
+                            )
+                            get(
+                                "/print/{id}",
+                                Document::print,
+                                Roles(Role.Explicit(listOf("ROLE_DOC_CREATE", "ROLE_DOC_VIEW")))
+                            )
+                            delete("/{id}", Document::delete, Roles(Role.Explicit(listOf("ROLE_DOC_CREATE"))))
+                        }
+                        path("/reqForQuote") {
+                            post("", RequestForQuote::create, Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE"))))
+                            get(
+                                "/{id}",
+                                RequestForQuote::get,
+                                Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE", "ROLE_RFQ_VIEW")))
+                            )
+                            put("/{id}", RequestForQuote::update, Roles(Role.Explicit(listOf("ROLE_RFQ_CREATE"))))
+                        }
                     }
+                    post("/script/database/{name}", Entities::executeStoredProcedure, Roles(adminRole, Role.DbOps))
+                    post("/script/{file}/{name}", Entities::executeScript, Roles(adminRole, Role.DbOps))
+
+                    get("/{entity}/{id}", Entities::view, Roles(adminRole, viewRole))
+                    post("/{entity}/query/{id}", Entities::sqlQueryById, Roles(adminRole, viewRole))
+                    post("/{entity}/query", Entities::sqlQueryRaw, Roles(adminRole, viewRole))
+                    post("/{entity}", Entities::create, Roles(adminRole, createRole))
+
+                    put("/{entity}/approve/{id}", Entities::approve, Roles(adminRole, approveOrRejectRole))
+                    put("/{entity}/reject/{id}", Entities::reject, Roles(adminRole, approveOrRejectRole))
+                    put("/{entity}/{action}/{id}", Entities::action, Roles(adminRole, Role.Entity))
+
+                    put("/{entity}/{id}", Entities::update, Roles(adminRole, updateRole))
+                    patch("/{entity}/{id}", Entities::patch, Roles(adminRole, updateRole))
+                    delete("/{entity}/{id}", Entities::delete, Roles(adminRole, Role.Standard(Action.DELETE)))
                 }
-                post("/script/database/{name}", Entities::executeStoredProcedure, Roles(adminRole, Role.DbOps))
-                post("/script/{file}/{name}", Entities::executeScript, Roles(adminRole, Role.DbOps))
-
-                get("/{entity}/{id}", Entities::view, Roles(adminRole, viewRole))
-                post("/{entity}/query/{id}", Entities::sqlQueryById, Roles(adminRole, viewRole))
-                post("/{entity}/query", Entities::sqlQueryRaw, Roles(adminRole, viewRole))
-                post("/{entity}", Entities::create, Roles(adminRole, createRole))
-
-                put("/{entity}/approve/{id}", Entities::approve, Roles(adminRole, approveOrRejectRole))
-                put("/{entity}/reject/{id}", Entities::reject, Roles(adminRole, approveOrRejectRole))
-                put("/{entity}/{action}/{id}", Entities::action, Roles(adminRole, Role.Entity))
-
-                put("/{entity}/{id}", Entities::update, Roles(adminRole, updateRole))
-                patch("/{entity}/{id}", Entities::patch, Roles(adminRole, updateRole))
-                delete("/{entity}/{id}", Entities::delete, Roles(adminRole, Role.Standard(Action.DELETE)))
             }
+                .exception(DuplicateKeyException::class.java, Exceptions.dupKeyExceptionHandler)
+                .exception(DataIntegrityException::class.java, Exceptions.dataIntegrityException)
+                .exception(DataNotFoundException::class.java, Exceptions.dataNotFoundException)
+                .exception(IllegalArgumentException::class.java, Exceptions.illegalArgumentException)
+                .exception(JsonMappingException::class.java, Exceptions.jsonMappingException)
+                .exception(InvalidJwtException::class.java, Exceptions.invalidJwtException)
+                .start(appConfig.portNumber())
         }
-        .exception(DuplicateKeyException::class.java, Exceptions.dupKeyExceptionHandler)
-        .exception(DataIntegrityException::class.java, Exceptions.dataIntegrityException)
-        .exception(DataNotFoundException::class.java, Exceptions.dataNotFoundException)
-        .exception(IllegalArgumentException::class.java, Exceptions.illegalArgumentException)
-        .exception(JsonMappingException::class.java, Exceptions.jsonMappingException)
-        .exception(InvalidJwtException::class.java, Exceptions.invalidJwtException)
-        .start(appConfig.portNumber())
-}
 
-private fun Context.getAuthHeader() = header("Authorization")
-    ?.replace("Bearer ", "")
-    ?.replace("Bearer: ", "")
-    ?.trim()
+    private fun Context.getAuthHeader() = header("Authorization")
+        ?.replace("Bearer ", "")
+        ?.replace("Bearer: ", "")
+        ?.trim()
 

src/main/kotlin/com/restapi/controllers/Entities.kt

@@ -17,7 +17,13 @@ import com.restapi.integ.Scripting
 import io.ebean.CallableSql
 import io.ebean.RawSqlBuilder
 import io.javalin.http.*
+import org.apache.poi.ss.usermodel.Cell
+import org.apache.poi.ss.usermodel.CellType
+import org.apache.poi.ss.usermodel.WorkbookFactory
 import org.slf4j.LoggerFactory
+import java.io.File
+import java.io.FileInputStream
+import java.io.InputStream
 import java.sql.Types
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -414,7 +420,6 @@ object PurchaseOrder {
 
 data class ProductSearch(
     var isSort: String? = null
-
 )
 
 object ProductCtrl {
@@ -427,7 +432,7 @@ object ProductCtrl {
     fun getAll(ctx: Context){
         val productList = Session.database.find(Product::class.java)
             .findList()
-            .sortedBy { it.hsnCode }
+            //.sortedBy { it.hsnCode }
 
         ctx.json(productList)
     }
@@ -446,9 +451,14 @@ object ProductCtrl {
     }
 
     fun update(ctx: Context) {
-        val id = ctx.pathParam("id")
 
     }
+    fun prodExcel(it: Context) {
+        val product = database.find(Product::class.java).findList()
+        it.result(CreateExcel(product)).contentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+            .header("Content-Disposition", "attachment; filename=\"product.xlsx\"")
+    }
+
 }
 
 object Quotation {
@@ -590,4 +600,4 @@ object RequestForQuote {
         //shuld we compare the new body fields with preexisting ones and prepare a sql query to update those fields??
 
     }
-}
+}

src/main/kotlin/com/restapi/controllers/Excel.kt

@@ -1,9 +1,184 @@
 package com.restapi.controllers
-import org.apache.poi
-import java.io.FileOutputStream
-enum class DataType {
-    QUOTE, PO, VENDOR
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.restapi.domain.Product
+import com.restapi.domain.Session
+import com.restapi.domain.Session.database
+import com.restapi.domain.UOM
+import io.ebean.text.json.JsonContext
+import io.javalin.http.Context
+import org.apache.poi.ss.usermodel.Cell
+import org.apache.poi.ss.usermodel.CellType
+import org.apache.poi.ss.usermodel.Row
+import org.apache.poi.ss.usermodel.WorkbookFactory
+import org.apache.poi.xssf.usermodel.XSSFWorkbook
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.FileInputStream
+import java.io.InputStream
+
+fun CreateExcel(productList: List<Product>): InputStream {
+    val wb = XSSFWorkbook()
+    val sh = wb.createSheet()
+    val rows: Row = sh.createRow(0)
+    rows.createCell(0).setCellValue("Name")
+    rows.createCell(1).setCellValue("Description")
+    rows.createCell(2).setCellValue("HSN")
+    rows.createCell(3).setCellValue("UOM")
+    
+    var rowNum = 1
+    for (product in productList) {
+        val row: Row = sh.createRow(rowNum++)
+
+        row.createCell(0).setCellValue(product.name)
+        row.createCell(1).setCellValue(product.description)
+        row.createCell(2).setCellValue(product.hsnCode)
+
+        val uomCell: Cell = row.createCell(3)
+        uomCell.setCellValue(product.uom?.name ?: "")
+    }
+
+    val baos = ByteArrayOutputStream()
+    wb.write(baos)
+    wb.close()
+
+    return ByteArrayInputStream(baos.toByteArray())
+
 }
-fun CreateExcel(cols :List<String>, excelFor :DataType) {
-    val wb = HSSFWorkbook()
-}
+
+data class validateExcel(
+    val name: String,
+    val description: String,
+    val hsnCode: String,
+    val ok: Boolean,
+    val err: String,
+)
+
+val app_common_om = jacksonObjectMapper().apply {
+    registerModule(JavaTimeModule())
+    configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+}
+
+fun ExcelRead(): String{
+    val inputStream = FileInputStream("C:\\Users\\vinay\\IdeaProjects\\readymixerp_modules_api_git\\product-4.xlsx")
+    val workbook = WorkbookFactory.create(inputStream)
+    val workSheet = workbook.getSheetAt(0)
+    var h = true
+    //Header check
+    if(workSheet.getRow(0).getCell(0).stringCellValue.equals("Name")) {
+        if (workSheet.getRow(0).getCell(1).stringCellValue.equals("Description")) {
+            if (workSheet.getRow(0).getCell(2).stringCellValue.equals("HSN")) {
+                if (workSheet.getRow(0).getCell(3).stringCellValue.equals("UOM")) {
+                    h = false
+                }else return "Header UOM mismatch"
+            }else return "Header-HSN mismatch"
+        }else return "Header-Desc mismatch"
+    }else return "Header-Name mismatch"
+
+    val resp = arrayListOf<validateExcel>()
+
+    if(h==false) {
+        workSheet.rowIterator().forEach { row ->
+
+            if (row == null) return@forEach
+
+            if (h) {
+
+                val pName = row.getCell(0).run {
+                    when {
+                        this == null -> ""
+                        this.cellType == CellType.STRING -> this.stringCellValue
+                        else -> ""
+                    }
+                }
+
+                val pDesc = row.getCell(1).run {
+                    when {
+                        this == null -> ""
+                        this.cellType == CellType.STRING -> this.stringCellValue
+                        else -> ""
+                    }
+                }
+                val pHsn = row.getCell(2).run {
+                    when {
+                        this == null -> ""
+                        this.cellType == CellType.STRING -> this.stringCellValue
+                        else -> ""
+                    }
+                }
+
+                if (pName.isEmpty() && pDesc.isEmpty() && pHsn.isEmpty()) {
+                    return@forEach
+                }
+                if (pName.isEmpty()) {
+                    resp.add(
+                        validateExcel(
+                            name = pName,
+                            description = pDesc,
+                            hsnCode = pHsn,
+                            ok = false,
+                            err = "Product name is required"
+                        )
+                    )
+                    return@forEach
+                }
+                if (pDesc.isEmpty()) {
+                    resp.add(
+                        validateExcel(
+                            name = pName,
+                            description = pDesc,
+                            hsnCode = pHsn,
+                            ok = false,
+                            err = "Product description is required"
+                        )
+                    )
+                    return@forEach
+                }
+                if (pHsn.isEmpty()) {
+                    resp.add(
+                        validateExcel(
+                            name = pName,
+                            description = pDesc,
+                            hsnCode = pHsn,
+                            ok = false,
+                            err = "Product HSN is required"
+                        )
+                    )
+                    return@forEach
+                }
+            }
+            h = true
+        }
+    }
+    return app_common_om.writeValueAsString(resp)
+}
+
+fun excelToDb(): List<Product> {
+    val inputStream = FileInputStream("C:\\Users\\vinay\\IdeaProjects\\readymixerp_modules_api_git\\product-4.xlsx")
+    val workbook = WorkbookFactory.create(inputStream)
+    val workSheet = workbook.getSheetAt(0)
+
+    for (row in workSheet) {
+        val cell1Value = row.getCell(0).stringCellValue
+        val cell2Value = row.getCell(1).stringCellValue
+        val cell3Value = row.getCell(2).stringCellValue
+        val cell4Value = row.getCell(3).stringCellValue
+
+        val prod = Product()
+        prod.name = cell1Value
+        prod.description = cell2Value
+        prod.hsnCode = cell3Value
+        prod.uom = when(cell4Value) {
+            "nos" -> UOM.NOS
+            "ltr" -> UOM.LTR
+            "mtr" -> UOM.MTR
+            else -> UOM.ALL
+        }
+        database.saveAll(prod)
+    }
+    val productList = Session.database.find(Product::class.java).findList()
+    return productList
+}
+

src/main/kotlin/com/restapi/controllers/Filters.kt

@@ -1,10 +1,8 @@
 package com.restapi.controllers
 
-import com.restapi.domain.DocType
+import com.restapi.domain.*
 import com.restapi.domain.PurchaseOrder
 import com.restapi.domain.Quotation
-import com.restapi.domain.ReqForQuote
-import com.restapi.domain.UOM
 import java.time.LocalDate
 import com.restapi.domain.Session.database
 
@@ -135,4 +133,13 @@ fun searchRFQ(commonFilters: CommonFilters, rfqFilters: RFQFilters) : List<ReqFo
     applyVendorHelper(q, commonFilters.vendor)
     applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc)
     return q.findList()
+}
+
+fun searchProduct(commonFilters: CommonFilters, productFilters: ProductFilters): List<Product> {
+    val p = database.find(Product::class.java)
+        .where()
+        .ilike("hsnCode", productFilters.hsnLike)
+        .ilike("Pname", productFilters.nameLike)
+    applySortHelper(p, commonFilters.sortBy, commonFilters.sortAsc)
+    return p.findList()
 }

src/main/kotlin/com/restapi/domain/models.kt

@@ -9,6 +9,7 @@ import io.ebean.annotation.*
 import io.ebean.annotation.Index
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.util.*
 import javax.persistence.*
 
 data class Comments(val text: String = "", val by: String = "", val at: LocalDateTime = LocalDateTime.now())
@@ -272,6 +273,7 @@ open class PurchaseOrder :BaseTenantModel() {
 enum class UOM {
     NOS, LTR, MTR, ALL
 }
+
 @Entity
 open class Product :BaseTenantModel() {
     var id: Int? = null
@@ -323,10 +325,10 @@ open class ReqForQuote :BaseTenantModel() {
     var potentialVendors :List<Long>? = null
     @Enumerated(EnumType.STRING)
     var status :RFQStatus? = null
-//    @DbArray
-//    var docs :List<Document>? = null
+    @DbArray
+    var docs :List<Document>? = null
     @DbJsonB
     var products :List<POProducts>? = null
-    var reqForQuoteNum: String? = null
+    var reqForQuoteNum: String = ""
     var openTill: LocalDate? = null
 }