update

app/api/services/repayment.py

@@ -7,7 +7,8 @@ from app.utils.logger import logger
 from app.api.schemas.repayment import RepaymentSchema
 from app.api.services.base_service import BaseService
 from app.api.enums import TransactionType 
-from threading import Thread     
+from threading import Thread
+from app.extensions import db
 
 class RepaymentService(BaseService):
     TRANSACTION_TYPE = TransactionType.REPAYMENT 
@@ -24,22 +25,20 @@ class RepaymentService(BaseService):
             dict: A standardized response.
         """
         try:
-            validated_data = RepaymentService.validate_data(data, RepaymentSchema())
-            customer_id =  validated_data.get('customerId')
-            customer = RepaymentService.get_or_create_customer(validated_data)
-            account = customer.accounts[0]
-            validated_data['accountId'] = account.id
-            request_id =  validated_data.get('requestId')
-            loan_id = validated_data.get('debtId')
+            with db.session.begin():
+                validated_data = RepaymentService.validate_data(data, RepaymentSchema())
+                customer_id =  validated_data.get('customerId')
+                request_id =  validated_data.get('requestId')
+                loan_id = validated_data.get('debtId')
+                product_id = validated_data.get('productId')
 
-
-            if (RepaymentService.validate_account_ownership(account_id = account.id, customer_id = customer_id)):
-
-                # Save the repayment details  
+    
+        
+            # Save the repayment details  
                 repayment = Repayment.create_repayment(
                     customer_id = customer_id,
                     loan_id = loan_id,
-                    product_id = validated_data.get('productId')
+                    product_id = product_id
 
                 )
 
@@ -49,6 +48,11 @@ class RepaymentService(BaseService):
                         "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)
                 
@@ -59,34 +63,33 @@ class RepaymentService(BaseService):
                     return jsonify({
                         "message": "Failed to log transaction."
                     }), 400
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
 
-            # Simulated processing logic
-            response_data = {
-                "customerId": "CN621868",
-                "productId": "101",
-                "debtId": "273194670",
-                "resultCode": "00",
-                "resultDescription": "Successful"
-            }
 
-            # return ResponseHelper.success(
-            #     data=response_data,
-            #     message="Repayment processed successfully"
-            # )
+                # Simulated processing logic
+                response_data = {
+                    "customerId": customer_id,
+                    "productId": product_id,
+                    "debtId": loan_id,
+                    "resultCode": "00",
+                    "resultDescription": "Successful"
+                }
 
-            # Call Kafka in a background thread
-            thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
-            thread.start()
+                # return ResponseHelper.success(
+                #     data=response_data,
+                #     message="Repayment processed successfully"
+                # )
 
-            return response_data
+                # Call Kafka in a background thread
+                thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
+                thread.start()
+
+                db.session.commit()
+                return response_data
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
+            db.session.rollback() 
 
             return jsonify({
                 "message": "Validation exception"
@@ -94,6 +97,7 @@ class RepaymentService(BaseService):
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
+            db.session.rollback() 
 
             return jsonify({
                 "message": str(err)
@@ -101,6 +105,7 @@ class RepaymentService(BaseService):
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
+            db.session.rollback() 
             return jsonify({
                 "message": "Internal Server Error"
                 }) , 500