birbnetes/sample-service
4
0
Fork 0
Code Pull Requests Releases Activity

use kotlin serialization

Browse Source
This commit is contained in:
Torma Kristóf
2021-08-18 15:42:24 +02:00
parent f2ab81e0f4
commit c9411b6424
6 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/database/dao/SampleObjects.kt
View File

@@ -2,13 +2,13 @@ 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 SampleObjects : IntIdTable() {
val tag: Column<String> = varchar("tag", 32)
val timestamp: Column<LocalDate> = date("timestamp").default(LocalDate.now())
val timestamp: Column<LocalDateTime> = datetime("timestamp").default(LocalDateTime.now())
val device_id: Column<Int> = integer("device_id")
val device_date: Column<LocalDate> = date("device_date")
val device_date: Column<LocalDateTime> = datetime("device_date")
override val primaryKey = PrimaryKey(id, name = "PK_SampleObject_Id")
}

9
src/database/service/ISampleObjectService.kt
View File

@@ -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 ISampleObjectService{
fun addOne(apiObject: ApiObject)
@@ -11,7 +10,7 @@ interface ISampleObjectService{
suspend fun getPage(page: Long): List<ApiObject>
suspend fun getSampleObjectbyDeviceID(device_id: Int): List<ApiObject>
suspend fun getSampleObjectbyTag(tag: String): ApiObject?
suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject>
suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject>
suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject>
suspend fun getSampleObjectbyDate(date: LocalDateTime): List<ApiObject>
suspend fun getSampleObjectbeforeDate(date: LocalDateTime): List<ApiObject>
suspend fun getSampleObjectafterDate(date: LocalDateTime): List<ApiObject>
}

20
src/database/service/SampleObjectService.kt
View File

@@ -5,11 +5,13 @@ import com.kmalbz.database.model.SampleObject
import com.kmalbz.database.dao.SampleObjects
import com.kmalbz.api.model.ApiObject
import io.ktor.util.*
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.toJavaLocalDateTime
import kotlinx.datetime.toKotlinLocalDateTime
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
@KtorExperimentalAPI
@@ -19,7 +21,7 @@ class SampleObjectService : ISampleObjectService {
transaction {
SampleObject.new {
tag = apiObject.tag
device_date = apiObject.device_date
device_date = apiObject.device_date.toJavaLocalDateTime()
device_id = apiObject.device_id
}
}
@@ -50,28 +52,28 @@ class SampleObjectService : ISampleObjectService {
.singleOrNull()
}
override suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject> = dbQuery {
override suspend fun getSampleObjectbyDate(date: LocalDateTime): List<ApiObject> = dbQuery {
SampleObjects.select {
(SampleObjects.timestamp eq date)
(SampleObjects.timestamp eq date.toJavaLocalDateTime())
}.mapNotNull { toSampleObject(it) }
}
override suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject> = dbQuery {
override suspend fun getSampleObjectbeforeDate(date: LocalDateTime): List<ApiObject> = dbQuery {
SampleObjects.select {
(SampleObjects.timestamp less date)
(SampleObjects.timestamp less date.toJavaLocalDateTime())
}.mapNotNull { toSampleObject(it) }
}
override suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject> = dbQuery {
override suspend fun getSampleObjectafterDate(date: LocalDateTime): List<ApiObject> = dbQuery {
SampleObjects.select {
(SampleObjects.timestamp greater date)
(SampleObjects.timestamp greater date.toJavaLocalDateTime())
}.mapNotNull { toSampleObject(it) }
}
private fun toSampleObject(row: ResultRow): ApiObject =
ApiObject(
tag = row[SampleObjects.tag],
device_date = row[SampleObjects.device_date],
device_date = row[SampleObjects.device_date].toKotlinLocalDateTime(),
device_id = row[SampleObjects.device_id]
)
}