Merge branch 'task/actualize_db_environment' into 'version/2.0.0'

Актуализировать классы для работы с БД

See merge request !49

app/src/main/java/com/sequenia/testtaskapp/data/database/dao/FilmsDao.kt

 package com.sequenia.testtaskapp.data.database.dao
 
-import androidx.room.*
-import ru.sequenia.testtask.shared.films.data.dto.FilmAnnotationDto
-import ru.sequenia.testtask.shared.films.data.dto.FilmDto
-import ru.sequenia.testtask.shared.films.data.dto.FilmWithGenresDto
-import ru.sequenia.testtask.shared.films.data.dto.GenreWithFilmsDto
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import com.sequenia.testtaskapp.data.database.dto.FilmAnnotationDto
+import com.sequenia.testtaskapp.data.database.dto.FilmDto
+import com.sequenia.testtaskapp.data.database.dto.FilmWithGenresDto
+import com.sequenia.testtaskapp.data.database.dto.GenreWithFilmsDto
 
 /**
  * Dao для работы с фильмами
@@ -17,9 +21,9 @@ interface FilmsDao {
 
     @Transaction
     @Query("SELECT * FROM films_table WHERE filmId = :filmId")
-    suspend fun get(filmId: Long): FilmWithGenresDto
+    suspend fun getFilm(filmId: Long): FilmWithGenresDto
 
-    @Query("SELECT filmId, localizedName, imageUrl FROM films_table ORDER BY localizedName")
+    @Query("SELECT filmId, localizedName, imageUrl FROM films_table")
     suspend fun getAll(): List<FilmAnnotationDto>
 
     @Transaction

app/src/main/java/com/sequenia/testtaskapp/data/database/dao/GenreDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.REPLACE
 import androidx.room.Query
-import ru.sequenia.testtask.shared.films.data.dto.GenreDto
+import com.sequenia.testtaskapp.data.database.dto.GenreDto
 
 /**
  * Dao для работы с жанрами

app/src/main/java/com/sequenia/testtaskapp/data/database/dao/GenreFilmLinksDao.kt

@@ -3,7 +3,7 @@ package com.sequenia.testtaskapp.data.database.dao
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.IGNORE
-import ru.sequenia.testtask.shared.films.data.dto.GenreFilmLinksDto
+import com.sequenia.testtaskapp.data.database.dto.GenreFilmLinksDto
 
 /**
  * Dao для работы с кросс ссылками между фильмами и жанрами

app/src/main/java/com/sequenia/testtaskapp/data/database/database/FilmsDataBase.kt

@@ -2,12 +2,12 @@ package com.sequenia.testtaskapp.data.database.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import ru.sequenia.testtask.shared.films.data.dao.FilmsDao
-import ru.sequenia.testtask.shared.films.data.dao.GenreDao
-import ru.sequenia.testtask.shared.films.data.dao.GenreFilmLinksDao
-import ru.sequenia.testtask.shared.films.data.dto.FilmDto
-import ru.sequenia.testtask.shared.films.data.dto.GenreDto
-import ru.sequenia.testtask.shared.films.data.dto.GenreFilmLinksDto
+import com.sequenia.testtaskapp.data.database.dao.FilmsDao
+import com.sequenia.testtaskapp.data.database.dao.GenreDao
+import com.sequenia.testtaskapp.data.database.dao.GenreFilmLinksDao
+import com.sequenia.testtaskapp.data.database.dto.FilmDto
+import com.sequenia.testtaskapp.data.database.dto.GenreDto
+import com.sequenia.testtaskapp.data.database.dto.GenreFilmLinksDto
 
 /**
  * База данных для работы с фильмами и жанрами

app/src/main/java/com/sequenia/testtaskapp/data/database/dto/FilmAnnotationDto.kt

@@ -10,6 +10,6 @@ import androidx.room.PrimaryKey
 data class FilmAnnotationDto(
     @PrimaryKey
     val filmId: Long,
-    val localizedName: String,
+    val localizedName: String?,
     val imageUrl: String?
 )
\ No newline at end of file

app/src/main/java/com/sequenia/testtaskapp/data/database/dto/FilmDto.kt

@@ -10,9 +10,9 @@ import androidx.room.PrimaryKey
 data class FilmDto(
     @PrimaryKey
     val filmId: Long,
-    val localizedName: String,
-    val name: String,
-    val year: Int,
+    val localizedName: String?,
+    val name: String?,
+    val year: Int?,
     val rating: Float?,
     val imageUrl: String?,
     val description: String?