birbnetes/output-service-rdb
birbnetes
/
output-service-rdb
4
0
Fork 0
Code Pull Requests Releases Wiki Activity

use string instead of uuid
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Torma Kristóf 2020-05-29 13:27:53 +02:00
parent 8d7f05d122
commit 2b89400168
Signed by: tormakris
GPG Key ID: DC83C4F2C41B1047
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/model/ApiObject.kt
View File

@ -4,6 +4,6 @@ import com.google.gson.annotations.SerializedName
import java.util.* import java.util.*
data class ApiObject( data class ApiObject(
@SerializedName("tag") val tag: UUID, @SerializedName("tag") val tag: String,
@SerializedName("probability") val probability: Double @SerializedName("probability") val probability: Double
) )

3
src/api/route/OutputServiceRDBServer.kt
View File

@ -9,7 +9,6 @@ import io.ktor.routing.get
import org.koin.ktor.ext.inject import org.koin.ktor.ext.inject
import java.time.LocalDate import java.time.LocalDate
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
import java.util.*
/** /**
* Output Service - RDB * Output Service - RDB
@ -64,7 +63,7 @@ class OutputServiceRDBServer {
get("/output/{tagID}") { get("/output/{tagID}") {
val tagID = call.parameters["tagID"] ?: error(HttpStatusCode.NotAcceptable) val tagID = call.parameters["tagID"] ?: error(HttpStatusCode.NotAcceptable)
val resultObject = resultObjectService.getResultObjectbyTag(UUID.fromString(tagID)) ?: call.respond(HttpStatusCode.NotFound) val resultObject = resultObjectService.getResultObjectbyTag(tagID) ?: call.respond(HttpStatusCode.NotFound)
call.respond(resultObject) call.respond(resultObject)
} }

3
src/database/dao/ResultObjects.kt
View File

@ -4,10 +4,9 @@ import org.jetbrains.exposed.dao.id.IntIdTable
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.`java-time`.date import org.jetbrains.exposed.sql.`java-time`.date
import java.time.LocalDate import java.time.LocalDate
import java.util.*
object ResultObjects : IntIdTable() { object ResultObjects : IntIdTable() {
val tag: Column<UUID> = uuid("tag") val tag: Column<String> = varchar("tag", 32)
val date: Column<LocalDate> = date("date").default(LocalDate.now()) val date: Column<LocalDate> = date("date").default(LocalDate.now())
val probability: Column<Double> = double("probability") val probability: Column<Double> = double("probability")
override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id") override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id")

2
src/database/service/IResultObjectService.kt
View File

@ -7,7 +7,7 @@ import java.util.*
interface IResultObjectService{ interface IResultObjectService{
fun addOne(apiObject: ApiObject) fun addOne(apiObject: ApiObject)
suspend fun getAllResultObjects(): List<ApiObject> suspend fun getAllResultObjects(): List<ApiObject>
suspend fun getResultObjectbyTag(tag: UUID): ApiObject? suspend fun getResultObjectbyTag(tag: String): ApiObject?
suspend fun getResultObjectbyDate(date: LocalDate): List<ApiObject>? suspend fun getResultObjectbyDate(date: LocalDate): List<ApiObject>?
suspend fun getResultObjectbeforeDate(date: LocalDate): List<ApiObject>? suspend fun getResultObjectbeforeDate(date: LocalDate): List<ApiObject>?
suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>? suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>?

2
src/database/service/ResultObjectService.kt
View File

@ -27,7 +27,7 @@ class ResultObjectService : IResultObjectService {
ResultObjects.selectAll().map { toResultObject(it) } ResultObjects.selectAll().map { toResultObject(it) }
} }
override suspend fun getResultObjectbyTag(tag: UUID): ApiObject? = dbQuery { override suspend fun getResultObjectbyTag(tag: String): ApiObject? = dbQuery {
ResultObjects.select { ResultObjects.select {
(ResultObjects.tag eq tag) (ResultObjects.tag eq tag)
}.mapNotNull { toResultObject(it) } }.mapNotNull { toResultObject(it) }