From 859786c7f3374b1787510664f7e83e1bba002a51 Mon Sep 17 00:00:00 2001 From: Nacho Date: Sat, 4 Jan 2025 16:51:11 +0100 Subject: [PATCH] Updating database with temporary daos in order to have an MVP Will be changing this to the pre-established model once I sort out DiM/BEM import --- .../nacabaro/vbhelper/daos/UserMonstersDao.kt | 15 +++++++++++++++ .../nacabaro/vbhelper/database/AppDatabase.kt | 18 ++++++++---------- .../nacabaro/vbhelper/di/AppContainer.kt | 2 +- .../vbhelper/di/DefaultAppContainer.kt | 6 +++--- 4 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/com/github/nacabaro/vbhelper/daos/UserMonstersDao.kt diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserMonstersDao.kt b/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserMonstersDao.kt new file mode 100644 index 0000000..c98edfe --- /dev/null +++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserMonstersDao.kt @@ -0,0 +1,15 @@ +package com.github.nacabaro.vbhelper.daos + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import com.github.nacabaro.vbhelper.domain.UserMonsters + +@Dao +interface UserMonstersDao { + @Insert + fun insertUserMonsters(userMonsters: UserMonsters) + + @Query("SELECT * FROM UserMonsters WHERE userId = :userId") + fun getUserMonsters(userId: Int): List +} \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/database/AppDatabase.kt b/app/src/main/java/com/github/nacabaro/vbhelper/database/AppDatabase.kt index 1b6e866..5dc00c9 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/database/AppDatabase.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/database/AppDatabase.kt @@ -1,6 +1,7 @@ package com.github.nacabaro.vbhelper.database import androidx.room.Database +import androidx.room.RoomDatabase import com.github.nacabaro.vbhelper.domain.Dim import com.github.nacabaro.vbhelper.domain.DimProgress import com.github.nacabaro.vbhelper.domain.Evolutions @@ -10,21 +11,18 @@ import com.github.nacabaro.vbhelper.domain.UserHealthData import com.github.nacabaro.vbhelper.domain.UserMonsters import com.github.nacabaro.vbhelper.domain.UserMonstersSpecialMissions import com.github.nacabaro.vbhelper.domain.UserStepsData +import com.github.nacabaro.vbhelper.temporary_domain.TemporaryBECharacterData +import com.github.nacabaro.vbhelper.temporary_domain.TemporaryCharacterData +import com.github.nacabaro.vbhelper.temporary_domain.TemporaryTransformationHistory @Database( version = 1, entities = [ - Dim::class, - DimProgress::class, - Evolutions::class, - Mon::class, - User::class, - UserHealthData::class, - UserMonsters::class, - UserMonstersSpecialMissions::class, - UserStepsData::class + TemporaryCharacterData::class, + TemporaryBECharacterData::class, + TemporaryTransformationHistory::class ] ) -abstract class AppDatabase { +abstract class AppDatabase : RoomDatabase() { } \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/di/AppContainer.kt b/app/src/main/java/com/github/nacabaro/vbhelper/di/AppContainer.kt index 4e3f963..239b946 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/di/AppContainer.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/di/AppContainer.kt @@ -1,6 +1,6 @@ package com.github.nacabaro.vbhelper.di -import com.github.nacabaro.vbhelper.database.AppDatabase.AppDatabase +import com.github.nacabaro.vbhelper.database.AppDatabase interface AppContainer { val db: AppDatabase diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/di/DefaultAppContainer.kt b/app/src/main/java/com/github/nacabaro/vbhelper/di/DefaultAppContainer.kt index 85e9b27..f83cfa8 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/di/DefaultAppContainer.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/di/DefaultAppContainer.kt @@ -1,14 +1,14 @@ import android.content.Context import androidx.room.Room -import com.github.nacabaro.vbhelper.database.AppDatabase.AppDatabase +import com.github.nacabaro.vbhelper.database.AppDatabase import com.github.nacabaro.vbhelper.di.AppContainer class DefaultAppContainer(private val context: Context) : AppContainer { override val db: AppDatabase by lazy { Room.databaseBuilder( context = context, - AppDatabase::class.java, + klass = AppDatabase::class.java, "internalDb" - ) + ).build() } } \ No newline at end of file