fix-issue-2963 (#2998)

* Moving away from `legacy.Transaction` * Code cleanup * Fix incorrect account balance * Fix `TransactionEntity.toDomain` function * Applied requested changes.
Ivy-Apps · Feb 27, 2024 · c1381e5 · c1381e5
1 parent 9a500de
commit c1381e5
Show file tree

Hide file tree

Showing 27 changed files with 396 additions and 263 deletions.
diff --git a/screen/budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt b/screen/budgets/src/main/java/com/ivy/budgets/BudgetViewModel.kt
@@ -13,8 +13,8 @@ import com.ivy.data.model.Expense
 import com.ivy.data.model.Income
 import com.ivy.data.model.Transaction
 import com.ivy.data.model.Transfer
-import com.ivy.data.model.getAccountId
-import com.ivy.data.model.getValue
+import com.ivy.data.temp.migration.getAccountId
+import com.ivy.data.temp.migration.getValue
 import com.ivy.base.ComposeViewModel
 import com.ivy.frp.sumOfSuspend
 import com.ivy.legacy.data.model.FromToTimeRange

diff --git a/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt b/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt
@@ -560,7 +560,7 @@ class EditTransactionViewModel @Inject constructor(
 
     private fun onPayPlannedPayment() {
         viewModelScope.launch {
-            plannedPaymentsLogic.payOrGet(
+            plannedPaymentsLogic.payOrGetLegacy(
                 transaction = loadedTransaction(),
                 syncTransaction = false
             ) { paidTransaction ->

diff --git a/screen/home/src/main/java/com/ivy/home/HomeState.kt b/screen/home/src/main/java/com/ivy/home/HomeState.kt
@@ -6,7 +6,7 @@ import com.ivy.base.legacy.TransactionHistoryItem
 import com.ivy.home.customerjourney.CustomerJourneyCardModel
 import com.ivy.legacy.data.AppBaseData
 import com.ivy.legacy.data.BufferInfo
-import com.ivy.legacy.data.DueSection
+import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.data.model.TimePeriod
 import com.ivy.wallet.domain.pure.data.IncomeExpensePair
 import kotlinx.collections.immutable.ImmutableList
@@ -27,8 +27,8 @@ data class HomeState(
 
     val buffer: BufferInfo,
 
-    val upcoming: DueSection,
-    val overdue: DueSection,
+    val upcoming: LegacyDueSection,
+    val overdue: LegacyDueSection,
 
     val customerJourneyCards: ImmutableList<CustomerJourneyCardModel>,
     val hideBalance: Boolean,

diff --git a/screen/home/src/main/java/com/ivy/home/HomeTab.kt b/screen/home/src/main/java/com/ivy/home/HomeTab.kt
@@ -36,7 +36,7 @@ import com.ivy.home.customerjourney.CustomerJourney
 import com.ivy.home.customerjourney.CustomerJourneyCardModel
 import com.ivy.legacy.data.AppBaseData
 import com.ivy.legacy.data.BufferInfo
-import com.ivy.legacy.data.DueSection
+import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.data.model.MainTab
 import com.ivy.legacy.data.model.TimePeriod
 import com.ivy.legacy.ivyWalletCtx
@@ -271,6 +271,7 @@ private fun BoxWithConstraintsScope.UI(
     }
 }
 
+@Suppress("LongParameterList")
 @ExperimentalAnimationApi
 @Composable
 fun HomeLazyColumn(
@@ -282,8 +283,8 @@ fun HomeLazyColumn(
 
     baseData: AppBaseData,
 
-    upcoming: DueSection,
-    overdue: DueSection,
+    upcoming: LegacyDueSection,
+    overdue: LegacyDueSection,
     balance: BigDecimal,
     stats: IncomeExpensePair,
     history: ImmutableList<TransactionHistoryItem>,
@@ -399,12 +400,12 @@ private fun BoxWithConstraintsScope.PreviewHomeTab() {
                 customerJourneyCards = persistentListOf(),
                 history = persistentListOf(),
                 stats = IncomeExpensePair.zero(),
-                upcoming = DueSection(
+                upcoming = LegacyDueSection(
                     trns = persistentListOf(),
                     stats = IncomeExpensePair.zero(),
                     expanded = false,
                 ),
-                overdue = DueSection(
+                overdue = LegacyDueSection(
                     trns = persistentListOf(),
                     stats = IncomeExpensePair.zero(),
                     expanded = false,

diff --git a/screen/home/src/main/java/com/ivy/home/HomeViewModel.kt b/screen/home/src/main/java/com/ivy/home/HomeViewModel.kt
@@ -18,7 +18,7 @@ import com.ivy.home.customerjourney.CustomerJourneyCardsProvider
 import com.ivy.legacy.IvyWalletCtx
 import com.ivy.legacy.data.AppBaseData
 import com.ivy.legacy.data.BufferInfo
-import com.ivy.legacy.data.DueSection
+import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.data.model.MainTab
 import com.ivy.legacy.data.model.TimePeriod
 import com.ivy.legacy.data.model.toCloseTimeRange
@@ -105,14 +105,14 @@ class HomeViewModel @Inject constructor(
         )
     )
     private val upcoming = mutableStateOf(
-        DueSection(
+        LegacyDueSection(
             trns = persistentListOf(),
             stats = IncomeExpensePair.zero(),
             expanded = false,
         )
     )
     private val overdue = mutableStateOf(
-        DueSection(
+        LegacyDueSection(
             trns = persistentListOf(),
             stats = IncomeExpensePair.zero(),
             expanded = false,
@@ -189,12 +189,12 @@ class HomeViewModel @Inject constructor(
     }
 
     @Composable
-    private fun getUpcoming(): DueSection {
+    private fun getUpcoming(): LegacyDueSection {
         return upcoming.value
     }
 
     @Composable
-    private fun getOverdue(): DueSection {
+    private fun getOverdue(): LegacyDueSection {
         return overdue.value
     }
 
@@ -353,7 +353,7 @@ class HomeViewModel @Inject constructor(
     ): Unit = suspend {
         UpcomingAct.Input(baseCurrency = input.first, range = input.second)
     } then upcomingAct then { result ->
-        upcoming.value = DueSection(
+        upcoming.value = LegacyDueSection(
             trns = with(transactionMapper) {
                 result.upcomingTrns.map {
                     it.toEntity().toDomain()
@@ -365,7 +365,7 @@ class HomeViewModel @Inject constructor(
     } then {
         OverdueAct.Input(baseCurrency = input.first, toRange = input.second.to)
     } then overdueAct thenInvokeAfter { result ->
-        overdue.value = DueSection(
+        overdue.value = LegacyDueSection(
             trns = with(transactionMapper) {
                 result.overdueTrns.map {
                     it.toEntity().toDomain()
@@ -452,7 +452,7 @@ class HomeViewModel @Inject constructor(
     }
 
     private suspend fun payOrGetPlanned(transaction: Transaction) {
-        plannedPaymentsLogic.payOrGet(
+        plannedPaymentsLogic.payOrGetLegacy(
             transaction = transaction,
             skipTransaction = false
         ) {
@@ -461,7 +461,7 @@ class HomeViewModel @Inject constructor(
     }
 
     private suspend fun skipPlanned(transaction: Transaction) {
-        plannedPaymentsLogic.payOrGet(
+        plannedPaymentsLogic.payOrGetLegacy(
             transaction = transaction,
             skipTransaction = true
         ) {
@@ -470,15 +470,7 @@ class HomeViewModel @Inject constructor(
     }
 
     private suspend fun skipAllPlanned(transactions: List<Transaction>) {
-        // transactions.forEach {
-        //    plannedPaymentsLogic.payOrGet(
-        //        transaction = it,
-        //        skipTransaction = true
-        //    ){
-        //        reload()
-        //    }
-        // }
-        plannedPaymentsLogic.payOrGet(
+        plannedPaymentsLogic.payOrGetLegacy(
             transactions = transactions,
             skipTransaction = true
         ) {

diff --git a/screen/reports/src/main/java/com/ivy/reports/ReportScreen.kt b/screen/reports/src/main/java/com/ivy/reports/ReportScreen.kt
@@ -33,7 +33,7 @@ import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.IvyWalletPreview
 import com.ivy.legacy.data.AppBaseData
-import com.ivy.legacy.data.DueSection
+import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.datamodel.Account
 import com.ivy.legacy.datamodel.Category
 import com.ivy.legacy.datamodel.temp.toDomain
@@ -90,10 +90,6 @@ private fun BoxWithConstraintsScope.UI(
     val transactionMapper = TransactionMapper()
     val legacyTransactions =
         with(transactionMapper) { state.transactions.map { it.toEntity().toDomain() } }
-    val legacyUpcomingTransactions =
-        with(transactionMapper) { state.upcomingTransactions.map { it.toEntity().toDomain() } }
-    val legacyOverdueTransactions =
-        with(transactionMapper) { state.overdueTransactions.map { it.toEntity().toDomain() } }
     val nav = navigation()
     val context = LocalContext.current
 
@@ -230,8 +226,12 @@ private fun BoxWithConstraintsScope.UI(
                     accounts = state.accounts,
                 ),
 
-                upcoming = DueSection(
-                    trns = legacyUpcomingTransactions.toImmutableList(),
+                upcoming = LegacyDueSection(
+                    trns = with(transactionMapper) {
+                        state.upcomingTransactions.map {
+                            it.toEntity().toDomain()
+                        }.toImmutableList()
+                    },
                     stats = IncomeExpensePair(
                         income = state.upcomingIncome.toBigDecimal(),
                         expense = state.upcomingExpenses.toBigDecimal()
@@ -243,8 +243,12 @@ private fun BoxWithConstraintsScope.UI(
                     onEventHandler.invoke(ReportScreenEvent.OnUpcomingExpanded(upcomingExpanded = it))
                 },
 
-                overdue = DueSection(
-                    trns = legacyOverdueTransactions.toImmutableList(),
+                overdue = LegacyDueSection(
+                    trns = with(transactionMapper) {
+                        state.overdueTransactions.map {
+                            it.toEntity().toDomain()
+                        }.toImmutableList()
+                    },
                     stats = IncomeExpensePair(
                         income = state.overdueIncome.toBigDecimal(),
                         expense = state.overdueExpenses.toBigDecimal()

diff --git a/screen/reports/src/main/java/com/ivy/reports/ReportViewModel.kt b/screen/reports/src/main/java/com/ivy/reports/ReportViewModel.kt
@@ -15,8 +15,8 @@ import com.ivy.data.model.Expense
 import com.ivy.data.model.Income
 import com.ivy.data.model.Transaction
 import com.ivy.data.model.Transfer
-import com.ivy.data.model.getTransactionType
-import com.ivy.data.model.getValue
+import com.ivy.data.temp.migration.getTransactionType
+import com.ivy.data.temp.migration.getValue
 import com.ivy.data.repository.TransactionRepository
 import com.ivy.data.repository.mapper.TransactionMapper
 import com.ivy.base.ComposeViewModel
@@ -25,7 +25,6 @@ import com.ivy.frp.filterSuspend
 import com.ivy.legacy.IvyWalletCtx
 import com.ivy.legacy.datamodel.Account
 import com.ivy.legacy.datamodel.Category
-import com.ivy.legacy.datamodel.temp.toDomain
 import com.ivy.legacy.utils.formatNicelyWithTime
 import com.ivy.legacy.utils.scopedIOThread
 import com.ivy.legacy.utils.timeNowUTC
@@ -432,9 +431,7 @@ class ReportViewModel @Inject constructor(
     private suspend fun payOrGet(transaction: Transaction) {
         uiThread {
             plannedPaymentsLogic.payOrGet(
-                transaction = with(transactionMapper) {
-                    transaction.toEntity().toDomain()
-                }
+                transaction = transaction
             ) {
                 start()
                 setFilter(filter.value)
@@ -445,7 +442,7 @@ class ReportViewModel @Inject constructor(
     @Deprecated("Uses legacy Transaction")
     private suspend fun payOrGetLegacy(transaction: com.ivy.base.legacy.Transaction) {
         uiThread {
-            plannedPaymentsLogic.payOrGet(transaction = transaction) {
+            plannedPaymentsLogic.payOrGetLegacy(transaction = transaction) {
                 start()
                 setFilter(filter.value)
             }
@@ -467,7 +464,7 @@ class ReportViewModel @Inject constructor(
     private suspend fun skipTransaction(transaction: Transaction) {
         uiThread {
             plannedPaymentsLogic.payOrGet(
-                transaction = with(transactionMapper) { transaction.toEntity().toDomain() },
+                transaction = transaction,
                 skipTransaction = true
             ) {
                 start()
@@ -479,7 +476,7 @@ class ReportViewModel @Inject constructor(
     @Deprecated("Uses legacy Transaction")
     private suspend fun skipTransactionLegacy(transaction: com.ivy.base.legacy.Transaction) {
         uiThread {
-            plannedPaymentsLogic.payOrGet(
+            plannedPaymentsLogic.payOrGetLegacy(
                 transaction = transaction,
                 skipTransaction = true
             ) {
@@ -492,11 +489,7 @@ class ReportViewModel @Inject constructor(
     private suspend fun skipTransactions(transactions: List<Transaction>) {
         uiThread {
             plannedPaymentsLogic.payOrGet(
-                transactions = with(transactionMapper) {
-                    transactions.map {
-                        it.toEntity().toDomain()
-                    }
-                },
+                transactions = transactions,
                 skipTransaction = true
             ) {
                 start()
@@ -508,7 +501,7 @@ class ReportViewModel @Inject constructor(
     @Deprecated("Uses legacy Transaction")
     private suspend fun skipTransactionsLegacy(transactions: List<com.ivy.base.legacy.Transaction>) {
         uiThread {
-            plannedPaymentsLogic.payOrGet(
+            plannedPaymentsLogic.payOrGetLegacy(
                 transactions = transactions,
                 skipTransaction = true
             ) {
@@ -517,4 +510,4 @@ class ReportViewModel @Inject constructor(
             }
         }
     }
-}
+}
diff --git a/screen/transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt b/screen/transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt
@@ -44,7 +44,6 @@ import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.Constants
 import com.ivy.legacy.data.AppBaseData
-import com.ivy.legacy.data.DueSection
 import com.ivy.legacy.data.model.TimePeriod
 import com.ivy.legacy.datamodel.Account
 import com.ivy.legacy.datamodel.Category
@@ -58,6 +57,7 @@ import com.ivy.legacy.utils.horizontalSwipeListener
 import com.ivy.legacy.utils.rememberSwipeListenerState
 import com.ivy.legacy.utils.setStatusBarDarkTextCompat
 import com.ivy.design.utils.thenIf
+import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.utils.rememberInteractionSource
 import com.ivy.navigation.EditTransactionScreen
 import com.ivy.navigation.IvyPreview
@@ -376,7 +376,7 @@ private fun BoxWithConstraintsScope.UI(
                     accounts,
                     categories
                 ),
-                upcoming = DueSection(
+                upcoming = LegacyDueSection(
                     trns = upcoming,
                     stats = IncomeExpensePair(
                         income = upcomingIncome.toBigDecimal(),
@@ -386,7 +386,7 @@ private fun BoxWithConstraintsScope.UI(
                 ),
                 setUpcomingExpanded = setUpcomingExpanded,
 
-                overdue = DueSection(
+                overdue = LegacyDueSection(
                     trns = overdue,
                     stats = IncomeExpensePair(
                         income = overdueIncome.toBigDecimal(),