From eab46438c81acd73ac164ebb48c366130ebc533b Mon Sep 17 00:00:00 2001
From: bossanyit <tibor.bossanyi@aitrainer.app>
Date: Sat, 2 Jan 2021 14:33:08 +0100
Subject: [PATCH] API1.0.22+2 dataAllowedPolicy

---
 .../com/aitrainer/api/controller/CustomerController.kt | 10 +++++-----
 .../kotlin/com/aitrainer/api/test/CustomerTests.kt     |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt b/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
index 0d2bcad..dbb018a 100644
--- a/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
+++ b/src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
@@ -91,7 +91,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
 
         val password: String? = newCustomer.password
         val updatedCustomer: Customer
-        if ( password == null || password.isEmpty() ) {
+        if ( password == null || password.length == 0 ) {
             updatedCustomer =
             returnCustomer.copy(
                     name = newCustomer.name,
@@ -100,8 +100,8 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
                     birthYear = newCustomer.birthYear,
                     fitnessLevel = newCustomer.fitnessLevel,
                     bodyType = newCustomer.bodyType,
-                    goal = newCustomer.goal
-                    //weight = newCustomer.weight
+                    goal = newCustomer.goal,
+                    dataPolicyAllowed = newCustomer.dataPolicyAllowed
             )
         } else {
             updatedCustomer =
@@ -113,8 +113,8 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
                     birthYear = newCustomer.birthYear,
                     fitnessLevel = newCustomer.fitnessLevel,
                     bodyType = newCustomer.bodyType,
-                    goal = newCustomer.goal
-                    //weight = newCustomer.weight
+                    goal = newCustomer.goal,
+                    dataPolicyAllowed = newCustomer.dataPolicyAllowed                    
             )
         }
 
diff --git a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
index f66182d..88e691c 100644
--- a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
+++ b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
@@ -80,9 +80,11 @@ class CustomerTests {
 
         assertNotNull(updatedCustomer)
         updatedCustomer.firstname ="Tiborka"
+        updatedCustomer.dataPolicyAllowed = 1;
 
         val customer: Customer = customerRepository.save( updatedCustomer )
         assertEquals( customer.firstname, "Tiborka")
+        assertEquals(customer.dataPolicyAllowed, 1)
 
         customerRepository.delete(updatedCustomer)
     }