From 77c7e17d4ade5c35566b2d7f8172303bc971da1b Mon Sep 17 00:00:00 2001 From: "Tibor Bossanyi (Freelancer)" Date: Mon, 4 Oct 2021 17:40:41 +0200 Subject: [PATCH] API 1.0.51 customer.lang --- build.gradle.kts | 2 +- data/db/update_1_0_51.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 | 2 ++ 6 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 data/db/update_1_0_51.sql diff --git a/build.gradle.kts b/build.gradle.kts index e57ca5d..250bf9b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.50" +version = "1.0.51" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/update_1_0_51.sql b/data/db/update_1_0_51.sql new file mode 100644 index 0000000..3c2010b --- /dev/null +++ b/data/db/update_1_0_51.sql @@ -0,0 +1,10 @@ +START TRANSACTION; + + +ALTER TABLE `customer` + ADD COLUMN `lang` CHAR(5) NULL DEFAULT NULL AFTER `firebase_reg_token`; + + +UPDATE configuration set config_value = "1.0.51", 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 1ef8717..cba375e 100644 --- a/src/main/kotlin/com/aitrainer/api/model/Customer.kt +++ b/src/main/kotlin/com/aitrainer/api/model/Customer.kt @@ -29,6 +29,7 @@ data class Customer ( @Expose var syncedDate: String? = null, @Expose var trialDate: String? = null, @Expose var firebaseRegToken: String? = null, + @Expose var lang: 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 b87cd7d..497e86b 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.50 +application.version=1.0.51 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index acad4a5..bd69f8f 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.50 +application.version=1.0.51 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 18995e2..71059ae 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt @@ -42,6 +42,7 @@ class AppCustomerPackageTest { @Autowired private lateinit var customerTrainingPlanRepository: CustomerTrainingPlanRepository + @OptIn(ExperimentalStdlibApi::class) @Test fun customerPackageTest() { val gson = Gson() @@ -74,6 +75,7 @@ class AppCustomerPackageTest { assertEquals(customer.trialDate, "2021-08-07 08:00:00") assertEquals(customer.syncedDate, "2021-08-06 08:00:00") assertEquals(customer.firebaseRegToken, "123456789asdfghjkl") + assertEquals(customer.lang!!.uppercase(), "HU") } record[0] == Exercises::class.simpleName -> { val exercisesJson: String = record[1]