Merge branch 'master' of https://gitlab.chiefsoft.net/DigiFi/digifi-BankToProductCore

app/api/schemas/provide_loan.py

@@ -8,8 +8,8 @@ class ProvideLoanSchema(Schema):
     customerId = fields.Str(required=True)
     accountId = fields.Str(required=True)
     msisdn = fields.Str(required=False)
- #   productId = fields.Str(required=True)
-  #  lienAmount = fields.Float(required=True)
+    # productId = fields.Str(required=True)
+    # lienAmount = fields.Float(required=True)
     requestedAmount = fields.Float(required=True)
     collectionType = fields.Int(required=True)
     offerId = fields.Int(required=True)

app/api/services/provide_loan.py

@@ -6,6 +6,7 @@ from app.api.enums import TransactionType
 from app.utils.logger import logger
 from app.api.schemas.provide_loan import ProvideLoanSchema
 from threading import Thread
+from app.models.loan import Loan
 
 
 class ProvideLoanService(BaseService):
@@ -31,6 +32,7 @@ class ProvideLoanService(BaseService):
             transaction_id = validated_data.get('transactionId')
 
             if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+
                 transaction = ProvideLoanService.log_transaction(validated_data = validated_data)
 
                 if not transaction:
@@ -38,6 +40,25 @@ class ProvideLoanService(BaseService):
                     return jsonify({
                         "message": "Failed to log transaction."
                     }), 400
+
+                # Save the loan details
+                loan_id = f"loan_{transaction_id}"
+                
+                loan = Loan.create_loan(
+                    customer_id=customer_id,
+                    account_id=account_id,
+                    offer_id=validated_data.get('offerId'),
+                    principal_amount=validated_data.get('requestedAmount'),
+                    status="active"
+                )
+
+                if not loan:
+                    logger.error(f"Failed to save loan details")
+                    return jsonify({
+                        "message": "Failed to save loan details."
+                    }), 400
+            
+                
             else: 
                 return jsonify({
                         "message": "Invalid Customer or Account"
@@ -86,4 +107,3 @@ class ProvideLoanService(BaseService):
     
  
 
-

app/api/services/repayment.py

@@ -22,7 +22,6 @@ class RepaymentService(BaseService):
         """
         try:
             validated_data = RepaymentService.validate_data(data, RepaymentSchema())
-            account_id = validated_data.get('accountId')
             customer_id =  validated_data.get('customerId')
             customer = RepaymentService.get_or_create_customer(validated_data)
             account = customer.accounts[0]
@@ -30,7 +29,7 @@ class RepaymentService(BaseService):
             request_id =  validated_data.get('requestId')
 
 
-            if (RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+            if (RepaymentService.validate_account_ownership(account_id = account.id, customer_id = customer_id)):
                 transaction = RepaymentService.log_transaction(validated_data = validated_data)
 
                 if not transaction:

app/api/services/select_offer.py

@@ -3,7 +3,7 @@ from marshmallow import ValidationError
 from app.api.services.base_service import BaseService
 from app.api.enums import TransactionType   
 from app.utils.logger import logger
-from app.api.schemas.select_offer import SelectOfferSchema   
+from app.api.schemas.select_offer import SelectOfferSchema
 
 class SelectOfferService(BaseService):
     TRANSACTION_TYPE = TransactionType.SELECT_OFFER