src/main/kotlin/com/project/movienight/adapters/persistence/jdbc/FilmRepository.kt

@@ -62,10 +62,11 @@ class FilmRepository(
         )
 
     override fun findByTitle(title: String): Film? {
-        val films = jdbc.query(
+        val films =
+            jdbc.query(
                 "SELECT id, title, description FROM films WHERE title = ?",
                 filmRowMapper,
-            title
+                title,
             )
         return films.firstOrNull()
     }

src/main/kotlin/com/project/movienight/adapters/persistence/jdbc/UserRepository.kt

@@ -69,7 +69,8 @@ class UserRepository(
     }
 
     override fun findAll(): List<User> =
-        jdbc.query(
+        jdbc
+            .query(
                 "SELECT id, name, email, provider, provider_id, created_at FROM users",
                 userEntityRowMapper,
             ).map { it.toDomain() }
@@ -84,7 +85,10 @@ class UserRepository(
     ): User? {
         val entities =
             jdbc.query(
-                "SELECT id, name, email, provider, provider_id, created_at FROM users WHERE provider = ? AND provider_id = ?",
+                """
+                SELECT id, name, email, provider, provider_id, created_at FROM users
+                WHERE provider = ? AND provider_id = ?
+                """.trimIndent(),
                 userEntityRowMapper,
                 provider.name,
                 providerId,

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

@@ -56,7 +56,8 @@ class FilmController(
         FilmResponse.fromDomain(
             editFilmUseCase.edit(
                 id = id,
-                command = EditFilmCommand(
+                command =
+                    EditFilmCommand(
                         title = request.title,
                         description = request.description,
                     ),
@@ -72,16 +73,13 @@ class FilmController(
     @GetMapping("/{id}")
     fun getById(
         @PathVariable id: UUID,
-    ): FilmResponse =
+    ): FilmResponse = FilmResponse.fromDomain(getFilmByIdUseCase.getById(id))
-        FilmResponse.fromDomain(getFilmByIdUseCase.getById(id))
 
     @GetMapping("/search")
     fun searchByTitle(
         @RequestParam title: String,
-    ): FilmResponse? =
+    ): FilmResponse? = searchFilmByTitleUseCase.searchByTitle(title)?.let { FilmResponse.fromDomain(it) }
-        searchFilmByTitleUseCase.searchByTitle(title)?.let { FilmResponse.fromDomain(it) }
 
     @GetMapping
-    fun getAll(): List<FilmResponse> =
+    fun getAll(): List<FilmResponse> = getAllFilmsUseCase.getAll().map { FilmResponse.fromDomain(it) }
-        getAllFilmsUseCase.getAll().map { FilmResponse.fromDomain(it) }
 }

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

@@ -63,8 +63,9 @@ class FilmLibraryController(
     fun getAllFilmsInLibrary(
         @PathVariable userId: UUID,
     ): List<FilmResponse> {
-        val library = getFilmLibraryUseCase.getLibrary(
+        val library =
-            GetFilmLibraryQuery(userId = userId)
+            getFilmLibraryUseCase.getLibrary(
+                GetFilmLibraryQuery(userId = userId),
             )
 
         val film = getFilmByIdUseCase.getById(library.filmId)
@@ -92,19 +93,22 @@ class FilmLibraryController(
     fun removeFilm(
         @PathVariable userId: UUID,
         @PathVariable filmId: UUID,
-    ) = removeFilmFromLibraryUseCase.removeFilm(
+    ) {
+        removeFilmFromLibraryUseCase.removeFilm(
             RemoveFilmFromLibraryCommand(
                 userId = userId,
                 filmId = filmId,
             ),
         )
+    }
 
     @GetMapping("/available-films")
     fun getAvailableFilms(
         @PathVariable userId: UUID,
     ): List<FilmResponse> {
-        val userLibrary = getFilmLibraryUseCase.getLibrary(
+        val userLibrary =
-            GetFilmLibraryQuery(userId = userId)
+            getFilmLibraryUseCase.getLibrary(
+                GetFilmLibraryQuery(userId = userId),
             )
 
         val allFilms = getAllFilmsUseCase.getAll()

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

@@ -46,14 +46,12 @@ class UserController(
         )
 
     @GetMapping
-    fun getAll(): List<UserResponse> =
+    fun getAll(): List<UserResponse> = getAllUsersUseCase.getAll().map { UserResponse.fromDomain(it) }
-        getAllUsersUseCase.getAll().map { UserResponse.fromDomain(it) }
 
     @GetMapping("/{id}")
     fun getById(
         @PathVariable id: UUID,
-    ): UserResponse =
+    ): UserResponse = UserResponse.fromDomain(getUserByIdUseCase.getById(id))
-        UserResponse.fromDomain(getUserByIdUseCase.getById(id))
 
     @PatchMapping("/{id}")
     fun edit(
@@ -63,7 +61,8 @@ class UserController(
         UserResponse.fromDomain(
             editUserUseCase.edit(
                 id = id,
-                command = EditUserCommand(
+                command =
+                    EditUserCommand(
                         name = request.name,
                     ),
             ),

src/main/kotlin/com/project/movienight/application/services/FilmService.kt

@@ -28,7 +28,6 @@ class FilmService(
     GetFilmByIdUseCase,
     GetAllFilmsUseCase,
     SearchFilmByTitleUseCase {
-
     override fun create(command: CreateFilmCommand): Film {
         if (filmConfig.isBlocked(command.title)) {
             throw BlockedValueException(target = "Film", field = "title")
@@ -37,7 +36,8 @@ class FilmService(
             throw BlockedValueException(target = "Film", field = "description")
         }
 
-        val film = Film(
+        val film =
+            Film(
                 id = idGenerator.generateId(),
                 title = command.title,
                 description = command.description,
@@ -45,7 +45,10 @@ class FilmService(
         return filmRepository.save(film)
     }
 
-    override fun edit(id: UUID, command: EditFilmCommand): Film {
+    override fun edit(
+        id: UUID,
+        command: EditFilmCommand,
+    ): Film {
         if (filmConfig.isBlocked(command.title)) {
             throw BlockedValueException(target = "Film", field = "title")
         }
@@ -63,9 +66,8 @@ class FilmService(
         filmRepository.deleteById(id)
     }
 
-    override fun getById(id: UUID): Film {
+    override fun getById(id: UUID): Film =
-        return filmRepository.findById(id) ?: throw EntityNotFoundException(entity = "Film", id = id.toString())
+        filmRepository.findById(id) ?: throw EntityNotFoundException(entity = "Film", id = id.toString())
-    }
 
     override fun getAll(): List<Film> = filmRepository.findAll()
 

src/main/kotlin/com/project/movienight/application/services/UserService.kt

@@ -26,13 +26,13 @@ class UserService(
     DeleteUserUseCase,
     GetUserByIdUseCase,
     GetAllUsersUseCase {
-
     override fun create(command: CreateUserCommand): User {
         if (userConfig.isBlocked(command.name)) {
             throw BlockedValueException(target = "User", field = "name")
         }
 
-        val user = User(
+        val user =
+            User(
                 id = idGenerator.generateId(),
                 name = command.name,
                 email = command.email,
@@ -59,9 +59,8 @@ class UserService(
         userRepository.deleteById(id)
     }
 
-    override fun getById(id: UUID): User {
+    override fun getById(id: UUID): User =
-        return userRepository.findById(id) ?: throw EntityNotFoundException(entity = "User", id = id.toString())
+        userRepository.findById(id) ?: throw EntityNotFoundException(entity = "User", id = id.toString())
-    }
 
     override fun getAll(): List<User> = userRepository.findAll()
 }

src/main/resources/db/migration/V1__init.sql

@@ -1,7 +1,10 @@
 CREATE TABLE IF NOT EXISTS public.users (
     id UUID PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
-    email VARCHAR(320) NOT NULL UNIQUE
+    email VARCHAR(320) NOT NULL UNIQUE,
+    provider VARCHAR(64),
+    provider_id VARCHAR(255),
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE TABLE IF NOT EXISTS public.films (

src/test/kotlin/com/project/movienight/adapters/persistence/entity/UserEntityMappingTest.kt

@@ -9,10 +9,10 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
 class UserEntityMappingTest {
-
     @Test
     fun `toDomain maps UserEntity correctly`() {
-        val entity = UserEntity(
+        val entity =
+            UserEntity(
                 id = UUID.randomUUID(),
                 name = "John Pork",
                 email = "john@email.com",
@@ -30,11 +30,12 @@ class UserEntityMappingTest {
 
     @Test
     fun `toEntity maps User with OAuth provider`() {
-        val user = User(
+        val user =
+            User(
                 id = UUID.randomUUID(),
                 name = "Jane",
                 email = "jane@mail.com",
-            library = null
+                library = null,
             )
 
         val entity = user.toEntity(AuthProvider.YANDEX, "yandex456")
@@ -48,11 +49,12 @@ class UserEntityMappingTest {
 
     @Test
     fun `toEntity maps User without OAuth provider`() {
-        val user = User(
+        val user =
+            User(
                 id = UUID.randomUUID(),
                 name = "Bob",
                 email = "bob@mail.com",
-            library = null
+                library = null,
             )
 
         val entity = user.toEntity()
@@ -63,11 +65,12 @@ class UserEntityMappingTest {
 
     @Test
     fun `mapping is reversible for basic fields`() {
-        val original = User(
+        val original =
+            User(
                 id = UUID.randomUUID(),
                 name = "Alice",
                 email = "alice@email.com",
-            library = null
+                library = null,
             )
 
         val mapped = original.toEntity().toDomain()
@@ -76,6 +79,4 @@ class UserEntityMappingTest {
         assertEquals(original.name, mapped.name)
         assertEquals(original.email, mapped.email)
     }
-
-
 }