Add name and surname fields to register and UserDao

Author: kahverengi

src/main/kotlin/com/parnote/db/DatabaseManager.kt

@@ -1,10 +1,7 @@
 package com.parnote.db
 
 import com.parnote.config.ConfigManager
-import com.parnote.db.migration.DatabaseMigration_1_2
-import com.parnote.db.migration.DatabaseMigration_2_3
-import com.parnote.db.migration.DatabaseMigration_3_4
-import com.parnote.db.migration.DatabaseMigration_4_5
+import com.parnote.db.migration.*
 import io.vertx.core.AsyncResult
 import io.vertx.core.Vertx
 import io.vertx.core.logging.Logger
@@ -29,13 +26,14 @@ class DatabaseManager(
             DatabaseMigration_1_2(),
             DatabaseMigration_2_3(),
             DatabaseMigration_3_4(),
-            DatabaseMigration_4_5()
+            DatabaseMigration_4_5(),
+            DatabaseMigration_5_6()
         )
     }
 
     companion object {
-        const val DATABASE_SCHEME_VERSION = 5
-        const val DATABASE_SCHEME_VERSION_INFO = "Add note table"
+        const val DATABASE_SCHEME_VERSION = 6
+        const val DATABASE_SCHEME_VERSION_INFO = "Add name and surname fields to user table"
     }
 
     init {

src/main/kotlin/com/parnote/db/entity/UserDaoImpl.kt

@@ -21,6 +21,8 @@ class UserDaoImpl(override val tableName: String = "user") : DaoImpl(), UserDao
                 """
             CREATE TABLE IF NOT EXISTS `${getTablePrefix() + tableName}` (
               `id` int NOT NULL AUTO_INCREMENT,
+              `name` varchar(255) NOT NULL,
+              `surname` varchar(255) NOT NULL,
               `username` varchar(16) NOT NULL UNIQUE,
               `email` varchar(255) NOT NULL UNIQUE,
               `password` varchar(255) NOT NULL,
@@ -113,14 +115,16 @@ class UserDaoImpl(override val tableName: String = "user") : DaoImpl(), UserDao
         handler: (isSuccessful: Result?, asyncResult: AsyncResult<*>) -> Unit
     ) {
         val query =
-            "INSERT INTO `${getTablePrefix() + tableName}` (username, email, password, permission_id, registered_ip, secret_key, public_key, register_date) " +
-                    " VALUES (?, ?, ?, ?, ?, ?, ?, ?); "
+            "INSERT INTO `${getTablePrefix() + tableName}` (name, surname, username, email, password, permission_id, registered_ip, secret_key, public_key, register_date) " +
+                    " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); "
 
         val key = Keys.keyPairFor(SignatureAlgorithm.RS256)
 
         sqlConnection.queryWithParams(
             query,
             JsonArray()
+                .add(user.name)
+                .add(user.surname)
                 .add(user.username)
                 .add(user.email)
                 .add(DigestUtils.md5Hex(user.password))

src/main/kotlin/com/parnote/db/migration/DatabaseMigration_5_6.kt

@@ -0,0 +1,42 @@
+package com.parnote.db.migration
+
+import com.parnote.db.DatabaseMigration
+import io.vertx.core.AsyncResult
+import io.vertx.ext.sql.SQLConnection
+
+@Suppress("ClassName")
+class DatabaseMigration_5_6 : DatabaseMigration() {
+    override val FROM_SCHEME_VERSION = 5
+    override val SCHEME_VERSION = 6
+    override val SCHEME_VERSION_INFO = "Add name and surname fields to user table"
+
+    override val handlers: List<(sqlConnection: SQLConnection, handler: (asyncResult: AsyncResult<*>) -> Unit) -> SQLConnection> =
+        listOf(
+            addNameFieldToUserTable(),
+            addSurnameFieldToUserTable()
+        )
+
+    private fun addNameFieldToUserTable(): (sqlConnection: SQLConnection, handler: (asyncResult: AsyncResult<*>) -> Unit) -> SQLConnection =
+        { sqlConnection, handler ->
+            sqlConnection.query(
+                """
+                    ALTER TABLE `${getTablePrefix()}user` 
+                    ADD `name` varchar(255) NOT NULL;
+                """
+            ) {
+                handler.invoke(it)
+            }
+        }
+
+    private fun addSurnameFieldToUserTable(): (sqlConnection: SQLConnection, handler: (asyncResult: AsyncResult<*>) -> Unit) -> SQLConnection =
+        { sqlConnection, handler ->
+            sqlConnection.query(
+                """
+                    ALTER TABLE `${getTablePrefix()}user` 
+                    ADD `surname` varchar(255) NOT NULL;
+                """
+            ) {
+                handler.invoke(it)
+            }
+        }
+}

src/main/kotlin/com/parnote/db/model/User.kt

@@ -2,6 +2,8 @@ package com.parnote.db.model
 
 data class User(
     val id: Int,
+    val name: String,
+    val surname: String,
     val username: String,
     val email: String,
     val password: String,

src/main/kotlin/com/parnote/route/api/RegisterAPI.kt

@@ -63,7 +63,7 @@ class RegisterAPI : Api() {
             termsBox,
             reCaptcha,
             handler,
-            (this::validateFormHandler)(lang, handler, email, username, password, ipAddress)
+            (this::validateFormHandler)(lang, handler, email, name, surname, username, password, ipAddress)
         )
     }
 
@@ -186,6 +186,8 @@ class RegisterAPI : Api() {
         lang: String,
         handler: (result: Result) -> Unit,
         email: String,
+        name: String,
+        surname: String,
         username: String,
         password: String,
         ipAddress: String
@@ -195,6 +197,8 @@ class RegisterAPI : Api() {
                 lang,
                 handler,
                 email,
+                name,
+                surname,
                 username,
                 password,
                 ipAddress
@@ -206,6 +210,8 @@ class RegisterAPI : Api() {
         lang: String,
         handler: (result: Result) -> Unit,
         email: String,
+        name: String,
+        surname: String,
         username: String,
         password: String,
         ipAddress: String
@@ -219,14 +225,26 @@ class RegisterAPI : Api() {
         databaseManager.getDatabase().userDao.isEmailExists(
             email,
             sqlConnection,
-            (this::isEmailExistsHandler)(lang, handler, email, username, password, ipAddress, sqlConnection)
+            (this::isEmailExistsHandler)(
+                lang,
+                handler,
+                email,
+                name,
+                surname,
+                username,
+                password,
+                ipAddress,
+                sqlConnection
+            )
         )
     }
 
     private fun isEmailExistsHandler(
         lang: String,
         handler: (result: Result) -> Unit,
         email: String,
+        name: String,
+        surname: String,
         username: String,
         password: String,
         ipAddress: String,
@@ -251,14 +269,26 @@ class RegisterAPI : Api() {
         databaseManager.getDatabase().userDao.isUsernameExists(
             username,
             sqlConnection,
-            (this::isUsernameExistsHandler)(lang, handler, email, username, password, ipAddress, sqlConnection)
+            (this::isUsernameExistsHandler)(
+                lang,
+                handler,
+                email,
+                name,
+                surname,
+                username,
+                password,
+                ipAddress,
+                sqlConnection
+            )
         )
     }
 
     private fun isUsernameExistsHandler(
         lang: String,
         handler: (result: Result) -> Unit,
         email: String,
+        name: String,
+        surname: String,
         username: String,
         password: String,
         ipAddress: String,
@@ -282,7 +312,7 @@ class RegisterAPI : Api() {
 
         RegisterUtil.register(
             databaseManager,
-            User(-1, username, email, password, ipAddress),
+            User(-1, name, surname, username, email, password, ipAddress),
             sqlConnection,
             (this::registerHandler)(lang, handler, username, sqlConnection)
         )