исправление

src/main/kotlin/com/project/movienight/adapters/web/FilmController.kt

@@ -8,10 +8,20 @@ import com.project.movienight.application.ports.input.CreateFilmUseCase
 import com.project.movienight.application.ports.input.DeleteFilmUseCase
 import com.project.movienight.application.ports.input.EditFilmCommand
 import com.project.movienight.application.ports.input.EditFilmUseCase
-import com.project.movienight.application.services.FilmService
-import com.project.movienight.domain.exception.EntityNotFoundException
+import com.project.movienight.application.ports.input.GetAllFilmsUseCase
+import com.project.movienight.application.ports.input.GetFilmByIdUseCase
+import com.project.movienight.application.ports.input.SearchFilmByTitleUseCase
 import org.springframework.http.HttpStatus
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PatchMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.ResponseStatus
+import org.springframework.web.bind.annotation.RestController
 import java.util.UUID
 
 @RestController
@@ -20,7 +30,9 @@ class FilmController(
     private val createFilmUseCase: CreateFilmUseCase,
     private val editFilmUseCase: EditFilmUseCase,
     private val deleteFilmUseCase: DeleteFilmUseCase,
-    private val filmService: FilmService,
+    private val getFilmByIdUseCase: GetFilmByIdUseCase,
+    private val getAllFilmsUseCase: GetAllFilmsUseCase,
+    private val searchFilmByTitleUseCase: SearchFilmByTitleUseCase,
 ) {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
@@ -44,11 +56,10 @@ class FilmController(
         FilmResponse.fromDomain(
             editFilmUseCase.edit(
                 id = id,
-                command =
-                    EditFilmCommand(
-                        title = request.title,
-                        description = request.description,
-                    ),
+                command = EditFilmCommand(
+                    title = request.title,
+                    description = request.description,
+                ),
             ),
         )
 
@@ -62,13 +73,15 @@ class FilmController(
     fun getById(
         @PathVariable id: UUID,
     ): FilmResponse =
-        FilmResponse.fromDomain(
-            filmService.findById(id) ?: throw EntityNotFoundException("Film", id.toString())
-        )
+        FilmResponse.fromDomain(getFilmByIdUseCase.getById(id))
 
     @GetMapping("/search")
     fun searchByTitle(
         @RequestParam title: String,
     ): FilmResponse? =
-        filmService.findByTitle(title)?.let { FilmResponse.fromDomain(it) }
+        searchFilmByTitleUseCase.searchByTitle(title)?.let { FilmResponse.fromDomain(it) }
+
+    @GetMapping
+    fun getAll(): List<FilmResponse> =
+        getAllFilmsUseCase.getAll().map { FilmResponse.fromDomain(it) }
 }

src/main/kotlin/com/project/movienight/adapters/web/FilmLibraryController.kt

@@ -7,13 +7,21 @@ import com.project.movienight.application.ports.input.AddFilmToLibraryCommand
 import com.project.movienight.application.ports.input.AddFilmToLibraryUseCase
 import com.project.movienight.application.ports.input.CreateFilmLibraryCommand
 import com.project.movienight.application.ports.input.CreateFilmLibraryUseCase
+import com.project.movienight.application.ports.input.GetAllFilmsUseCase
+import com.project.movienight.application.ports.input.GetFilmByIdUseCase
 import com.project.movienight.application.ports.input.GetFilmLibraryQuery
 import com.project.movienight.application.ports.input.GetFilmLibraryUseCase
 import com.project.movienight.application.ports.input.RemoveFilmFromLibraryCommand
 import com.project.movienight.application.ports.input.RemoveFilmFromLibraryUseCase
-import com.project.movienight.application.services.FilmService
 import org.springframework.http.HttpStatus
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.ResponseStatus
+import org.springframework.web.bind.annotation.RestController
 import java.util.UUID
 
 @RestController
@@ -23,7 +31,8 @@ class FilmLibraryController(
     private val addFilmToLibraryUseCase: AddFilmToLibraryUseCase,
     private val removeFilmFromLibraryUseCase: RemoveFilmFromLibraryUseCase,
     private val getFilmLibraryUseCase: GetFilmLibraryUseCase,
-    private val filmService: FilmService,
+    private val getFilmByIdUseCase: GetFilmByIdUseCase,
+    private val getAllFilmsUseCase: GetAllFilmsUseCase,
 ) {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
@@ -58,9 +67,9 @@ class FilmLibraryController(
             GetFilmLibraryQuery(userId = userId)
         )
 
-        val film = filmService.findById(library.filmId)
+        val film = getFilmByIdUseCase.getById(library.filmId)
 
-        return film?.let { listOf(FilmResponse.fromDomain(it)) } ?: emptyList()
+        return listOf(FilmResponse.fromDomain(film))
     }
 
     @PostMapping("/films/{filmId}")
@@ -98,7 +107,7 @@ class FilmLibraryController(
             GetFilmLibraryQuery(userId = userId)
         )
 
-        val allFilms = filmService.findAll()
+        val allFilms = getAllFilmsUseCase.getAll()
 
         val availableFilms = allFilms.filter { it.id != userLibrary.filmId }
 

src/main/kotlin/com/project/movienight/adapters/web/UserController.kt

@@ -8,10 +8,18 @@ import com.project.movienight.application.ports.input.CreateUserUseCase
 import com.project.movienight.application.ports.input.DeleteUserUseCase
 import com.project.movienight.application.ports.input.EditUserCommand
 import com.project.movienight.application.ports.input.EditUserUseCase
-import com.project.movienight.application.services.UserService
-import com.project.movienight.domain.exception.EntityNotFoundException
+import com.project.movienight.application.ports.input.GetAllUsersUseCase
+import com.project.movienight.application.ports.input.GetUserByIdUseCase
 import org.springframework.http.HttpStatus
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PatchMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.ResponseStatus
+import org.springframework.web.bind.annotation.RestController
 import java.util.UUID
 
 @RestController
@@ -20,7 +28,8 @@ class UserController(
     private val createUserUseCase: CreateUserUseCase,
     private val editUserUseCase: EditUserUseCase,
     private val deleteUserUseCase: DeleteUserUseCase,
-    private val userService: UserService,
+    private val getUserByIdUseCase: GetUserByIdUseCase,
+    private val getAllUsersUseCase: GetAllUsersUseCase,
 ) {
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
@@ -38,15 +47,13 @@ class UserController(
 
     @GetMapping
     fun getAll(): List<UserResponse> =
-        userService.findAll().map { UserResponse.fromDomain(it) }
+        getAllUsersUseCase.getAll().map { UserResponse.fromDomain(it) }
 
     @GetMapping("/{id}")
     fun getById(
         @PathVariable id: UUID,
     ): UserResponse =
-        UserResponse.fromDomain(
-            userService.findById(id) ?: throw EntityNotFoundException("User", id.toString())
-        )
+        UserResponse.fromDomain(getUserByIdUseCase.getById(id))
 
     @PatchMapping("/{id}")
     fun edit(
@@ -56,10 +63,9 @@ class UserController(
         UserResponse.fromDomain(
             editUserUseCase.edit(
                 id = id,
-                command =
-                    EditUserCommand(
-                        name = request.name,
-                    ),
+                command = EditUserCommand(
+                    name = request.name,
+                ),
             ),
         )