tormakris/input-service
1
0
Fork 0
Code Pull Requests Releases Activity

refactor to input service skeleton
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Torma Kristóf
2020-05-20 22:49:48 +02:00
parent 9fd976a298
commit 34621b432c
6 changed files with 30 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/dao/InputObjects.kt
View File

@@ -8,6 +8,6 @@ import java.time.LocalDate
object InputObjects : IntIdTable() {
val tag: Column<String> = varchar("tag",32)
val date: Column<LocalDate> = date("date").default(LocalDate.now())
val probability: Column<Double> = double("probability")
val device_id: Column<String> = varchar("device_id", 32)
override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id")
}

2
src/database/model/InputObject.kt
View File

@@ -9,5 +9,5 @@ class InputObject(id: EntityID<Int>): IntEntity(id) {
companion object : IntEntityClass<InputObject>(InputObjects)
var tag by InputObjects.tag
var date by InputObjects.date
var probability by InputObjects.probability
var device_id by InputObjects.device_id
}

10
src/database/service/IInputObjectService.kt
View File

@@ -5,12 +5,6 @@ import java.time.LocalDate
interface IInputObjectService{
fun addOne(apiObject: ApiObject)
suspend fun getAllResultObjects(): List<ApiObject>
suspend fun getResultObjectbyTag(tag: String): ApiObject?
suspend fun getResultObjectbyDate(date: LocalDate): List<ApiObject>?
suspend fun getResultObjectbeforeDate(date: LocalDate): List<ApiObject>?
suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>?
suspend fun getResultObjecGreaterthanProbability(probability: Double): List<ApiObject>?
suspend fun getResultObjecLessthanProbability(probability: Double): List<ApiObject>?
suspend fun getResultObjecEqualsProbability(probability: Double): List<ApiObject>?
suspend fun getAllInputObjects(): List<ApiObject>
suspend fun getInputObjectbyTag(tag: String): ApiObject?
}

51
src/database/service/InputObjectService.kt
View File

@@ -17,61 +17,26 @@ class InputObjectService : IInputObjectService {
transaction {
InputObject.new {
tag = apiObject.tag
probability = apiObject.probability
device_id = apiObject.device_id
}
}
}
override suspend fun getAllResultObjects(): List<ApiObject> = dbQuery {
InputObjects.selectAll().map { toResultObject(it) }
override suspend fun getAllInputObjects(): List<ApiObject> = dbQuery {
InputObjects.selectAll().map { toInputObject(it) }
}
override suspend fun getResultObjectbyTag(tag: String): ApiObject? = dbQuery {
override suspend fun getInputObjectbyTag(tag: String): ApiObject? = dbQuery {
InputObjects.select {
(InputObjects.tag eq tag)
}.mapNotNull { toResultObject(it) }
}.mapNotNull { toInputObject(it) }
.singleOrNull()
}
override suspend fun getResultObjectbyDate(date: LocalDate): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.date eq date)
}.mapNotNull { toResultObject(it) }
}
override suspend fun getResultObjectbeforeDate(date: LocalDate): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.date less date)
}.mapNotNull { toResultObject(it) }
}
override suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.date greater date)
}.mapNotNull { toResultObject(it) }
}
override suspend fun getResultObjecGreaterthanProbability(probability: Double): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.probability greater probability)
}.mapNotNull { toResultObject(it) }
}
override suspend fun getResultObjecLessthanProbability(probability: Double): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.probability less probability)
}.mapNotNull { toResultObject(it) }
}
override suspend fun getResultObjecEqualsProbability(probability: Double): List<ApiObject>? = dbQuery {
InputObjects.select {
(InputObjects.probability eq probability)
}.mapNotNull { toResultObject(it) }
}
private fun toResultObject(row: ResultRow): ApiObject =
private fun toInputObject(row: ResultRow): ApiObject =
ApiObject(
tag = row[InputObjects.tag],
probability = row[InputObjects.probability]
date = row[InputObjects.date],
device_id = row[InputObjects.device_id]
)
}