bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API 1.0.57.3 get_user_by_email for deactivated: HTTP not found

Browse Source
This commit is contained in:
Tibor Bossanyi (Freelancer)
2022-11-26 16:34:32 +01:00
parent 839d3a85a5
commit 29415ba41f
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
+3 -3
View File
@@ -52,7 +52,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
@Secured
@GetMapping("/customers/find_by_email/{email}")
fun getCustomerByEmail(@PathVariable(value = "email") email: String): ResponseEntity<Customer> {
val customer: Customer? = customerRepository.findByEmail(email)
val customer: Customer? = customerRepository.findByEmailAndActive(email, "Y")
return if (customer == null) ResponseEntity.notFound().build() else ResponseEntity.ok().body(customer)
}
@@ -167,7 +167,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
email = newUser.username
}
val returnCustomer: Customer? = customerRepository.findByEmail(newUser.username).let {
val returnCustomer: Customer? = customerRepository.findByEmailAndActive(newUser.username, "Y").let {
if ( it == null) {
customerRepository.save(customer)
} else {
@@ -192,7 +192,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
email = newUser.username
password = newUser.password
}
val returnCustomer: Customer? = customerRepository.findByEmail(newUser.username).let {
val returnCustomer: Customer? = customerRepository.findByEmailAndActive(newUser.username, "Y").let {
if ( it == null) {
null
} else {