[fix]: Loan id

.vscode/settings.json

@@ -1,24 +1,24 @@
-{
-  "editor.lineNumbers": "off",
-  "editor.padding.top": 3,
-  "editor.padding.bottom": 3,
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": true,
-  "editor.fontSize": 14,
-  "editor.lineHeight": 4.5,
-  "editor.suggestFontSize": 15,
-  // "editor.suggestLineHeight": 4,
-  "breadcrumbs.enabled": false,
-  "workbench.tips.enabled": false,
-  "workbench.statusBar.visible": false,
-  // "workbench.editor.showTabs": "single",
-  "git.enableSmartCommit": true,
-  "workbench.editor.editorActionsLocation": "hidden",
-  // "workbench.activityBar.location": "hidden",
-  "workbench.editor.enablePreviewFromQuickOpen": false,
-  "editor.lightbulb.enabled": "off",
-  "editor.selectionHighlight": false,
-  "editor.overviewRulerBorder": false,
-  "editor.renderLineHighlight": "none",
-  "editor.occurrencesHighlight": "off"
-}
+// {
+//   "editor.lineNumbers": "off",
+//   "editor.padding.top": 3,
+//   "editor.padding.bottom": 3,
+//   "editor.formatOnSave": true,
+//   "editor.formatOnPaste": true,
+//   "editor.fontSize": 14,
+//   "editor.lineHeight": 4.5,
+//   "editor.suggestFontSize": 15,
+//   // "editor.suggestLineHeight": 4,
+//   "breadcrumbs.enabled": false,
+//   "workbench.tips.enabled": false,
+//   "workbench.statusBar.visible": false,
+//   // "workbench.editor.showTabs": "single",
+//   "git.enableSmartCommit": true,
+//   "workbench.editor.editorActionsLocation": "hidden",
+//   // "workbench.activityBar.location": "hidden",
+//   "workbench.editor.enablePreviewFromQuickOpen": false,
+//   "editor.lightbulb.enabled": "off",
+//   "editor.selectionHighlight": false,
+//   "editor.overviewRulerBorder": false,
+//   "editor.renderLineHighlight": "none",
+//   "editor.occurrencesHighlight": "off"
+// }

SQL/site_data.sql

@@ -0,0 +1,14 @@
+
+CREATE TABLE transactions (
+        id SERIAL,
+        transaction_id VARCHAR(50) NOT NULL,
+        account_id VARCHAR(50) NOT NULL,
+        type VARCHAR(50) NOT NULL,
+        channel VARCHAR(8) NOT NULL,
+        created_at timestamp with time zone DEFAULT now(),
+        updated_at timestamp with time zone DEFAULT now()
+);
+ALTER TABLE ONLY transactions
+    ADD CONSTRAINT transactions_id_key UNIQUE (id);
+
+

app/api/integrations/simbrella.py

@@ -1,4 +1,6 @@
 import requests
+import json
+from requests.auth import HTTPBasicAuth
 from app.utils.logger import logger
 from app.config import settings
 
@@ -33,11 +35,19 @@ class SimbrellaIntegration:
             ]
         }
 
-        try:
-            response = requests.post(url, json=payload, timeout=10)
+        logger.error(f"This is PayLoad: {str(payload)}",exc_info=True)
+        headers = {
+            'Content-Type': 'application/json',
+            'x-api-key': f'{settings.VALID_API_KEY}',
+            'App-Id': f'{settings.VALID_APP_ID}'
+        }
 
+        try:
+            response = requests.post(url, json=payload, timeout=10, headers=headers)
+            logger.error(f"This is Response: {str(response)}", exc_info=True)
             # Raise an error for non-200 responses
-            response.raise_for_status()  
+            if response.status_code != 200:
+                response.raise_for_status()
 
             return response.json()
         except requests.exceptions.RequestException as err:

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/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"),

app/api/services/eligibility_check.py

@@ -25,6 +25,8 @@ class EligibilityCheckService(BaseService):
             validated_data = EligibilityCheckService.validate_data(data, EligibilityCheckSchema())
             account_id = validated_data.get('accountId')
             customer_id =  validated_data.get('customerId')
+            transactionId = validated_data.get('transactionId')
+            msisdn = validated_data.get('msisdn')
 
             customer = EligibilityCheckService.get_or_create_customer(validated_data = validated_data)
 
@@ -47,39 +49,40 @@ class EligibilityCheckService(BaseService):
                 account_id = account_id,
                 transaction_id = transaction.id,
             )
+            logger.error(f"This is Response Returned ****** : {str(response)}")
 
