From b16a5702b4ab5731eae0913148c3ac591a3d0894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Fri, 13 Aug 2021 14:26:09 +0200
Subject: [PATCH] refactor sample

---
 src/database/service/SampleObjectService.kt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/database/service/SampleObjectService.kt b/src/database/service/SampleObjectService.kt
index a83068b..6b55294 100644
--- a/src/database/service/SampleObjectService.kt
+++ b/src/database/service/SampleObjectService.kt
@@ -6,7 +6,6 @@ import com.kmalbz.database.dao.SampleObjects
 import com.kmalbz.api.model.ApiObject
 import io.ktor.util.*
 import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.sql.castTo
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -27,35 +26,35 @@ class SampleObjectService : ISampleObjectService {
     }
 
     override suspend fun getAllSampleObjects(): List<ApiObject> = dbQuery {
-        SampleObjects.selectAll().map { toResultObject(it) }
+        SampleObjects.selectAll().map { toSampleObject(it) }
     }
 
     override suspend fun getSampleObjectbyTag(tag: String): ApiObject? = dbQuery {
         SampleObjects.select {
             (SampleObjects.tag eq tag)
-        }.mapNotNull { toResultObject(it) }
+        }.mapNotNull { toSampleObject(it) }
             .singleOrNull()
     }
 
     override suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
             (SampleObjects.timestamp eq date)
-        }.mapNotNull { toResultObject(it) }
+        }.mapNotNull { toSampleObject(it) }
     }
 
     override suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
             (SampleObjects.timestamp less  date)
-        }.mapNotNull { toResultObject(it) }
+        }.mapNotNull { toSampleObject(it) }
     }
 
     override suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
             (SampleObjects.timestamp greater  date)
-        }.mapNotNull { toResultObject(it) }
+        }.mapNotNull { toSampleObject(it) }
     }
 
-    private fun toResultObject(row: ResultRow): ApiObject =
+    private fun toSampleObject(row: ResultRow): ApiObject =
         ApiObject(
             tag = row[SampleObjects.tag],
             device_date = row[SampleObjects.device_date],