diff --git a/build.gradle.kts b/build.gradle.kts index 250bf9b..e902554 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.51" +version = "1.0.52" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/update_1_0_52.sql b/data/db/update_1_0_52.sql new file mode 100644 index 0000000..b022e6c --- /dev/null +++ b/data/db/update_1_0_52.sql @@ -0,0 +1,10 @@ +START TRANSACTION; + + +ALTER TABLE `customer` + ADD COLUMN `phone` CHAR(50) NULL DEFAULT NULL AFTER `lang`; + + +UPDATE configuration set config_value = "1.0.52", date_change=CURRENT_DATE WHERE config_key = "db_version"; + +COMMIT; diff --git a/src/main/kotlin/com/aitrainer/api/model/Customer.kt b/src/main/kotlin/com/aitrainer/api/model/Customer.kt index cba375e..4555690 100644 --- a/src/main/kotlin/com/aitrainer/api/model/Customer.kt +++ b/src/main/kotlin/com/aitrainer/api/model/Customer.kt @@ -30,6 +30,7 @@ data class Customer ( @Expose var trialDate: String? = null, @Expose var firebaseRegToken: String? = null, @Expose var lang: String? = null, + @Expose var phone: String? = null, @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Expose var customerId: Long = 0, ) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 497e86b..faf3d43 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml logging.file=logs # if the database structure has been changed, increment this version number -application.version=1.0.51 +application.version=1.0.52 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bd69f8f..7890fd3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -17,7 +17,7 @@ logging.config=classpath:logback-spring.xml logging.file=logs # if the database structure has been changed, increment this version number -application.version=1.0.51 +application.version=1.0.52 jwt.secret=aitrainer jasypt.encryptor.password=Tibor diff --git a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt index 71059ae..9fc1c35 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt @@ -76,6 +76,7 @@ class AppCustomerPackageTest { assertEquals(customer.syncedDate, "2021-08-06 08:00:00") assertEquals(customer.firebaseRegToken, "123456789asdfghjkl") assertEquals(customer.lang!!.uppercase(), "HU") + assertEquals(customer.phone, "123456") } record[0] == Exercises::class.simpleName -> { val exercisesJson: String = record[1] diff --git a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt index 7dcbbe6..6276092 100644 --- a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt +++ b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt @@ -115,6 +115,7 @@ class CustomerTests { customer.emailSubscription = 1 customer.sportId = 2 customer.firebaseRegToken = "123456789asdfghjkl" + customer.phone = "123456" var updatedCustomer = customerRepository.save(customer) @@ -126,6 +127,7 @@ class CustomerTests { assertEquals(updatedCustomer.dataPolicyAllowed, 1) assertEquals(updatedCustomer.emailSubscription, 1) assertEquals(updatedCustomer.firebaseRegToken, "123456789asdfghjkl") + assertEquals(updatedCustomer.phone, "123456") customer.email = "sw@andio.biz"