remove inheritance of Account in ShareAccount, SavingAccount and Loan…

…Account
openMF · Jan 10, 2025 · b2885d8 · b2885d8
1 parent b89d071
commit b2885d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/Account.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/Account.kt
diff --git a/...del/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanAccount.kt b/...del/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanAccount.kt
@@ -11,10 +11,11 @@ package org.mifos.mobile.core.model.entity.accounts.loan
 
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
-import org.mifos.mobile.core.model.entity.accounts.Account
 
 @Parcelize
 data class LoanAccount(
+    val id: Long = 0,
+
     val loanProductId: Long = 0,
 
     val externalId: String? = null,
@@ -56,5 +57,4 @@ data class LoanAccount(
     val loanPurposeName: String? = null,
 
     val timeline: Timeline?,
-
-) : Account(), Parcelable
+) : Parcelable
diff --git a/...rc/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/savings/SavingAccount.kt b/...rc/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/savings/SavingAccount.kt
@@ -11,12 +11,13 @@ package org.mifos.mobile.core.model.entity.accounts.savings
 
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
-import org.mifos.mobile.core.model.entity.accounts.Account
 import org.mifos.mobile.core.model.entity.client.DepositType
 
 @Parcelize
 data class SavingAccount(
 
+    val id: Long = 0,
+
     val accountNo: String? = null,
 
     val productName: String? = null,
@@ -48,7 +49,7 @@ data class SavingAccount(
     val lastActiveTransactionDate: List<Int>? = null,
 
     val timeLine: TimeLine? = null,
-) : Parcelable, Account() {
+) : Parcelable {
     fun isRecurring(): Boolean {
         return this.depositType != null && (this.depositType?.isRecurring() == true)
     }

diff --git a/...l/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/share/ShareAccount.kt b/...l/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/share/ShareAccount.kt
@@ -11,12 +11,13 @@ package org.mifos.mobile.core.model.entity.accounts.share
 
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
-import org.mifos.mobile.core.model.entity.accounts.Account
 import org.mifos.mobile.core.model.entity.accounts.savings.Currency
 
 @Parcelize
 data class ShareAccount(
 
+    val id: Long = 0,
+
     val accountNo: String? = null,
 
     val totalApprovedShares: Int? = null,
@@ -35,4 +36,4 @@ data class ShareAccount(
 
     val timeline: Timeline? = null,
 
-) : Account(), Parcelable
+) : Parcelable