Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: book entity

Browse source 
* Remove nullability from author
This commit is contained in:
Acclorite 2025-09-01 22:18:49 +03:00
parent 56b5aba67a
commit 1d9f5514ff
No known key found for this signature in database
GPG key ID: 6E54C611F6EE8593
5 changed files with 260 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

221
app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/15.json Normal file
View file

@ -0,0 +1,221 @@
{
"formatVersion": 1,
"database": {
"version": 15,
"identityHash": "34a325ef104d83604c6d21d765c901b8",
"entities": [
{
"tableName": "BookEntity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `author` TEXT NOT NULL, `description` TEXT, `filePath` TEXT NOT NULL, `scrollIndex` INTEGER NOT NULL, `scrollOffset` INTEGER NOT NULL, `progress` REAL NOT NULL, `image` TEXT, `categories` TEXT NOT NULL DEFAULT '[]')",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "author",
"columnName": "author",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT"
},
{
"fieldPath": "filePath",
"columnName": "filePath",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "scrollIndex",
"columnName": "scrollIndex",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "scrollOffset",
"columnName": "scrollOffset",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "progress",
"columnName": "progress",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "image",
"columnName": "image",
"affinity": "TEXT"
},
{
"fieldPath": "categories",
"columnName": "categories",
"affinity": "TEXT",
"notNull": true,
"defaultValue": "'[]'"
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
}
},
{
"tableName": "HistoryEntity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bookId` INTEGER NOT NULL, `time` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "bookId",
"columnName": "bookId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "time",
"columnName": "time",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
}
},
{
"tableName": "ColorPresetEntity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `backgroundColor` INTEGER NOT NULL, `fontColor` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, `order` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER"
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "backgroundColor",
"columnName": "backgroundColor",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "fontColor",
"columnName": "fontColor",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isSelected",
"columnName": "isSelected",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "order",
"columnName": "order",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
}
},
{
"tableName": "CategoryEntity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `order` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "order",
"columnName": "order",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
}
},
{
"tableName": "CategorySortEntity",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`categoryId` INTEGER NOT NULL, `sortOrder` TEXT NOT NULL, `sortOrderDescending` INTEGER NOT NULL, PRIMARY KEY(`categoryId`))",
"fields": [
{
"fieldPath": "categoryId",
"columnName": "categoryId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "sortOrder",
"columnName": "sortOrder",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "sortOrderDescending",
"columnName": "sortOrderDescending",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"categoryId"
]
}
}
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '34a325ef104d83604c6d21d765c901b8')"
]
}
}

1
app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
View file

@ -61,6 +61,7 @@ object AppModule {
DatabaseHelper.MIGRATION_4_5, // creates ColorPresetEntity table(if does not exist) DatabaseHelper.MIGRATION_4_5, // creates ColorPresetEntity table(if does not exist)
DatabaseHelper.MIGRATION_5_6, // creates FavoriteDirectoryEntity table(if does not exist) DatabaseHelper.MIGRATION_5_6, // creates FavoriteDirectoryEntity table(if does not exist)
DatabaseHelper.MIGRATION_13_14, // remove nullability from ColorPresetEntity DatabaseHelper.MIGRATION_13_14, // remove nullability from ColorPresetEntity
DatabaseHelper.MIGRATION_14_15, // remove author nullability from BookEntity
).allowMainThreadQueries().build() ).allowMainThreadQueries().build()
} }
} }

2
app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
View file

@ -17,7 +17,7 @@ import ua.acclorite.book_story.data.converter.CategoryConverter
data class BookEntity( data class BookEntity(
@PrimaryKey(true) val id: Int = 0, @PrimaryKey(true) val id: Int = 0,
val title: String, val title: String,
val author: String?, val author: String,
val description: String?, val description: String?,
val filePath: String, val filePath: String,
val scrollIndex: Int, val scrollIndex: Int,

33
app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
View file

@ -30,7 +30,7 @@ import java.io.File
CategoryEntity::class, CategoryEntity::class,
CategorySortEntity::class CategorySortEntity::class
], ],
version = 14, version = 15,
autoMigrations = [ autoMigrations = [
AutoMigration(1, 2), AutoMigration(1, 2),
AutoMigration(2, 3), AutoMigration(2, 3),
@ -45,6 +45,7 @@ import java.io.File
AutoMigration(11, 12), AutoMigration(11, 12),
AutoMigration(12, 13), AutoMigration(12, 13),
AutoMigration(13, 14), AutoMigration(13, 14),
AutoMigration(14, 15),
], ],
exportSchema = true exportSchema = true
) )
@ -159,4 +160,34 @@ object DatabaseHelper {
database.execSQL("ALTER TABLE ColorPresetEntity_new RENAME TO ColorPresetEntity") database.execSQL("ALTER TABLE ColorPresetEntity_new RENAME TO ColorPresetEntity")
} }
} }
val MIGRATION_14_15 = object : Migration(14, 15) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"""
CREATE TABLE BookEntity_new (
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
title TEXT NOT NULL,
author TEXT NOT NULL,
description TEXT,
filePath TEXT NOT NULL,
scrollIndex INTEGER NOT NULL,
scrollOffset INTEGER NOT NULL,
progress REAL NOT NULL,
image TEXT,
categories TEXT NOT NULL DEFAULT '[]'
)
"""
)
database.execSQL(
"""
INSERT INTO BookEntity_new (id, title, author, description, filePath, scrollIndex, scrollOffset, progress, image, categories)
SELECT id, title, COALESCE(author, ''), description, filePath, scrollIndex, scrollOffset, progress, image, categories
FROM BookEntity
"""
)
database.execSQL("DROP TABLE BookEntity")
database.execSQL("ALTER TABLE BookEntity_new RENAME TO BookEntity")
}
}
} }

9
app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt
View file

@ -22,7 +22,7 @@ class BookMapperImpl @Inject constructor() : BookMapper {
scrollIndex = book.scrollIndex, scrollIndex = book.scrollIndex,
scrollOffset = book.scrollOffset, scrollOffset = book.scrollOffset,
progress = book.progress, progress = book.progress,
author = book.author.getAsString(), author = book.author.getAsString() ?: "",
description = book.description, description = book.description,
image = book.coverImage?.toString(), image = book.coverImage?.toString(),
categories = book.categories categories = book.categories
@ -33,9 +33,10 @@ class BookMapperImpl @Inject constructor() : BookMapper {
return Book( return Book(
id = bookEntity.id, id = bookEntity.id,
title = bookEntity.title, title = bookEntity.title,
author = bookEntity.author?.let { UIText.StringValue(it) } ?: UIText.StringResource( author = bookEntity.author.let { author ->
R.string.unknown_author if (author.isNotBlank()) UIText.StringValue(author)
), else UIText.StringResource(R.string.unknown_author)
},
description = bookEntity.description, description = bookEntity.description,
scrollIndex = bookEntity.scrollIndex, scrollIndex = bookEntity.scrollIndex,
scrollOffset = bookEntity.scrollOffset, scrollOffset = bookEntity.scrollOffset,