From 2b894001689fa1c9e01a6db36e4e6244e5ea916c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Fri, 29 May 2020 13:27:53 +0200
Subject: [PATCH] use string instead of uuid

---
 src/api/model/ApiObject.kt                   | 2 +-
 src/api/route/OutputServiceRDBServer.kt      | 3 +--
 src/database/dao/ResultObjects.kt            | 3 +--
 src/database/service/IResultObjectService.kt | 2 +-
 src/database/service/ResultObjectService.kt  | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/api/model/ApiObject.kt b/src/api/model/ApiObject.kt
index 322cd60..697971f 100644
--- a/src/api/model/ApiObject.kt
+++ b/src/api/model/ApiObject.kt
@@ -4,6 +4,6 @@ import com.google.gson.annotations.SerializedName
 import java.util.*
 
 data class ApiObject(
-    @SerializedName("tag") val tag: UUID,
+    @SerializedName("tag") val tag: String,
     @SerializedName("probability") val probability: Double
 )
\ No newline at end of file
diff --git a/src/api/route/OutputServiceRDBServer.kt b/src/api/route/OutputServiceRDBServer.kt
index 9ac9d69..ff756bd 100644
--- a/src/api/route/OutputServiceRDBServer.kt
+++ b/src/api/route/OutputServiceRDBServer.kt
@@ -9,7 +9,6 @@ import io.ktor.routing.get
 import org.koin.ktor.ext.inject
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
-import java.util.*
 
 /**
  * Output Service - RDB
@@ -64,7 +63,7 @@ class OutputServiceRDBServer {
 
         get("/output/{tagID}") {
             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)
         }
diff --git a/src/database/dao/ResultObjects.kt b/src/database/dao/ResultObjects.kt
index ae2df3b..6bbebf7 100644
--- a/src/database/dao/ResultObjects.kt
+++ b/src/database/dao/ResultObjects.kt
@@ -4,10 +4,9 @@ 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 java.util.*
 
 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 probability: Column<Double> = double("probability")
     override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id")
diff --git a/src/database/service/IResultObjectService.kt b/src/database/service/IResultObjectService.kt
index a59c9bc..6dbedc8 100644
--- a/src/database/service/IResultObjectService.kt
+++ b/src/database/service/IResultObjectService.kt
@@ -7,7 +7,7 @@ import java.util.*
 interface IResultObjectService{
     fun addOne(apiObject: 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 getResultObjectbeforeDate(date: LocalDate): List<ApiObject>?
     suspend fun getResultObjectafterDate(date: LocalDate): List<ApiObject>?
diff --git a/src/database/service/ResultObjectService.kt b/src/database/service/ResultObjectService.kt
index d67bd7f..06a1309 100644
--- a/src/database/service/ResultObjectService.kt
+++ b/src/database/service/ResultObjectService.kt
@@ -27,7 +27,7 @@ class ResultObjectService : IResultObjectService {
         ResultObjects.selectAll().map { toResultObject(it) }
     }
 
-    override suspend fun getResultObjectbyTag(tag: UUID): ApiObject? = dbQuery {
+    override suspend fun getResultObjectbyTag(tag: String): ApiObject? = dbQuery {
         ResultObjects.select {
             (ResultObjects.tag eq tag)
         }.mapNotNull { toResultObject(it) }