hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Don't need this anymore

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-04-21 17:46:08 +02:00
parent 95811f5788
commit 9337586b90
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/services/NotesService.kt
View File

@ -109,8 +109,6 @@ class NotesService(override val kodein: Kodein) : KodeinAware {
fun deleteNote(noteId: Int): Unit = fun deleteNote(noteId: Int): Unit =
db.useTransaction { db.useTransaction {
db.delete(Tags) { it.noteId eq noteId }
db.delete(Chapters) { it.noteId eq noteId }
db.delete(Notes) { it.id eq noteId } db.delete(Notes) { it.id eq noteId }
} }
} }

14
api/src/services/UserService.kt
View File

@ -1,7 +1,6 @@
package be.vandewalleh.services package be.vandewalleh.services
import be.vandewalleh.entities.User import be.vandewalleh.entities.User
import be.vandewalleh.tables.Notes
import be.vandewalleh.tables.Users import be.vandewalleh.tables.Users
import me.liuwj.ktorm.database.* import me.liuwj.ktorm.database.*
import me.liuwj.ktorm.dsl.* import me.liuwj.ktorm.dsl.*
@ -16,7 +15,6 @@ import java.time.LocalDateTime
*/ */
class UserService(override val kodein: Kodein) : KodeinAware { class UserService(override val kodein: Kodein) : KodeinAware {
private val db by instance<Database>() private val db by instance<Database>()
private val notesService by instance<NotesService>()
/** /**
* returns a user ID if present or null * returns a user ID if present or null
@ -69,19 +67,9 @@ class UserService(override val kodein: Kodein) : KodeinAware {
fun deleteUser(userId: Int) { fun deleteUser(userId: Int) {
db.useTransaction { db.useTransaction {
val notesId = db.from(Notes)
.select(Notes.id)
.where { Notes.userId eq userId }
.map { it[Notes.userId]!! }
notesId.forEach { noteId ->
notesService.deleteNote(noteId)
}
}
db.delete(Users) { it.id eq userId } db.delete(Users) { it.id eq userId }
} }
}
} }
data class UserRegistrationDto(val username: String, val email: String, val password: String) data class UserRegistrationDto(val username: String, val email: String, val password: String)