From 573963b1617a2b179949ce81ab2c771770551ded Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Sat, 25 Apr 2020 16:22:02 +0200 Subject: [PATCH] Update tables --- api/src/entities/Note.kt | 3 ++- api/src/tables/Chapters.kt | 5 +++-- api/src/tables/Notes.kt | 3 ++- api/src/tables/Tags.kt | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/api/src/entities/Note.kt b/api/src/entities/Note.kt index f3571a7..9f657b0 100644 --- a/api/src/entities/Note.kt +++ b/api/src/entities/Note.kt @@ -2,11 +2,12 @@ package be.vandewalleh.entities import me.liuwj.ktorm.entity.* import java.time.LocalDateTime +import java.util.* interface Note : Entity { companion object : Entity.Factory() - val id: Int + val uuid: UUID var title: String var user: User var updatedAt: LocalDateTime diff --git a/api/src/tables/Chapters.kt b/api/src/tables/Chapters.kt index 51ffb9b..ab04c9d 100644 --- a/api/src/tables/Chapters.kt +++ b/api/src/tables/Chapters.kt @@ -1,6 +1,7 @@ package be.vandewalleh.tables import be.vandewalleh.entities.Chapter +import be.vandewalleh.extensions.uuidBinary import me.liuwj.ktorm.schema.* object Chapters : Table("Chapters") { @@ -8,6 +9,6 @@ object Chapters : Table("Chapters") { val number by int("number").bindTo { it.number } val content by text("content").bindTo { it.content } val title by varchar("title").bindTo { it.title } - val noteId by int("note_id").references(Notes) { it.note } - val note get() = noteId.referenceTable as Notes + val noteUuid by uuidBinary("note_uuid").references(Notes) { it.note } + val note get() = noteUuid.referenceTable as Notes } \ No newline at end of file diff --git a/api/src/tables/Notes.kt b/api/src/tables/Notes.kt index 000dd9f..37ca204 100644 --- a/api/src/tables/Notes.kt +++ b/api/src/tables/Notes.kt @@ -1,10 +1,11 @@ package be.vandewalleh.tables import be.vandewalleh.entities.Note +import be.vandewalleh.extensions.uuidBinary import me.liuwj.ktorm.schema.* object Notes : Table("Notes") { - val id by int("id").primaryKey().bindTo { it.id } + val uuid by uuidBinary("uuid").primaryKey().bindTo { it.uuid } val title by varchar("title").bindTo { it.title } val userId by int("user_id").references(Users) { it.user } val updatedAt by datetime("updated_at").bindTo { it.updatedAt } diff --git a/api/src/tables/Tags.kt b/api/src/tables/Tags.kt index e9e52ef..0f26bd1 100644 --- a/api/src/tables/Tags.kt +++ b/api/src/tables/Tags.kt @@ -1,11 +1,12 @@ package be.vandewalleh.tables import be.vandewalleh.entities.Tag +import be.vandewalleh.extensions.uuidBinary import me.liuwj.ktorm.schema.* object Tags : Table("Tags") { val id by int("id").primaryKey().bindTo { it.id } val name by varchar("name").bindTo { it.name } - val noteId by int("note_id").references(Notes) { it.note } - val note get() = noteId.referenceTable as Notes + val noteUuid by uuidBinary("note_uuid").references(Notes) { it.note } + val note get() = noteUuid.referenceTable as Notes } \ No newline at end of file