refator: adjust ledgers to match frontend

Dwigoric · Nov 15, 2023 · 49aead0 · 49aead0
1 parent a05a12c
commit 49aead0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/src/models/depositTransactionSchema.js b/src/models/depositTransactionSchema.js
@@ -1,6 +1,8 @@
 // Import packages
 import { Schema } from 'mongoose'
 
+import NameSchema from './nameSchema.js'
+
 const DepositTransactionSchema = new Schema({
     transactionID: {
         type: String,
@@ -10,33 +12,41 @@ const DepositTransactionSchema = new Schema({
     },
     ORNumber: {
         type: String,
-        required: true,
-        immutable: true
+        required: true
     },
     transactionDate: {
         type: Date,
-        required: true,
-        immutable: true
+        required: true
     },
-    amountReceived: {
-        type: Number,
+    submissionDate: {
+        type: Date,
+        required: true
+    },
+    depositType: {
+        type: String,
         required: true,
-        immutable: true
+        validate: {
+            validator: (val) => {
+                return 'deposit', 'withdrawal'.includes(val)
+            },
+            message: 'Deposit Type must be either "deposit" or "withdrawal"'
+        }
     },
-    amountWithdrawn: {
+    amount: {
         type: Number,
-        required: true,
-        immutable: true
+        required: true
     },
     interest: {
         type: Number,
-        required: true,
-        immutable: true
+        required: true
     },
     balance: {
         type: Number,
-        required: true,
-        immutable: true
+        required: true
+    },
+    officerInCharge: {
+        type: NameSchema,
+        required: true
     }
 })
 

diff --git a/src/models/loanTransactionSchema.js b/src/models/loanTransactionSchema.js
@@ -15,7 +15,7 @@ const LoanTransactionSchema = new Schema({
         type: String,
         required: true
     },
-    paymentDate: {
+    transactionDate: {
         type: Date,
         required: true
     },

diff --git a/src/routes/deposit-ledgers.js b/src/routes/deposit-ledgers.js
@@ -22,7 +22,9 @@ router.get('/', async (req, res, next) => {
 
         const { depositID } = req
 
-        const deposit = await Deposit.find({ deleted: false, depositID }).select('-__v -_id').lean()
+        const deposit = await Deposit.findOne({ deleted: false, depositID })
+            .select('-__v -_id')
+            .lean()
 
         if (!deposit) return res.status(404).json({ error: true, message: 'Deposit not found' })
 
@@ -82,7 +84,10 @@ router.put('/', async (req, res, next) => {
         const { ledger } = deposit
 
         // Add transaction to ledger
-        ledger.push(req.body)
+        ledger.push({
+            ...req.body,
+            transactionID: Date.now().toString(36).toUpperCase()
+        })
 
         try {
             // Update deposit

diff --git a/src/routes/loan-ledgers.js b/src/routes/loan-ledgers.js
@@ -115,7 +115,7 @@ router.patch('/:txID', (req, res, next) => {
 
         const query = {
             'ledger.$.ORNumber': req.body.ORNumber,
-            'ledger.$.paymentDate': req.body.paymentDate,
+            'ledger.$.transactionDate': req.body.transactionDate,
             'ledger.$.submissionDate': req.body.submissionDate,
             'ledger.$.amountPaid': req.body.amountPaid,
             'ledger.$.balance': req.body.balance,