From bae92d36c661687bbebec466a1289ff0a2238d70 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sun, 6 Apr 2025 00:58:57 -0400
Subject: [PATCH] transaction_id

---
 app/api/services/base_service.py | 2 +-
 app/api/services/provide_loan.py | 3 ++-
 app/models/transaction.py        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/api/services/base_service.py b/app/api/services/base_service.py
index 40413c3..db4bc64 100644
--- a/app/api/services/base_service.py
+++ b/app/api/services/base_service.py
@@ -48,7 +48,7 @@ class BaseService:
         Create a new transaction.
         """
         return Transaction.create_transaction(
-            id=validated_data.get("transactionId"),
+            transaction_id =validated_data.get("transactionId"),
             account_id=validated_data.get("accountId"),
             type=cls.TRANSACTION_TYPE,
             channel=validated_data.get("channel"),
diff --git a/app/api/services/provide_loan.py b/app/api/services/provide_loan.py
index b70f587..dfc5a96 100644
--- a/app/api/services/provide_loan.py
+++ b/app/api/services/provide_loan.py
@@ -29,6 +29,7 @@ class ProvideLoanService(BaseService):
             account_id = validated_data.get('accountId')
             customer_id =  validated_data.get('customerId')
             request_id =  validated_data.get('requestId')
+            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)
@@ -46,7 +47,7 @@ class ProvideLoanService(BaseService):
            
             response_data = {
                 "requestId": request_id,
-                "transactionId": "Tr201712RK9232P115",
+                "transactionId": transaction_id,
                 "customerId": customer_id,
                 "accountId": account_id,
                 "msisdn": "3451342",
diff --git a/app/models/transaction.py b/app/models/transaction.py
index d004621..7d1ce8d 100644
--- a/app/models/transaction.py
+++ b/app/models/transaction.py
@@ -21,13 +21,13 @@ class Transaction(db.Model):
         return f'<Transaction {self.id}>'
 
     @classmethod
-    def create_transaction(cls, id, account_id, type, channel):
+    def create_transaction(cls, transaction_id, account_id, type, channel):
 
-        if cls.query.filter_by(transaction_id=id).first():
+        if cls.query.filter_by(transaction_id=transaction_id).first():
             raise ValueError("Duplicate Transaction")
 
         transaction = cls(
-            transaction_id=id,
+            transaction_id=transaction_id,
             account_id=account_id,
             type=type,
             channel=channel