fincode/TSUDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code-style fix, fix db code structure

Browse Source
This commit is contained in:
Oleg Shcherbatykh
2026-02-14 13:43:21 +03:00
parent 7dd3358dac
commit 49b5100987
10 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/database/src/main/java/ru/fincode/tsudesk/core/database/AppDatabase.kt
View File

@@ -2,9 +2,9 @@ package ru.fincode.tsudesk.core.database
import androidx.room.Database
import androidx.room.RoomDatabase
import ru.fincode.tsudesk.core.database.schedule.ScheduleDao
import ru.fincode.tsudesk.core.database.schedule.LessonCacheEntity
import ru.fincode.tsudesk.core.database.schedule.ScheduleCacheEntity
import ru.fincode.tsudesk.core.database.schedule.ScheduleDao
@Database(
entities = [

15
core/database/src/main/java/ru/fincode/tsudesk/core/database/builder/AppDatabaseBuilder.kt Normal file
View File

@@ -0,0 +1,15 @@
package ru.fincode.tsudesk.core.database.builder
import android.content.Context
import androidx.room.Room
import ru.fincode.tsudesk.core.database.AppDatabase
object AppDatabaseBuilder {
private const val DB_NAME = "tsudesk.db"
fun build(context: Context): AppDatabase =
Room.databaseBuilder(context, AppDatabase::class.java, DB_NAME)
.fallbackToDestructiveMigration()
.build()
}

10
core/database/src/main/java/ru/fincode/tsudesk/core/database/di/DatabaseModule.kt
View File

@@ -1,13 +1,13 @@
package ru.fincode.tsudesk.core.database.di
import android.content.Context
import androidx.room.Room
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import ru.fincode.tsudesk.core.database.AppDatabase
import ru.fincode.tsudesk.core.database.builder.AppDatabaseBuilder
import ru.fincode.tsudesk.core.database.schedule.ScheduleDao
import javax.inject.Singleton
@@ -15,16 +15,12 @@ import javax.inject.Singleton
@InstallIn(SingletonComponent::class)
object DatabaseModule {
private const val DB_NAME = "tsudesk.db"
@Provides
@Singleton
fun provideAppDatabase(@ApplicationContext context: Context): AppDatabase =
Room.databaseBuilder(context, AppDatabase::class.java, DB_NAME)
.fallbackToDestructiveMigration()
.build()
AppDatabaseBuilder.build(context)
@Provides
fun provideScheduleCacheDao(db: AppDatabase): ScheduleDao =
fun provideScheduleDao(db: AppDatabase): ScheduleDao =
db.scheduleCacheDao()
}

4
core/database/src/main/java/ru/fincode/tsudesk/core/database/schedule/DBConstant.kt → core/database/src/main/java/ru/fincode/tsudesk/core/database/schedule/Constants.kt
View File

@@ -6,4 +6,8 @@ object ScheduleDbConstants {
const val COL_SCHEDULE_KEY = "scheduleKey"
const val COL_KEY = "key"
const val GROUP_PRE_KEY = "group:"
const val TEACHER_PRE_KEY = "teacher:"
}

13
core/database/src/main/java/ru/fincode/tsudesk/core/database/schedule/Query.kt Normal file
View File

@@ -0,0 +1,13 @@
package ru.fincode.tsudesk.core.database.schedule
object Query {
const val SELECT_LESSON_BY_KEY_QUERY =
"SELECT * FROM lesson_cache WHERE scheduleKey = :key"
const val SELECT_SCHEDULE_BY_KEY_QUERY =
"SELECT * FROM schedule_cache WHERE `key` = :key LIMIT 1"
const val DELETE_LESSON_BY_GROUP_KEY_QUERY =
"DELETE FROM lesson_cache WHERE scheduleKey = :key"
}

28
core/database/src/main/java/ru/fincode/tsudesk/core/database/schedule/ScheduleDao.kt
View File

@@ -6,52 +6,44 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Transaction
import ru.fincode.tsudesk.core.database.schedule.Query.DELETE_LESSON_BY_GROUP_KEY_QUERY
import ru.fincode.tsudesk.core.database.schedule.Query.SELECT_LESSON_BY_KEY_QUERY
import ru.fincode.tsudesk.core.database.schedule.Query.SELECT_SCHEDULE_BY_KEY_QUERY
@Dao
interface ScheduleDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
@Insert(onConflict = OnConflictStrategy.Companion.REPLACE)
suspend fun upsertSchedule(schedule: ScheduleCacheEntity)
@Insert(onConflict = OnConflictStrategy.REPLACE)
@Insert(onConflict = OnConflictStrategy.Companion.REPLACE)
suspend fun insertLessons(lessons: List<LessonCacheEntity>)
@Query("SELECT * FROM schedule_cache WHERE `key` = :key LIMIT 1")
@Query(SELECT_SCHEDULE_BY_KEY_QUERY)
suspend fun getSchedule(key: String): ScheduleCacheEntity?
@Query("SELECT * FROM lesson_cache WHERE scheduleKey = :key")
@Query(SELECT_LESSON_BY_KEY_QUERY)
suspend fun getLessons(key: String): List<LessonCacheEntity>
// Bulk delete уроков по ключу — самый простой/эффективный путь в Room это @Query
@Query("DELETE FROM lesson_cache WHERE scheduleKey = :key")
@Query(DELETE_LESSON_BY_GROUP_KEY_QUERY)
suspend fun deleteLessonsByKey(key: String)
// Удаление schedule_cache без SQL: типобезопасно
@Delete
suspend fun deleteSchedule(entity: ScheduleCacheEntity)
/**
* Обновить кэш расписания (header + lessons) атомарно.
*/
@Transaction
suspend fun replaceSchedule(
key: String,
schedule: ScheduleCacheEntity,
lessons: List<LessonCacheEntity>
key: String, schedule: ScheduleCacheEntity, lessons: List<LessonCacheEntity>
) {
upsertSchedule(schedule)
deleteLessonsByKey(key)
insertLessons(lessons)
}
/**
* Полная очистка кэша по ключу без прямого DELETE для schedule_cache.
*/
@Transaction
suspend fun clearSchedule(key: String) {
deleteLessonsByKey(key)
val header = getSchedule(key) ?: return
deleteSchedule(header)
}
}
}