use kotlin serialize
This commit is contained in:
@@ -2,12 +2,12 @@ package com.kmalbz.database.dao
|
||||
|
||||
import org.jetbrains.exposed.dao.id.IntIdTable
|
||||
import org.jetbrains.exposed.sql.*
|
||||
import org.jetbrains.exposed.sql.`java-time`.date
|
||||
import java.time.LocalDate
|
||||
import org.jetbrains.exposed.sql.`java-time`.datetime
|
||||
import java.time.LocalDateTime
|
||||
|
||||
object ResultObjects : IntIdTable() {
|
||||
val tag: Column<String> = varchar("tag", 32)
|
||||
val date: Column<LocalDate> = date("date").default(LocalDate.now())
|
||||
val date: Column<LocalDateTime> = datetime("date").default(LocalDateTime.now())
|
||||
val probability: Column<Double> = double("probability")
|
||||
override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id")
|
||||
}
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.kmalbz.database.service
|
||||
|
||||
import com.kmalbz.api.model.ApiObject
|
||||
import java.time.LocalDate
|
||||
import java.util.*
|
||||
import kotlinx.datetime.LocalDateTime
|
||||
|
||||
interface IResultObjectService{
|
||||
fun addOne(apiObject: ApiObject)
|
||||
@@ -10,10 +9,10 @@ interface IResultObjectService{
|
||||
suspend fun getCount(): Long
|
||||
suspend fun getPage(page: Long): 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 getResultObjectbyDate(date: LocalDateTime): List<ApiObject>
|
||||
suspend fun getResultObjectbeforeDate(date: LocalDateTime): List<ApiObject>
|
||||
suspend fun getResultObjectafterDate(date: LocalDateTime): List<ApiObject>
|
||||
suspend fun getResultObjecGreaterthanProbability(probability: Double): List<ApiObject>
|
||||
suspend fun getResultObjecLessthanProbability(probability: Double): List<ApiObject>
|
||||
suspend fun getResultObjecEqualsProbability(probability: Double): List<ApiObject>
|
||||
}
|
||||
@@ -4,12 +4,12 @@ import com.kmalbz.database.DatabaseFactory.dbQuery
|
||||
import com.kmalbz.database.model.ResultObject
|
||||
import com.kmalbz.database.dao.ResultObjects
|
||||
import com.kmalbz.api.model.ApiObject
|
||||
import kotlinx.datetime.LocalDateTime
|
||||
import kotlinx.datetime.toJavaLocalDateTime
|
||||
import org.jetbrains.exposed.sql.ResultRow
|
||||
import org.jetbrains.exposed.sql.select
|
||||
import org.jetbrains.exposed.sql.selectAll
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
import java.time.LocalDate
|
||||
import java.util.*
|
||||
|
||||
|
||||
class ResultObjectService : IResultObjectService {
|
||||
@@ -42,37 +42,37 @@ class ResultObjectService : IResultObjectService {
|
||||
.singleOrNull()
|
||||
}
|
||||
|
||||
override suspend fun getResultObjectbyDate(date: LocalDate): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjectbyDate(date: LocalDateTime): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.date eq date)
|
||||
(ResultObjects.date eq date.toJavaLocalDateTime())
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
}
|
||||
|
||||
override suspend fun getResultObjectbeforeDate(date: LocalDate): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjectbeforeDate(date: LocalDateTime): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.date less date)
|
||||
(ResultObjects.date less date.toJavaLocalDateTime())
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
}
|
||||
|
||||
override suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjectafterDate(date: LocalDateTime): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.date greater date)
|
||||
(ResultObjects.date greater date.toJavaLocalDateTime())
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
}
|
||||
|
||||
override suspend fun getResultObjecGreaterthanProbability(probability: Double): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjecGreaterthanProbability(probability: Double): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.probability greater probability)
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
}
|
||||
|
||||
override suspend fun getResultObjecLessthanProbability(probability: Double): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjecLessthanProbability(probability: Double): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.probability less probability)
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
}
|
||||
|
||||
override suspend fun getResultObjecEqualsProbability(probability: Double): List<ApiObject>? = dbQuery {
|
||||
override suspend fun getResultObjecEqualsProbability(probability: Double): List<ApiObject> = dbQuery {
|
||||
ResultObjects.select {
|
||||
(ResultObjects.probability eq probability)
|
||||
}.mapNotNull { toResultObject(it) }
|
||||
|
||||
Reference in New Issue
Block a user