diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt index af1ffff..bce1147 100644 --- a/src/main/kotlin/com/restapi/controllers/Filters.kt +++ b/src/main/kotlin/com/restapi/controllers/Filters.kt @@ -19,6 +19,7 @@ data class CommonFilters( val from: LocalDate = baseDate, val to: LocalDate = maxDate, val vendor: List? = null, + val plant: List? = null, val sortAsc: Boolean = true, val sortBy: String = IGNORE ) @@ -112,14 +113,18 @@ data class ReminderLogFilters( fun applyVendorHelper(q: io.ebean.ExpressionList, vids: List?) { if (vids.isNullOrEmpty()) return -// q.apply { -// q.`in`("vendor", vids) -// } -// println(vids) -// println(vids[0]) q.eq("vendor_sys_pk", vids[0]) } +fun applyPlantFilter(q: io.ebean.ExpressionList, vids: List?) { + + if (vids.isNullOrEmpty()) { + q.`in`("unloadingPlantId", Session.currentUserPlants().map { it.plantId }) + } else { + q.`in`("unloadingPlantId", vids) + } +} + fun applySortHelper(q: io.ebean.ExpressionList, sortBy: String, asc: Boolean) { if (sortBy == IGNORE) return; val order = if (asc) "ASC" else "DESC" @@ -232,7 +237,7 @@ fun searchIncomingInventory( val q = database.find(IncomingInventory::class.java).where() applyFromToHelper(q, commonFilters.from, commonFilters.to, "date") applyVendorHelper(q, commonFilters.vendor) - q.`in`("unloadingPlantId", Session.currentUserPlants().map { it.plantId }) + applyPlantFilter(q, commonFilters.plant) applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc) return q.findList() } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 7eb710d..8d7159d 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -21,7 +21,7 @@ - +