Merge branch 'tibor' into 'master'
API 1.0.54 customer.lang update See merge request bossanyit/aitrainer_server!79
This commit is contained in:
commit
22325eae8f
@ -126,6 +126,9 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
|
|||||||
if (newCustomer.firebaseRegToken != null) {
|
if (newCustomer.firebaseRegToken != null) {
|
||||||
updatedCustomer.firebaseRegToken = newCustomer.firebaseRegToken
|
updatedCustomer.firebaseRegToken = newCustomer.firebaseRegToken
|
||||||
}
|
}
|
||||||
|
if (newCustomer.lang != null) {
|
||||||
|
updatedCustomer.lang = newCustomer.lang
|
||||||
|
}
|
||||||
updatedCustomer.sex = newCustomer.sex
|
updatedCustomer.sex = newCustomer.sex
|
||||||
updatedCustomer.birthYear = newCustomer.birthYear
|
updatedCustomer.birthYear = newCustomer.birthYear
|
||||||
updatedCustomer.fitnessLevel = newCustomer.fitnessLevel
|
updatedCustomer.fitnessLevel = newCustomer.fitnessLevel
|
||||||
|
@ -117,6 +117,7 @@ class CustomerTests {
|
|||||||
customer.firebaseRegToken = "123456789asdfghjkl"
|
customer.firebaseRegToken = "123456789asdfghjkl"
|
||||||
customer.phone = "123456"
|
customer.phone = "123456"
|
||||||
customer.lifeLong = 1
|
customer.lifeLong = 1
|
||||||
|
customer.lang = "de"
|
||||||
|
|
||||||
|
|
||||||
var updatedCustomer = customerRepository.save(customer)
|
var updatedCustomer = customerRepository.save(customer)
|
||||||
@ -130,6 +131,7 @@ class CustomerTests {
|
|||||||
assertEquals(updatedCustomer.firebaseRegToken, "123456789asdfghjkl")
|
assertEquals(updatedCustomer.firebaseRegToken, "123456789asdfghjkl")
|
||||||
assertEquals(updatedCustomer.phone, "123456")
|
assertEquals(updatedCustomer.phone, "123456")
|
||||||
assertEquals(updatedCustomer.lifeLong, 1)
|
assertEquals(updatedCustomer.lifeLong, 1)
|
||||||
|
assertEquals(updatedCustomer.lang, "de")
|
||||||
|
|
||||||
|
|
||||||
customer.email = "sw@andio.biz"
|
customer.email = "sw@andio.biz"
|
||||||
|
Loading…
Reference in New Issue
Block a user