move models to subpackage users, rooms or reservations (#83)

spbu-math-cs · Oct 26, 2023 · 557421a · 557421a
1 parent e0ee98a
commit 557421a
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 48 deletions.
diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/auth/AccountController.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/auth/AccountController.kt
@@ -1,7 +1,7 @@
 package org.tod87et.roomkn.server.auth
 
-import org.tod87et.roomkn.server.models.LoginUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredUserInfo
+import org.tod87et.roomkn.server.models.users.LoginUserInfo
+import org.tod87et.roomkn.server.models.users.UnregisteredUserInfo
 
 interface AccountController {
     fun authenticateUser(loginUserInfo: LoginUserInfo): Result<AuthSession>

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/auth/AccountControllerImpl.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/auth/AccountControllerImpl.kt
@@ -5,9 +5,9 @@ import com.auth0.jwt.algorithms.Algorithm
 import io.ktor.util.logging.Logger
 import org.tod87et.roomkn.server.database.ConstraintViolationException
 import org.tod87et.roomkn.server.database.MissingElementException
-import org.tod87et.roomkn.server.models.LoginUserInfo
-import org.tod87et.roomkn.server.models.RegistrationUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredUserInfo
+import org.tod87et.roomkn.server.models.users.LoginUserInfo
+import org.tod87et.roomkn.server.models.users.RegistrationUserInfo
+import org.tod87et.roomkn.server.models.users.UnregisteredUserInfo
 import java.security.MessageDigest
 import java.security.SecureRandom
 import java.util.Date

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/database/CredentialsDatabase.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/database/CredentialsDatabase.kt
@@ -1,8 +1,8 @@
 package org.tod87et.roomkn.server.database
 
-import org.tod87et.roomkn.server.models.RegistrationUserInfo
-import org.tod87et.roomkn.server.models.UserCredentialsInfo
-import org.tod87et.roomkn.server.models.UserInfo
+import org.tod87et.roomkn.server.models.users.RegistrationUserInfo
+import org.tod87et.roomkn.server.models.users.UserCredentialsInfo
+import org.tod87et.roomkn.server.models.users.UserInfo
 
 interface CredentialsDatabase {
     fun registerUser(user: RegistrationUserInfo): Result<UserInfo>

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/database/Database.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/database/Database.kt
@@ -1,12 +1,12 @@
 package org.tod87et.roomkn.server.database
 
-import org.tod87et.roomkn.server.models.NewRoomInfo
-import org.tod87et.roomkn.server.models.Reservation
-import org.tod87et.roomkn.server.models.RoomInfo
-import org.tod87et.roomkn.server.models.ShortRoomInfo
-import org.tod87et.roomkn.server.models.ShortUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredReservation
-import org.tod87et.roomkn.server.models.UserInfo
+import org.tod87et.roomkn.server.models.rooms.NewRoomInfo
+import org.tod87et.roomkn.server.models.reservations.Reservation
+import org.tod87et.roomkn.server.models.rooms.RoomInfo
+import org.tod87et.roomkn.server.models.rooms.ShortRoomInfo
+import org.tod87et.roomkn.server.models.users.ShortUserInfo
+import org.tod87et.roomkn.server.models.reservations.UnregisteredReservation
+import org.tod87et.roomkn.server.models.users.UserInfo
 
 interface Database {
     fun getRooms(): Result<List<ShortRoomInfo>>

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/database/DatabaseSession.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/database/DatabaseSession.kt
@@ -7,21 +7,21 @@ import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import org.tod87et.roomkn.server.models.RegistrationUserInfo
-import org.tod87et.roomkn.server.models.Reservation
-import org.tod87et.roomkn.server.models.RoomInfo
-import org.tod87et.roomkn.server.models.ShortRoomInfo
-import org.tod87et.roomkn.server.models.ShortUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredReservation
-import org.tod87et.roomkn.server.models.UserCredentialsInfo
-import org.tod87et.roomkn.server.models.UserInfo
+import org.tod87et.roomkn.server.models.users.RegistrationUserInfo
+import org.tod87et.roomkn.server.models.reservations.Reservation
+import org.tod87et.roomkn.server.models.rooms.RoomInfo
+import org.tod87et.roomkn.server.models.rooms.ShortRoomInfo
+import org.tod87et.roomkn.server.models.users.ShortUserInfo
+import org.tod87et.roomkn.server.models.reservations.UnregisteredReservation
+import org.tod87et.roomkn.server.models.users.UserCredentialsInfo
+import org.tod87et.roomkn.server.models.users.UserInfo
 import java.sql.Connection
 import javax.sql.DataSource
 import org.tod87et.roomkn.server.database.Database as RooMknDatabase
 import org.jetbrains.exposed.exceptions.ExposedSQLException
 import org.jetbrains.exposed.sql.deleteAll
 import org.postgresql.util.PSQLException
-import org.tod87et.roomkn.server.models.NewRoomInfo
+import org.tod87et.roomkn.server.models.rooms.NewRoomInfo
 
 class DatabaseSession private constructor(private val database: Database) :
     RooMknDatabase, CredentialsDatabase {

diff --git a/...d87et/roomkn/server/models/Reservation.kt → ...server/models/reservations/Reservation.kt b/...d87et/roomkn/server/models/Reservation.kt → ...server/models/reservations/Reservation.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.reservations
 
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName

diff --git a/.../server/models/UnregisteredReservation.kt → ...s/reservations/UnregisteredReservation.kt b/.../server/models/UnregisteredReservation.kt → ...s/reservations/UnregisteredReservation.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.reservations
 
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName

diff --git a/...d87et/roomkn/server/models/NewRoomInfo.kt → ...roomkn/server/models/rooms/NewRoomInfo.kt b/...d87et/roomkn/server/models/NewRoomInfo.kt → ...roomkn/server/models/rooms/NewRoomInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.rooms
 
 import kotlinx.serialization.Serializable
 

diff --git a/.../tod87et/roomkn/server/models/RoomInfo.kt → ...et/roomkn/server/models/rooms/RoomInfo.kt b/.../tod87et/roomkn/server/models/RoomInfo.kt → ...et/roomkn/server/models/rooms/RoomInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.rooms
 
 import kotlinx.serialization.Serializable
 

diff --git a/...7et/roomkn/server/models/ShortRoomInfo.kt → ...omkn/server/models/rooms/ShortRoomInfo.kt b/...7et/roomkn/server/models/ShortRoomInfo.kt → ...omkn/server/models/rooms/ShortRoomInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.rooms
 
 import kotlinx.serialization.Serializable
 

diff --git a/...7et/roomkn/server/models/LoginUserInfo.kt → ...omkn/server/models/users/LoginUserInfo.kt b/...7et/roomkn/server/models/LoginUserInfo.kt → ...omkn/server/models/users/LoginUserInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 import kotlinx.serialization.Serializable
 

diff --git a/...mkn/server/models/RegistrationUserInfo.kt → ...rver/models/users/RegistrationUserInfo.kt b/...mkn/server/models/RegistrationUserInfo.kt → ...rver/models/users/RegistrationUserInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 /** For internal use only. **Not** serializable */
 class RegistrationUserInfo(

diff --git a/...7et/roomkn/server/models/ShortUserInfo.kt → ...omkn/server/models/users/ShortUserInfo.kt b/...7et/roomkn/server/models/ShortUserInfo.kt → ...omkn/server/models/users/ShortUserInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 import kotlinx.serialization.Serializable
 

diff --git a/...mkn/server/models/UnregisteredUserInfo.kt → ...rver/models/users/UnregisteredUserInfo.kt b/...mkn/server/models/UnregisteredUserInfo.kt → ...rver/models/users/UnregisteredUserInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 import kotlinx.serialization.Serializable
 

diff --git a/...omkn/server/models/UserCredentialsInfo.kt → ...erver/models/users/UserCredentialsInfo.kt b/...omkn/server/models/UserCredentialsInfo.kt → ...erver/models/users/UserCredentialsInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 /** For internal use only. **Not** serializable */
 class UserCredentialsInfo(

diff --git a/.../tod87et/roomkn/server/models/UserInfo.kt → ...et/roomkn/server/models/users/UserInfo.kt b/.../tod87et/roomkn/server/models/UserInfo.kt → ...et/roomkn/server/models/users/UserInfo.kt
@@ -1,4 +1,4 @@
-package org.tod87et.roomkn.server.models
+package org.tod87et.roomkn.server.models.users
 
 import kotlinx.serialization.Serializable
 

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/routing/AccountRouting.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/routing/AccountRouting.kt
@@ -20,8 +20,8 @@ import org.tod87et.roomkn.server.auth.AuthSession
 import org.tod87et.roomkn.server.auth.AuthenticationProvider
 import org.tod87et.roomkn.server.auth.NoSuchUserException
 import org.tod87et.roomkn.server.auth.RegistrationFailedException
-import org.tod87et.roomkn.server.models.LoginUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredUserInfo
+import org.tod87et.roomkn.server.models.users.LoginUserInfo
+import org.tod87et.roomkn.server.models.users.UnregisteredUserInfo
 
 fun Route.accountRouting(authConfig: AuthConfig) {
     val env = environment!!

diff --git a/server/src/main/kotlin/org/tod87et/roomkn/server/routing/Reserve.kt b/server/src/main/kotlin/org/tod87et/roomkn/server/routing/Reserve.kt
@@ -7,7 +7,7 @@ import io.ktor.server.response.respondText
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.post
 import org.tod87et.roomkn.server.database.DatabaseFactory.database
-import org.tod87et.roomkn.server.models.UnregisteredReservation
+import org.tod87et.roomkn.server.models.reservations.UnregisteredReservation
 
 fun Route.reserveRouting() {
     post("/reserve") { unregisteredReservation: UnregisteredReservation ->

diff --git a/server/src/test/kotlin/org/tod87et/roomkn/server/AuthTest.kt b/server/src/test/kotlin/org/tod87et/roomkn/server/AuthTest.kt
@@ -13,8 +13,8 @@ import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.tod87et.roomkn.server.KtorTestEnv.testJsonApplication
 import org.tod87et.roomkn.server.database.DatabaseFactory
-import org.tod87et.roomkn.server.models.LoginUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredUserInfo
+import org.tod87et.roomkn.server.models.users.LoginUserInfo
+import org.tod87et.roomkn.server.models.users.UnregisteredUserInfo
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 

diff --git a/server/src/test/kotlin/org/tod87et/roomkn/server/DatabaseTest.kt b/server/src/test/kotlin/org/tod87et/roomkn/server/DatabaseTest.kt
@@ -9,14 +9,14 @@ import org.tod87et.roomkn.server.database.ConstraintViolationException
 import org.tod87et.roomkn.server.database.DatabaseSession
 import org.tod87et.roomkn.server.database.MissingElementException
 import org.tod87et.roomkn.server.database.ReservationException
-import org.tod87et.roomkn.server.models.NewRoomInfo
-import org.tod87et.roomkn.server.models.RegistrationUserInfo
-import org.tod87et.roomkn.server.models.Reservation
-import org.tod87et.roomkn.server.models.RoomInfo
-import org.tod87et.roomkn.server.models.ShortRoomInfo
-import org.tod87et.roomkn.server.models.ShortUserInfo
-import org.tod87et.roomkn.server.models.UnregisteredReservation
-import org.tod87et.roomkn.server.models.UserInfo
+import org.tod87et.roomkn.server.models.rooms.NewRoomInfo
+import org.tod87et.roomkn.server.models.users.RegistrationUserInfo
+import org.tod87et.roomkn.server.models.reservations.Reservation
+import org.tod87et.roomkn.server.models.rooms.RoomInfo
+import org.tod87et.roomkn.server.models.rooms.ShortRoomInfo
+import org.tod87et.roomkn.server.models.users.ShortUserInfo
+import org.tod87et.roomkn.server.models.reservations.UnregisteredReservation
+import org.tod87et.roomkn.server.models.users.UserInfo
 import javax.sql.DataSource
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals