Fixed Loan Increase Main Transaction Issue (Ivy-Apps#3014)

* [IVY-2981] Fixed LoanIncrease Main Transaction Issue * [IVY-2981] Fixed Create Transaction Failure From LoanRecord * [IVY-2981] Refactor
amitYadavDev · Mar 9, 2024 · 8f06eeb · 8f06eeb
1 parent 2e911b0
commit 8f06eeb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/...code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt b/...code/src/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanMapper.kt
@@ -1,6 +1,7 @@
 package com.ivy.wallet.domain.deprecated.logic.loantrasactions
 
 import com.ivy.base.legacy.Transaction
+import com.ivy.base.model.LoanRecordType
 import com.ivy.base.model.TransactionType
 import com.ivy.data.model.LoanType
 import com.ivy.legacy.datamodel.Account
@@ -30,6 +31,7 @@ class LTLoanMapper @Inject constructor(
                 selectedAccountId = data.account?.id,
                 title = data.name,
                 isLoanRecord = false,
+                loanRecordType = LoanRecordType.DECREASE
             )
         }
     }
@@ -49,7 +51,8 @@ class LTLoanMapper @Inject constructor(
                 title = loan.name,
                 isLoanRecord = false,
                 transaction = transaction,
-                time = transaction?.dateTime
+                time = transaction?.dateTime,
+                loanRecordType = LoanRecordType.DECREASE
             )
         }
     }

diff --git a/...rc/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanRecordMapper.kt b/...rc/main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LTLoanRecordMapper.kt
@@ -30,7 +30,8 @@ class LTLoanRecordMapper @Inject constructor(
                 title = loanRecord.note,
                 time = loanRecord.dateTime,
                 isLoanRecord = true,
-                transaction = transaction
+                transaction = transaction,
+                loanRecordType = loanRecord.loanRecordType
             )
         }
     }
@@ -51,6 +52,7 @@ class LTLoanRecordMapper @Inject constructor(
                 loanId = loan.id,
                 selectedAccountId = data.account?.id,
                 isLoanRecord = true,
+                loanRecordType = data.loanRecordType
             )
         }
     }

diff --git a/.../main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt b/.../main/java/com/ivy/legacy/domain/deprecated/logic/loantrasactions/LoanTransactionsCore.kt
@@ -3,6 +3,7 @@ package com.ivy.legacy.domain.deprecated.logic.loantrasactions
 import androidx.compose.ui.graphics.toArgb
 import com.ivy.base.legacy.Transaction
 import com.ivy.base.legacy.stringRes
+import com.ivy.base.model.LoanRecordType
 import com.ivy.base.model.TransactionType
 import com.ivy.data.db.dao.read.AccountDao
 import com.ivy.data.db.dao.read.LoanDao
@@ -114,6 +115,7 @@ class LoanTransactionsCore @Inject constructor(
         time: LocalDateTime? = null,
         isLoanRecord: Boolean = false,
         transaction: Transaction? = null,
+        loanRecordType: LoanRecordType
     ) {
         if (isLoanRecord && loanRecordId == null) {
             return
@@ -130,7 +132,8 @@ class LoanTransactionsCore @Inject constructor(
                 categoryId = category?.id?.value ?: transaction.categoryId,
                 time = time ?: transaction.dateTime ?: timeNowUTC(),
                 isLoanRecord = isLoanRecord,
-                transaction = transaction
+                transaction = transaction,
+                loanRecordType = loanRecordType
             )
         } else if (createTransaction && transaction == null) {
             createMainTransaction(
@@ -143,7 +146,8 @@ class LoanTransactionsCore @Inject constructor(
                 categoryId = category?.id?.value,
                 time = time ?: timeNowUTC(),
                 isLoanRecord = isLoanRecord,
-                transaction = transaction
+                transaction = transaction,
+                loanRecordType = loanRecordType
             )
         } else {
             deleteTransaction(transaction = transaction)
@@ -160,13 +164,14 @@ class LoanTransactionsCore @Inject constructor(
         categoryId: UUID? = null,
         time: LocalDateTime = timeNowUTC(),
         isLoanRecord: Boolean = false,
-        transaction: Transaction? = null
+        transaction: Transaction? = null,
+        loanRecordType: LoanRecordType
     ) {
         if (selectedAccountId == null) {
             return
         }
 
-        val transType = if (isLoanRecord) {
+        val transType = if (isLoanRecord && loanRecordType != LoanRecordType.INCREASE) {
             if (loanType == LoanType.BORROW) TransactionType.EXPENSE else TransactionType.INCOME
         } else if (loanType == LoanType.BORROW) TransactionType.INCOME else TransactionType.EXPENSE
 

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/LoanRecordModal.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ivy.base.model.LoanRecordType
+import com.ivy.data.model.primitive.NotBlankTrimmedString
 import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.design.utils.thenIf
@@ -393,7 +394,7 @@ private fun save(
 ) {
     if (loanRecord != null) {
         val record = loanRecord.copy(
-            note = noteTextFieldValue.text.trim(),
+            note = NotBlankTrimmedString.from(noteTextFieldValue.text).getOrNull()?.value,
             amount = amount,
             dateTime = dateTime,
             interest = loanRecordInterest,
@@ -411,7 +412,7 @@ private fun save(
     } else {
         onCreate(
             CreateLoanRecordData(
-                note = noteTextFieldValue.text.trim(),
+                note = NotBlankTrimmedString.from(noteTextFieldValue.text).getOrNull()?.value,
                 amount = amount,
                 dateTime = dateTime,
                 interest = loanRecordInterest,