[add]: transaction fix

app/api/services/base_service.py

@@ -50,8 +50,7 @@ class BaseService:
         """
         return Transaction.create_transaction(
             transaction_id = validated_data.get("transactionId"),
-            ref_id = validated_data.get("refId") or validated_data.get("accountId"),
-            ref_model = validated_data.get("refModel", "account"),
+            account_id = validated_data.get("accountId", None),  
             type = cls.TRANSACTION_TYPE,
             channel = validated_data.get("channel"),
         )

app/api/services/loan_status.py

@@ -35,11 +35,6 @@ class LoanStatusService(BaseService):
                 # Get loans
                 loans = [loan.to_dict() for loan in customer.loans]
 
-
-                validated_data['refId'] = customer.id
-                validated_data['refModel'] = "customer"
-  
-
                 transaction = LoanStatusService.log_transaction(validated_data = validated_data)
 
                 if not transaction:

app/api/services/provide_loan.py

@@ -51,10 +51,6 @@ class ProvideLoanService(BaseService):
                             "message": "Failed to save loan details."
                         }), 400
                     
-                    db.session.flush()
-                    validated_data['refId'] = loan.id
-                    validated_data['refModel'] = "loan"
-                    
                     # Log Transaction
                     transaction = ProvideLoanService.log_transaction(validated_data = validated_data)
 

app/api/services/repayment.py

@@ -47,11 +47,7 @@ class RepaymentService(BaseService):
                     return jsonify({
                         "message": "Failed to save repayment details."
                     }), 400
-                
-                db.session.flush()
-                
-                validated_data['refId'] = repayment.id
-                validated_data['refModel'] = "repayment"
+            
                 
                 #Update Loan status
                 Loan.update_status(loan_id = loan_id, status = LoanStatus.REPAID)

app/models/transaction.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timezone
 from app.extensions import db
+from app.models import account
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import and_, or_, not_
 
@@ -11,8 +12,7 @@ class Transaction(db.Model):
         autoincrement=True,
     )
     transaction_id = db.Column(db.String(50), nullable=False)
-    ref_id = db.Column(db.String(50), nullable=False)
-    ref_model = db.Column(db.String(50), nullable=True, default='account')
+    account_id = db.Column(db.String(50), nullable=True)
     type = db.Column(db.String(50), nullable=False)
     channel = db.Column(db.String(50), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
@@ -22,7 +22,7 @@ class Transaction(db.Model):
         return f'<Transaction {self.id}>'
 
     @classmethod
-    def create_transaction(cls, transaction_id, ref_id, ref_model, type, channel):
+    def create_transaction(cls, transaction_id, account_id, type, channel):
 
         # if cls.query.filter_by(transaction_id=transaction_id).first():
         #     raise ValueError("Duplicate Transaction")
@@ -34,8 +34,7 @@ class Transaction(db.Model):
 
         transaction = cls(
             transaction_id = transaction_id,
-            ref_id = ref_id,
-            ref_model = ref_model,
+            account_id = account_id,
             type = type,
             channel = channel
         )