1.1 --- a/src/main/kotlin/de/uapcore/lightpit/entities/User.kt Sun Dec 20 11:06:25 2020 +0100
1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/entities/User.kt Mon Dec 21 18:29:34 2020 +0100
1.3 @@ -25,16 +25,17 @@
1.4
1.5 package de.uapcore.lightpit.entities
1.6
1.7 -data class User(val id: Int) {
1.8 - var username = ""
1.9 - var mail = ""
1.10 - var givenname = ""
1.11 - var lastname = ""
1.12 +data class User(override val id: Int) : Entity {
1.13 + var username: String = ""
1.14 + var mail: String? = null
1.15 + var givenname: String? = null
1.16 + var lastname: String? = null
1.17
1.18 - val shortDisplayname: String get() {
1.19 - val str = "$givenname $lastname"
1.20 - return if (str.isBlank()) username else str.trim()
1.21 - }
1.22 + val shortDisplayname: String
1.23 + get() {
1.24 + val str = "${givenname ?: ""} ${lastname ?: ""}"
1.25 + return if (str.isBlank()) username else str.trim()
1.26 + }
1.27
1.28 - val displayname: String get() = if (mail.isBlank()) shortDisplayname else "$shortDisplayname <$mail>"
1.29 + val displayname: String get() = if (mail.isNullOrBlank()) shortDisplayname else "$shortDisplayname <$mail>"
1.30 }
1.31 \ No newline at end of file
