From 73afded9bdfd59971de616ef060e74f243306d97 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 1 Nov 2018 14:57:23 -0600 Subject: [PATCH] Add missing DAOs (Data Access Object) to use with the Room database. --- .../bitsybitshareswallet/daos/AssetDao.kt | 1 - .../bitsybitshareswallet/daos/AuthorityDao.kt | 1 - .../bitsybitshareswallet/daos/BalanceDao.kt | 1 - .../bitsybitshareswallet/daos/BitsyDatabase.kt | 17 ++++++++++------- .../daos/EquivalentValueDao.kt | 16 ++++++++++++++++ .../bitsybitshareswallet/daos/OperationDao.kt | 16 ++++++++++++++++ .../bitsybitshareswallet/daos/TransferDao.kt | 16 ++++++++++++++++ .../daos/UserAccountAuthorityDao.kt | 1 - .../bitsybitshareswallet/daos/UserAccountDao.kt | 1 - .../bitsybitshareswallet/models/Balance.kt | 2 +- 10 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt create mode 100644 app/src/main/java/cy/agorise/bitsybitshareswallet/daos/OperationDao.kt create mode 100644 app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt index aaac373..5083f19 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AssetDao.kt @@ -8,7 +8,6 @@ import cy.agorise.bitsybitshareswallet.models.Asset @Dao interface AssetDao { - @Insert fun insert(asset: Asset) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt index 01e743c..6eaa123 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/AuthorityDao.kt @@ -8,7 +8,6 @@ import cy.agorise.bitsybitshareswallet.models.Authority @Dao interface AuthorityDao { - @Insert fun insert(authority: Authority) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt index c646f78..653ee8b 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BalanceDao.kt @@ -8,7 +8,6 @@ import cy.agorise.bitsybitshareswallet.models.Balance @Dao interface BalanceDao { - @Insert fun insert(balance: Balance) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt index d5f0613..055cd8f 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/BitsyDatabase.kt @@ -8,23 +8,26 @@ import cy.agorise.bitsybitshareswallet.models.* @Database(entities = [ Asset::class, - Balance::class, - UserAccount::class, Authority::class, - UserAccountAuthority::class, + Balance::class, BrainKey::class, EquivalentValue::class, Operation::class, - Transfer::class + Transfer::class, + UserAccount::class, + UserAccountAuthority::class ], version = 1, exportSchema = false) abstract class BitsyDatabase : RoomDatabase() { abstract fun assetDao(): AssetDao - abstract fun balanceDao(): BalanceDao - abstract fun userAccountDao(): UserAccountDao abstract fun authorityDao(): AuthorityDao - abstract fun userAccountAuthorityDao(): UserAccountAuthorityDao + abstract fun balanceDao(): BalanceDao abstract fun brainKeyDao(): BrainKeyDao + abstract fun equivalentValueDao(): EquivalentValueDao + abstract fun operationDao(): OperationDao + abstract fun transferDao(): TransferDao + abstract fun userAccountDao(): UserAccountDao + abstract fun userAccountAuthorityDao(): UserAccountAuthorityDao companion object { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt new file mode 100644 index 0000000..3135d5f --- /dev/null +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/EquivalentValueDao.kt @@ -0,0 +1,16 @@ +package cy.agorise.bitsybitshareswallet.daos + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import cy.agorise.bitsybitshareswallet.models.EquivalentValue + +@Dao +interface EquivalentValueDao { + @Insert + fun insert(equivalentValue: EquivalentValue) + + @Query("SELECT * FROM equivalent_values") + fun getAllEquivalentValues(): LiveData> +} \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/OperationDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/OperationDao.kt new file mode 100644 index 0000000..a4fcf2a --- /dev/null +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/OperationDao.kt @@ -0,0 +1,16 @@ +package cy.agorise.bitsybitshareswallet.daos + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import cy.agorise.bitsybitshareswallet.models.Operation + +@Dao +interface OperationDao { + @Insert + fun insert(operation: Operation) + + @Query("SELECT * FROM operations") + fun getAllOperations(): LiveData> +} \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt new file mode 100644 index 0000000..0e79fd1 --- /dev/null +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/TransferDao.kt @@ -0,0 +1,16 @@ +package cy.agorise.bitsybitshareswallet.daos + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import cy.agorise.bitsybitshareswallet.models.Transfer + +@Dao +interface TransferDao { + @Insert + fun insert(transfer: Transfer) + + @Query("SELECT * FROM transfers") + fun getAllTransfers(): LiveData> +} \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountAuthorityDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountAuthorityDao.kt index d263509..42a1b79 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountAuthorityDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountAuthorityDao.kt @@ -8,7 +8,6 @@ import cy.agorise.bitsybitshareswallet.models.Authority @Dao interface UserAccountAuthorityDao { - @Insert fun insert(userAccountAuthorityDao: UserAccountAuthorityDao) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt index 5319b6f..d9df243 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/daos/UserAccountDao.kt @@ -8,7 +8,6 @@ import cy.agorise.bitsybitshareswallet.models.UserAccount @Dao interface UserAccountDao { - @Insert fun insert(userAccount: UserAccount) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/models/Balance.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/models/Balance.kt index 47e2900..d8c12aa 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/models/Balance.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/models/Balance.kt @@ -4,7 +4,7 @@ import androidx.room.ColumnInfo import androidx.room.Entity @Entity(tableName = "balances", primaryKeys = ["user_account_id", "asset_id"]) -// TODO verify if we can add user_account_id as primary key +// TODO make userAccountId and assetId be ForeignKeys data class Balance( @ColumnInfo(name = "user_account_id") val userAccountId: String, @ColumnInfo(name = "asset_id") val assetId: String,