Update

Author: Piotr Wolak

src/main/kotlin/com/codersee/springcoroutines/controller/CompanyController.kt

@@ -74,15 +74,11 @@ class CompanyController(
             id = id,
             requestedCompany = companyRequest.toModel()
         )
-            ?.let { company ->
+            .let { company ->
                 company.toResponse(
                     users = findCompanyUsers(company)
                 )
             }
-            ?: throw ResponseStatusException(
-                HttpStatus.INTERNAL_SERVER_ERROR,
-                "Unexpected error during company update."
-            )
 
     private suspend fun findCompanyUsers(company: Company) =
         userService.findUsersByCompanyId(company.id!!)

src/main/kotlin/com/codersee/springcoroutines/controller/UserController.kt

@@ -58,8 +58,7 @@ class UserController(
             id = id,
             requestedUser = userRequest.toModel()
         )
-            ?.let(User::toResponse)
-            ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Unexpected error during user update.")
+            .toResponse()
 }
 
 private fun UserRequest.toModel(): User =

src/main/kotlin/com/codersee/springcoroutines/service/CompanyService.kt

@@ -4,10 +4,10 @@ import com.codersee.springcoroutines.model.Company
 import com.codersee.springcoroutines.repository.CompanyRepository
 import kotlinx.coroutines.flow.Flow
 import org.springframework.http.HttpStatus
-import org.springframework.stereotype.Component
+import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
 
-@Component
+@Service
 class CompanyService(
     private val companyRepository: CompanyRepository
 ) {
@@ -33,7 +33,7 @@ class CompanyService(
     suspend fun findAllCompaniesByNameLike(name: String): Flow<Company> =
         companyRepository.findByNameContaining(name)
 
-    suspend fun updateCompany(id: Long, requestedCompany: Company): Company? {
+    suspend fun updateCompany(id: Long, requestedCompany: Company): Company {
         val foundCompany = companyRepository.findById(id)
 
         return if (foundCompany == null)

src/main/kotlin/com/codersee/springcoroutines/service/UserService.kt

@@ -34,7 +34,7 @@ class UserService(
             userRepository.deleteById(id)
     }
 
-    suspend fun updateUser(id: Long, requestedUser: User): User? {
+    suspend fun updateUser(id: Long, requestedUser: User): User {
         val foundUser = userRepository.findById(id)
 
         return if (foundUser == null)