change crud service

src/main/kotlin/com/test/rest/TestController.kt

@@ -3,6 +3,7 @@ package com.test.rest
 import com.test.model.TestModel
 import com.test.service.TestService
 import org.slf4j.LoggerFactory
+import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
@@ -22,19 +23,19 @@ open class TestController(private val testService: TestService) {
     //@PreAuthorize("hasRole('USER')")
 
     @PostMapping("/add")
-    fun add(@RequestBody testModel: TestModel): TestModel {
+    fun add(@RequestBody testModel: TestModel): ResponseEntity<TestModel> {
-        return testService.add(testModel)
+        return ResponseEntity.ok(testService.add(testModel))
     }
 
 
     @PutMapping("/update")
-    fun users(@RequestBody testModel: TestModel): TestModel {
+    fun users(@RequestBody testModel: TestModel): ResponseEntity<TestModel> {
-        return testService.update(testModel)
+        return ResponseEntity.ok(testService.update(testModel))
     }
 
     @GetMapping("/{id}")
-    fun get(@PathVariable(value = "id") id: Long): TestModel {
+    fun get(@PathVariable(value = "id") id: Long): ResponseEntity<TestModel> {
-        return testService.get(id)!!
+        return testService.get(id)?.let { ResponseEntity.ok(it) } ?: ResponseEntity.notFound().build()
     }
 
     @DeleteMapping("/{id}")

src/main/kotlin/com/test/service/TestService.kt

@@ -20,7 +20,7 @@ class TestService(private val testEntityRepository: TestEntityRepository) {
 
     fun update(model: TestModel): TestModel {
         var entity = testEntityRepository.save(TestEntity(model.id, model.key, model.value))
-        return TestModel(null, entity.key, entity.value)
+        return TestModel(model.id, entity.key, entity.value)
     }
 
     fun get(id: Long): TestModel? {