From dfeb628fd1df6211c7d66372ae80920314ae7688 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 31 Jan 2020 18:05:39 +0600 Subject: [PATCH] add klock dependency and fix exposed lib --- postssystem.exposed/build.gradle | 1 + .../postssystem/core/exposed/ExposedPostsAPI.kt | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/postssystem.exposed/build.gradle b/postssystem.exposed/build.gradle index 33e10026..8dd38b67 100644 --- a/postssystem.exposed/build.gradle +++ b/postssystem.exposed/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "com.insanusmokrassar:postssystem.core:$core_version" api "org.jetbrains.exposed:exposed-core:$exposed_version" + api "com.soywiz.korlibs.klock:klock:$klockVersion" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$test_junit_version" diff --git a/postssystem.exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsAPI.kt b/postssystem.exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsAPI.kt index e1d1447a..56083446 100644 --- a/postssystem.exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsAPI.kt +++ b/postssystem.exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsAPI.kt @@ -5,7 +5,7 @@ import com.insanusmokrassar.postssystem.core.post.* import com.insanusmokrassar.postssystem.core.post.api.PostsAPI import com.insanusmokrassar.postssystem.core.utils.generatePostId import com.insanusmokrassar.postssystem.core.utils.pagination.* -import com.soywiz.klock.DateTime +import com.soywiz.klock.* import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow @@ -58,13 +58,17 @@ private class PostsAPIContentRelations( } } +private val dateTimeFormat = DateFormat("EEE, dd MMM yyyy HH:mm:ss z") + private class PostsAPIDatabaseTable( private val database: Database ) : PostsAPI, Table() { private val contentsTable = PostsAPIContentRelations(database) private val idColumn = text("postId") - private val creationDateColumn = datetime("creationDate").default(org.joda.time.DateTime.now()) + private val creationDateColumn = text("creationDate").default( + DateTime.now().toString(dateTimeFormat) + ) private val postCreatedBroadcastChannel = BroadcastChannel(Channel.BUFFERED) @@ -88,7 +92,7 @@ private class PostsAPIDatabaseTable( SimpleRegisteredPost( id, contentsTable.getPostContents(id), - DateTime(get(creationDateColumn).millis) + dateTimeFormat.parse(get(creationDateColumn)).local ) }