Skip to content
Snippets Groups Projects
Verified Commit 623143aa authored by Réthelyi Bálint's avatar Réthelyi Bálint :no_mouth:
Browse files

add last changed parameter and switch to kotlinx.datetime

parent 647a002c
No related branches found
No related tags found
No related merge requests found
......@@ -37,4 +37,5 @@ dependencies {
testImplementation("io.ktor:ktor-server-tests:$ktor_version")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
implementation("com.google.code.gson:gson:2.8.9")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
}
\ No newline at end of file
......@@ -21,6 +21,6 @@ fun Floor.toResponseV1(): FloorDataOld {
return FloorDataOld(
id = id,
machines = oldMachineData,
last_query_time = machines.last().lastQueryTime.toInstant().toString(),
last_query_time = machines.last().lastQueryTime.toString(),
)
}
\ No newline at end of file
package space.rethelyi.model
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant
import space.rethelyi.model.response.MachineData
import space.rethelyi.model.response.MachineDataOld
import java.util.*
......@@ -9,7 +11,8 @@ data class Machine(
var id: Int = 0,
var kindOf: Kind = Kind.Unknown,
var status: Status = Status.LostInSpace,
var lastQueryTime: Date = Date(),
var lastQueryTime: Instant = Clock.System.now(),
var lastChanged: Instant = Clock.System.now(),
val power: MutableList<Int> = mutableListOf(),
val threshold: Int = 200
)
......@@ -43,7 +46,7 @@ fun Machine.addPower(newPower: Int) {
power -= power.first()
}
lastQueryTime = Date()
lastQueryTime = Clock.System.now()
}
fun Machine.toResponseV2(): MachineData {
......@@ -52,7 +55,7 @@ fun Machine.toResponseV2(): MachineData {
kindOf = kindOf,
status = status,
lastQueryTime = lastQueryTime.toString(),
unixTimeStamp = lastQueryTime.toInstant().toEpochMilli()
lastChanged = lastChanged.toString(),
)
}
......
......@@ -7,5 +7,5 @@ import java.util.*
data class FloorDataOld(
var id: Int = 0,
var machines: List<MachineDataOld> = listOf(),
var last_query_time: String = Date().toString(),
var last_query_time: String = "",
)
\ No newline at end of file
......@@ -10,6 +10,6 @@ data class MachineData(
var id: Int = 0,
var kindOf: Kind = Kind.Unknown,
var status: Status = Status.LostInSpace,
var lastQueryTime: String = Date().toString(),
var unixTimeStamp: Long = 0
var lastQueryTime: String = "",
var lastChanged: String = "",
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment