feat: added interestDue and amountDue to loanTransactionSchema.

Dwigoric · Nov 23, 2023 · 06e14f0 · 06e14f0
1 parent 00e79ec
commit 06e14f0
Show file tree

Hide file tree

Showing 4 changed files with 1,425 additions and 1,403 deletions.
diff --git a/src/models/loanTransactionSchema.js b/src/models/loanTransactionSchema.js
@@ -27,6 +27,11 @@ const LoanTransactionSchema = new Schema({
         type: Decimal128,
         required: true
     },
+    amountDue: {
+        type: Decimal128,
+        required: false,
+        default: 0
+    },
     balance: {
         type: Decimal128,
         required: true
@@ -35,6 +40,11 @@ const LoanTransactionSchema = new Schema({
         type: Decimal128,
         required: true
     },
+    interestDue: {
+        type: Decimal128,
+        required: false,
+        default: 0
+    },
     finesPaid: {
         type: Decimal128,
         required: true

diff --git a/src/routes/loan-ledgers.js b/src/routes/loan-ledgers.js
@@ -80,10 +80,16 @@ router.put('/', (req, res, next) => {
             $push: { ledger: transactionInfo }
         }
 
-        // Update balance
-        if (loan.balance) {
+
+        // Update balance depending on whether transaction is readjustment or not
+        if (loan.balance && req.body.readjusment === false) {
+            query.$set = {
+                // Should we include amountDue here?
+                balance: loan.balance + req.body.interestDue - req.body.amountPaid - req.body.interestPaid - req.body.finesPaid
+            }
+        } else {
             query.$set = {
-                balance: loan.balance - req.body.amountPaid
+                balance: req.body.balance
             }
         }
 

diff --git a/src/routes/loans.js b/src/routes/loans.js
@@ -161,6 +161,7 @@ router.put('/user/:username', async (req, res, next) => {
                 dueDate: null,
                 coborrower: req.body.coborrower,
                 originalLoanAmount: req.body.amount,
+                balance: req.body.amount,
                 ledger: [],
                 status: req.body.status,
                 classification: req.body.classification
@@ -264,8 +265,10 @@ router.post('/:loanID/review', async (req, res, next) => {
                         transactionDate: Date.now(),
                         submissionDate: Date.now(),
                         amountPaid: deductions,
+                        amountDue: 0,
                         balance: deductions.neg().add(existingLoan.balance).toString(),
                         interestPaid: 0,
+                        interestDue: 0,
                         finesPaid: 0,
                         officerInCharge: req.body.oic
                     }