-            if "error" in response or response.get("status") != 200:
-                return jsonify({"message": "RACCheck failed"}), 400
-
-            
+            # this chck for error is not valid
+            logger.error(f"Check for ERROR is not valid  ****** FIX THIS !!!!!")
+            #if "error" in response or response.get("status") != 200:
+            #    return jsonify({"message": "RACCheck failed"}), 400
 
             offers = [
                 {
-                "offerId": "Offer1",
-                "productId": "Product1",
-                "minAamount": 100,
-                "maxAamount": 1000,
-                "tenor": 12
+                    "offerId": "SAL90",
+                    "productId": "2030",
+                    "minAmount": 5000,
+                    "maxAmount": 100000,
+                    "tenor": 30
                 },
                 {
-                "offerId": "Offer2",
-                "productId": "Product2",
-                "minAamount": 200,
-                "maxAamount": 2000,
-                "tenor": 24
+                    "offerId": "SAL30",
+                    "productId": "2090",
+                    "minAmount": 3000,
+                    "maxAmount": 500000,
+                    "tenor": 90
                 }
             ]
 
             # Simulate processing
             response_data = {
-                "customerId": "CN621868",
-                "transactionId": "TX12345",
+                "customerId": customer_id,
+                "transactionId": transactionId,
                 "countryCode": "NG",
-                "msisdn": "3451342",
+                "msisdn": msisdn,
                 "eligibleOffers": offers,
                 "resultDescription": "Successful",
                 "resultCode": "00",
-                "accountId": "ACN8263457"
+                "accountId": account_id
                 }
 
             return response_data

app/api/services/provide_loan.py

@@ -7,6 +7,7 @@ from app.utils.logger import logger
 from app.api.schemas.provide_loan import ProvideLoanSchema
 from app.api.integrations import KafkaIntegration
 from threading import Thread
+from app.models.loan import Loan
 
 
 class ProvideLoanService(BaseService):
@@ -29,8 +30,10 @@ 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)
 
                 if not transaction:
@@ -38,6 +41,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"
@@ -46,7 +68,7 @@ class ProvideLoanService(BaseService):
            
             response_data = {
                 "requestId": request_id,
-                "transactionId": "Tr201712RK9232P115",
+                "transactionId": transaction_id,
                 "customerId": customer_id,
                 "accountId": account_id,
                 "msisdn": "3451342",
@@ -88,4 +110,3 @@ class ProvideLoanService(BaseService):
         KafkaIntegration.send_loan_request(loan_data = loan_data, request_id = request_id)
         KafkaIntegration.flush()
 
-

app/api/services/repayment.py

@@ -21,10 +21,13 @@ 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]
+            validated_data['accountId'] = account.id
 
-            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 
@@ -60,9 +60,9 @@ class SelectOfferService(BaseService):
             response_data = {
                 "outstandingDebtAmount": 0,
                 "requestId": "202111170001371256908",
-                "transactionId": "1231231321232",
-                "customerId": "1256907",
-                "accountId": "5948306019",
+                "transactionId": transaction.id,
+                "customerId": customer_id,
+                "accountId": account_id,
                 "loan": offers,
                 "resultCode": "00",
                 "resultDescription": "Successful"

app/models/customer.py

@@ -20,11 +20,11 @@ class Customer(db.Model):
     )
 
     @classmethod
-    def is_eligible(cls, customer_id):
+    def is_valid_customer(cls, customer_id):
         customer = cls.query.filter_by(id=customer_id).first()
         if not customer:
-            return False, "Customer not found"
-        return True, "Customer is eligible"
+            return False
+        return True
 
     @classmethod
     def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):

app/models/loan.py

@@ -1,20 +1,54 @@
 from datetime import datetime, timezone
 from app.extensions import db
+from app.models.customer import Customer
+from app.models.account import Account
 
 
 class Loan(db.Model):
     __tablename__ = 'loans'
 
-    id = db.Column(db.String(50), primary_key=True) 
+    id = db.Column(
+        db.Integer,
+        primary_key=True,
+        autoincrement=True,
+    )
     customer_id = db.Column(db.String(50), nullable=False)
     account_id = db.Column(db.String(50), nullable=False)
