diff --git a/data/db/update_1_0_47.sql b/data/db/update_1_0_47.sql index 68d4cf5..c791c21 100644 --- a/data/db/update_1_0_47.sql +++ b/data/db/update_1_0_47.sql @@ -1,7 +1,7 @@ START TRANSACTION; ALTER TABLE `customer` - ADD COLUMN `trial` TINYINT NULL DEFAULT NULL AFTER `synced_date`; + ADD COLUMN `trial_date` DATETIME NULL DEFAULT NULL AFTER `synced_date`; UPDATE configuration set config_value = "1.0.47", date_change=CURRENT_DATE WHERE config_key = "db_version"; diff --git a/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt b/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt index 103d947..3eb3402 100644 --- a/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt +++ b/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt @@ -117,8 +117,11 @@ class CustomerController ( private val customerRepository: CustomerRepository) { if (newCustomer.emailSubscription != null) { updatedCustomer.emailSubscription = newCustomer.emailSubscription } - if (newCustomer.trial != null) { - updatedCustomer.trial = newCustomer.trial + if (newCustomer.syncedDate != null) { + updatedCustomer.syncedDate = newCustomer.syncedDate + } + if (newCustomer.trialDate != null) { + updatedCustomer.trialDate = newCustomer.trialDate } updatedCustomer.sex = newCustomer.sex updatedCustomer.birthYear = newCustomer.birthYear diff --git a/src/main/kotlin/com/aitrainer/api/model/Customer.kt b/src/main/kotlin/com/aitrainer/api/model/Customer.kt index d5e830e..79428fe 100644 --- a/src/main/kotlin/com/aitrainer/api/model/Customer.kt +++ b/src/main/kotlin/com/aitrainer/api/model/Customer.kt @@ -26,8 +26,8 @@ data class Customer ( @Expose var firebaseUid: String? = null, @Expose var sportId: Int? = null, @Expose var emailSubscription: Int? = 0, - @Expose var synced_date: String? = null, - @Expose var trial: Boolean? = false, + @Expose var syncedDate: String? = null, + @Expose var trialDate: String? = null, @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Expose var customerId: Long = 0, ) diff --git a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt index 0dfeeb3..06f5464 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt @@ -71,7 +71,8 @@ class AppCustomerPackageTest { val customer: Customer = gson.fromJson(customerJson, type) assertEquals(customer.email, "sw@andio.biz") assertEquals(customer.birthYear, 1972) - assertEquals(customer.trial, true) + assertEquals(customer.trialDate, "2021-08-07 08:00:00") + assertEquals(customer.syncedDate, "2021-08-06 08:00:00") } record[0] == Exercises::class.simpleName -> { val exercisesJson: String = record[1] diff --git a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt index c3456dc..ff03f27 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt @@ -139,12 +139,12 @@ class AppPackageTest { val sportJson: String = record[1] val type = object : TypeToken?>() {}.type val sports: List = gson.fromJson(sportJson, type) - assertEquals(sports.size, 4) + assertEquals(sports.size, 5) assertEquals(sports[1].name, "Football") assertEquals(sports[1].translations[0].sportName, "Labdarúgás") assertEquals(sports[2].name, "Footgolf") assertEquals(sports[2].translations[0].sportName, "Footgolf") - assertEquals(sports[3].translations[0].sportName, "Tenisz") + assertEquals(sports[3].translations[0].sportName, "Kézilabda") } else if (record[0] == Tutorial::class.simpleName) { val tutorialJson: String = record[1] val type = object : TypeToken?>() {}.type diff --git a/src/test/kotlin/com/aitrainer/api/test/SportTest.kt b/src/test/kotlin/com/aitrainer/api/test/SportTest.kt index 99671da..02eae8a 100644 --- a/src/test/kotlin/com/aitrainer/api/test/SportTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/SportTest.kt @@ -26,12 +26,12 @@ class SportTest { assertTrue(sports is List) assertTrue(sports.isNotEmpty()) - assertEquals(sports.size, 4) + assertEquals(sports.size, 5) assertEquals(sports[1].name, "Football") assertEquals(sports[1].translations[0].sportName, "Labdarúgás") assertEquals(sports[2].name, "Footgolf") assertEquals(sports[2].translations[0].sportName, "Footgolf") - assertEquals(sports[3].translations[0].sportName, "Tenisz") + assertEquals(sports[3].translations[0].sportName, "Kézilabda") } } \ No newline at end of file