From 0050aa206d0612849cb9ab047fc9d27bda3a80d0 Mon Sep 17 00:00:00 2001 From: "Tibor Bossanyi (Freelancer)" Date: Fri, 5 Nov 2021 18:53:36 +0100 Subject: [PATCH] API 1.0.53 customer.life_long --- build.gradle.kts | 2 +- data/db/update_1_0_53.sql | 10 ++++++++++ src/main/kotlin/com/aitrainer/api/model/Customer.kt | 1 + src/main/resources/application-prod.properties | 2 +- src/main/resources/application.properties | 2 +- .../com/aitrainer/api/test/AppCustomerPackageTest.kt | 1 + .../kotlin/com/aitrainer/api/test/CustomerTests.kt | 2 ++ 7 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 data/db/update_1_0_53.sql diff --git a/build.gradle.kts b/build.gradle.kts index e902554..4949d93 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.52" +version = "1.0.53" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/update_1_0_53.sql b/data/db/update_1_0_53.sql new file mode 100644 index 0000000..69371ef --- /dev/null +++ b/data/db/update_1_0_53.sql @@ -0,0 +1,10 @@ +START TRANSACTION; + + +ALTER TABLE `customer` + ADD COLUMN `life_long` TINYINT NULL DEFAULT NULL AFTER `phone`; + + +UPDATE configuration set config_value = "1.0.53", 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 4555690..2c3b67c 100644 --- a/src/main/kotlin/com/aitrainer/api/model/Customer.kt +++ b/src/main/kotlin/com/aitrainer/api/model/Customer.kt @@ -31,6 +31,7 @@ data class Customer ( @Expose var firebaseRegToken: String? = null, @Expose var lang: String? = null, @Expose var phone: String? = null, + @Expose var lifeLong: Int? = 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 faf3d43..50aa032 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.52 +application.version=1.0.53 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7890fd3..f15356d 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.52 +application.version=1.0.53 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 9fc1c35..000cf75 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt @@ -77,6 +77,7 @@ class AppCustomerPackageTest { assertEquals(customer.firebaseRegToken, "123456789asdfghjkl") assertEquals(customer.lang!!.uppercase(), "HU") assertEquals(customer.phone, "123456") + assertEquals(customer.lifeLong, 1) } 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 6276092..0d7344b 100644 --- a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt +++ b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt @@ -116,6 +116,7 @@ class CustomerTests { customer.sportId = 2 customer.firebaseRegToken = "123456789asdfghjkl" customer.phone = "123456" + customer.lifeLong = 1 var updatedCustomer = customerRepository.save(customer) @@ -128,6 +129,7 @@ class CustomerTests { assertEquals(updatedCustomer.emailSubscription, 1) assertEquals(updatedCustomer.firebaseRegToken, "123456789asdfghjkl") assertEquals(updatedCustomer.phone, "123456") + assertEquals(updatedCustomer.lifeLong, 1) customer.email = "sw@andio.biz"