-    product_id = db.Column(db.String(20), nullable=False)
+    offer_id = db.Column(db.String(20), nullable=False)
     principal_amount = db.Column(db.Float, nullable=False)
     status = db.Column(db.String(20), default='pending')
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
 
 
+    @classmethod
+    def create_loan(cls, customer_id, account_id, offer_id, principal_amount, status='pending'):
+
+        # Check if customer exists
+        is_valid = Customer.is_valid_customer(customer_id)
+        if not is_valid:
+            raise ValueError("Customer does not exist")
+        
+        # # Check for active loans
+        # has_active_loans = cls.has_active_loans(customer_id)
+        # if has_active_loans:
+        #     raise ValueError("Customer has active loans")
+
+
+        # Create and save the loan
+        loan = cls(
+            customer_id=customer_id,
+            account_id=account_id,
+            offer_id=offer_id,
+            principal_amount=principal_amount,
+            status=status
+        )
+
+        db.session.add(loan)
+        db.session.commit()
+        return loan
+
+
     @classmethod
     def has_active_loans(cls, customer_id):
         active_loans = cls.query.filter_by(
@@ -23,8 +57,8 @@ class Loan(db.Model):
         ).count()
 
         if active_loans > 0:
-            return False, "Customer has active loans"
-        return True, "No active loans"
+            return False
+        return True
     
     
     def __repr__(self):

app/models/transaction.py

@@ -1,11 +1,17 @@
 from datetime import datetime, timezone
 from app.extensions import db
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy import and_, or_, not_
 
 class Transaction(db.Model):
     __tablename__ = 'transactions'
-
-    id = db.Column(db.String(50), primary_key=True)
+    id = db.Column(
+        db.Integer,
+        primary_key=True,
+        autoincrement=True,
+    )
+    #id = db.Column(db.Int, primary_key=True)
+    transaction_id = db.Column(db.String(50), nullable=False)
     account_id = db.Column(db.String(50), nullable=False)
     type = db.Column(db.String(50), nullable=False)
     channel = db.Column(db.String(50), nullable=False)
@@ -16,12 +22,18 @@ class Transaction(db.Model):
         return f'<Transaction {self.id}>'
 
     @classmethod
-    def create_transaction(cls, id, account_id, type, channel):
-        if cls.query.filter_by(id=id).first():
+    def create_transaction(cls, transaction_id, account_id, type, channel):
+
+        # if cls.query.filter_by(transaction_id=transaction_id).first():
+        #     raise ValueError("Duplicate Transaction")
+
+        if cls.query.filter( and_( cls.transaction_id ==transaction_id, cls.type==type) ).first():
             raise ValueError("Duplicate Transaction")
 
+
+
         transaction = cls(
-            id=id,
+            transaction_id=transaction_id,
             account_id=account_id,
             type=type,
             channel=channel

app/swagger/digifi_swagger.json

@@ -25,6 +25,22 @@
     }
   ],
   "tags": [
+      {
+      "name": "Authorize",
+      "description": "This feature will be used for authorizing customers.",
+      "externalDocs": {
+        "description": "Find out more",
+        "url": "https://www.simbrellang.net"
+      }
+    },
+    {
+      "name": "AuthorizeRefresh",
+      "description": "This feature will be used for refreshing authorized customers.",
+      "externalDocs": {
+        "description": "Find out more",
+        "url": "https://www.simbrellang.net"
+      }
+    },
     {
       "name": "EligibilityCheck",
       "description": "Eligibility Check Request",
@@ -64,38 +80,6 @@
         "description": "Find out more",
         "url": "https://www.simbrellang.net"
       }
-    },
-    {
-      "name": "CustomerConsent",
-      "description": "CustomerConsent Request.",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "https://www.simbrellang.net"
-      }
-    },
-    {
-      "name": "NotificationCallback",
-      "description": "This new feature will be used for informing Simbrella about status of the transactions that FBN have processed.",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "https://www.simbrellang.net"
-      }
-    },
-    {
-      "name": "Authorize",
-      "description": "This feature will be used for authorizing customers.",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "https://www.simbrellang.net"
-      }
-    },
-    {
-      "name": "AuthorizeRefresh",
-      "description": "This feature will be used for refreshing authorized customers.",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "https://www.simbrellang.net"
-      }
     }
   ],
   "paths": {
@@ -119,12 +103,6 @@
     },
     "/Repayment": {
       "$ref": "swagger/paths/Repayment.json"
-    },
-    "/CustomerConsent": {
-      "$ref": "swagger/paths/CustomerConsent.json"
-    },
-    "/NotificationCallback": {
-      "$ref": "swagger/paths/NotificationCallback.json"
     }
   },
   "components": {

app/swagger/schemas/ProvideLoanRequest.json

@@ -21,15 +21,6 @@
             "type": "string",
             "example": "3451342"
         },
-        "productId": {
-            "type": "string",
-            "example": "101"
-        },
-        "lienAmount": {
-            "type": "number",
-            "format": "decimal",
-            "example": 400
-        },
         "requestedAmount": {
             "type": "number",
             "format": "decimal",