api done

src/database/service/ISampleObjectService.kt

@@ -8,10 +8,7 @@ interface ISampleObjectService{
     fun addOne(apiObject: ApiObject)
     suspend fun getAllSampleObjects(): 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 getSampleObjecGreaterthanId(id: Int): List<ApiObject>?
-    suspend fun getSampleObjecLessthanId(id: Int): List<ApiObject>?
-    suspend fun getSampleObjecEqualsId(id: Int): List<ApiObject>?
+    suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject>
+    suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject>
+    suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject>
 }

src/database/service/SampleObjectService.kt

@@ -5,11 +5,11 @@ import com.kmalbz.database.model.SampleObject
 import com.kmalbz.database.dao.SampleObjects
 import com.kmalbz.api.model.ApiObject
 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
 import java.time.LocalDate
-import java.util.*
 
 
 class SampleObjectService : ISampleObjectService {
@@ -35,39 +35,21 @@ class SampleObjectService : ISampleObjectService {
             .singleOrNull()
     }
 
-    override suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject>? = dbQuery {
+    override suspend fun getSampleObjectbyDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
-            (SampleObjects.date eq date)
+            (SampleObjects.timestamp eq date)
         }.mapNotNull { toResultObject(it) }
     }
 
-    override suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject>? = dbQuery {
+    override suspend fun getSampleObjectbeforeDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
-            (SampleObjects.date less  date)
+            (SampleObjects.timestamp less  date)
         }.mapNotNull { toResultObject(it) }
     }
 
-    override suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject>? = dbQuery {
+    override suspend fun getSampleObjectafterDate(date: LocalDate): List<ApiObject> = dbQuery {
         SampleObjects.select {
-            (SampleObjects.date greater  date)
-        }.mapNotNull { toResultObject(it) }
-    }
-
-    override suspend fun getSampleObjecGreaterthanId(probability: Double): List<ApiObject>? = dbQuery {
-        SampleObjects.select {
-            (SampleObjects.probability greater  probability)
-        }.mapNotNull { toResultObject(it) }
-    }
-
-    override suspend fun getSampleObjecLessthanId(probability: Double): List<ApiObject>? = dbQuery {
-        SampleObjects.select {
-            (SampleObjects.probability less  probability)
-        }.mapNotNull { toResultObject(it) }
-    }
-
-    override suspend fun getSampleObjecEqualsId(probability: Double): List<ApiObject>? = dbQuery {
-        SampleObjects.select {
-            (SampleObjects.probability eq  probability)
+            (SampleObjects.timestamp greater  date)
         }.mapNotNull { toResultObject(it) }
     }
 
@@ -75,7 +57,6 @@ class SampleObjectService : ISampleObjectService {
         ApiObject(
             tag = row[SampleObjects.tag],
             device_date = row[SampleObjects.device_date],
-            device_id = row[SampleObjects.device_id],
-            id = row[SampleObjects.id.]
+            device_id = row[SampleObjects.device_id]
         )
 }