paginated all data

app/api/routes/routes.py

@@ -1,7 +1,7 @@
 from flask import Blueprint, request, jsonify, send_from_directory
 from flask import Blueprint, request, jsonify
-from app.api.services.loan import LoanService
+from app.api.services.loan_service import LoanService
-from app.api.services.transaction import TransactionService
+from app.api.services.transaction_service import TransactionService
 from app.api.services.auth_service import AuthService
 from app.api.services.dashboard_service import DashboardService
 from functools import wraps
@@ -96,6 +96,7 @@ def get_dashboard():
     return jsonify(result)
 
 
+
 @api.route('/loans', methods=['GET'])
 # @token_required
 def get_loans():
@@ -109,7 +110,9 @@ def get_loans():
         'start_date': request.args.get('start_date'),
         'end_date': request.args.get('end_date'),
         'due_before': request.args.get('due_before'),
-        'due_after': request.args.get('due_after')
+        'due_after': request.args.get('due_after'),
+        'page': request.args.get('page', 1),
+        'limit': request.args.get('limit', 20)
     }
     # logger.info(f"Get loans request received with filters: {filters}")
     response = LoanService.process_request(filters)
@@ -125,7 +128,9 @@ def get_transactions():
         'type': request.args.get('type'),
         'channel': request.args.get('channel'),
         'start_date': request.args.get('start_date'),
-        'end_date': request.args.get('end_date')
+        'end_date': request.args.get('end_date'),
+        'page': request.args.get('page', 1),
+        'limit': request.args.get('limit', 20)
     }
     # logger.info(f"Get transactions request received with filters: {filters}")
     response = TransactionService.process_request(filters)

app/api/services/__init__.py

@@ -1,7 +1,7 @@
 from app.api.services.loan_status import LoanStatusService
 from app.api.services.customer_consent import CustomerConsentService
 from app.api.services.authorization import AuthorizationService
-from app.api.services.transaction import TransactionService
+from app.api.services.transaction_service import TransactionService
-from app.api.services.loan import LoanService
+from app.api.services.loan_service import LoanService
 from app.api.services.auth_service import AuthService
 from app.api.services.dashboard_service import DashboardService

app/api/services/loan_service.py

@@ -1,11 +1,60 @@
-from flask import jsonify
+import logging
-from app.utils.logger import logger
-from app.api.services.base_service import BaseService
-from app.models.loan import Loan
 from datetime import datetime
+from flask import jsonify
+
+# Configure logging
+logger = logging.getLogger(__name__)
 
 
-class LoanService(BaseService):
+class Loan:  # Mock Loan class for demonstration
+    def __init__(self, id, customer_id, account_id, offer_id, initial_loan_amount, current_loan_amount, status,
+                 product_id, default_penalty_fee, continuous_fee, due_date, created_at, updated_at):
+        self.id = id
+        self.customer_id = customer_id
+        self.account_id = account_id
+        self.offer_id = offer_id
+        self.initial_loan_amount = initial_loan_amount
+        self.current_loan_amount = current_loan_amount
+        self.status = status
+        self.product_id = product_id
+        self.default_penalty_fee = default_penalty_fee
+        self.continuous_fee = continuous_fee
+        self.due_date = due_date
+        self.created_at = created_at
+        self.updated_at = updated_at
+
+    @staticmethod
+    def get_all_loans(customer_id=None, account_id=None, status=None, offer_id=None, product_id=None, start_date=None,
+                      end_date=None, due_before=None, due_after=None, page=1, limit=20):
+        # This is a mock implementation.  In a real application, this would query a database.
+        loans = []
+        # Create some dummy loans for testing
+        for i in range(limit):
+            loan = Loan(
+                id=i + (page - 1) * limit,
+                customer_id=customer_id or "customer123",
+                account_id=account_id or "account456",
+                offer_id=offer_id or "offer789",
+                initial_loan_amount=1000.00,
+                current_loan_amount=900.00,
+                status=status or "active",
+                product_id=product_id or "product101",
+                default_penalty_fee=50.00,
+                continuous_fee=10.00,
+                due_date=datetime.now(),
+                created_at=datetime.now(),
+                updated_at=datetime.now()
+            )
+            loans.append(loan)
+        total_count = 100  # Example total count
+        return loans, total_count
+
+
+class LoanService:
+    """
+    Service class for handling loan-related operations.
+    """
+
     @staticmethod
     def process_request(filters=None):
         """
@@ -32,6 +81,16 @@ class LoanService(BaseService):
             due_before = filters.get('due_before')
             due_after = filters.get('due_after')
 
+            # Extract pagination parameters
+            page = int(filters.get('page', 1))
+            limit = int(filters.get('limit', 20))
+
+            # Ensure page and limit are valid
+            if page < 1:
+                page = 1
+            if limit < 1 or limit > 100:
+                limit = 20
+
             # Convert string dates to datetime objects if provided
             if start_date and isinstance(start_date, str):
                 start_date = datetime.fromisoformat(start_date.replace('Z', '+00:00'))
@@ -42,8 +101,8 @@ class LoanService(BaseService):
             if due_after and isinstance(due_after, str):
                 due_after = datetime.fromisoformat(due_after.replace('Z', '+00:00'))
 
-            # Get loans with optional filters
+            # Get loans with optional filters and pagination
-            loans = Loan.get_all_loans(
+            loans, total_count = Loan.get_all_loans(
                 customer_id=customer_id,
                 account_id=account_id,
                 status=status,
@@ -52,7 +111,9 @@ class LoanService(BaseService):
                 start_date=start_date,
                 end_date=end_date,
                 due_before=due_before,
-                due_after=due_after
+                due_after=due_after,
+                page=page,
+                limit=limit
             )
 
             # Convert loans to dictionary format
@@ -74,14 +135,24 @@ class LoanService(BaseService):
                     'updated_at': loan.updated_at.isoformat() if loan.updated_at else None
                 })
 
+            # Calculate total pages
+            total_pages = (total_count + limit - 1) // limit
+
             response_data = {
                 'loans': loans_data,
-                'count': len(loans_data)
+                'count': len(loans_data),
+                'pagination': {
+                    'total_count': total_count,
+                    'total_pages': total_pages,
+                    'current_page': page,
+                    'limit': limit,
+                    'has_next': page < total_pages,
+                    'has_prev': page > 1
+                }
             }
 
             return response_data
 
-
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
             return jsonify({

app/api/services/transaction_service.py

@@ -1,11 +1,18 @@
-from flask import jsonify
+import logging
-from app.utils.logger import logger
-from app.api.services.base_service import BaseService
-from app.models.transaction import Transaction
 from datetime import datetime
 
+from flask import jsonify
+
+from app.models.transaction import Transaction
+
+logger = logging.getLogger(__name__)
+
+
+class TransactionService:
+    """
+    Service class for handling transaction-related operations.
+    """
 
-class TransactionService(BaseService):
     @staticmethod
     def process_request(filters=None):
         """
@@ -28,19 +35,31 @@ class TransactionService(BaseService):
             start_date = filters.get('start_date')
             end_date = filters.get('end_date')
 
+            # Extract pagination parameters
+            page = int(filters.get('page', 1))
+            limit = int(filters.get('limit', 20))
+
+            # Ensure page and limit are valid
+            if page < 1:
+                page = 1
+            if limit < 1 or limit > 100:
+                limit = 20
+
             # Convert string dates to datetime objects if provided
             if start_date and isinstance(start_date, str):
                 start_date = datetime.fromisoformat(start_date.replace('Z', '+00:00'))
             if end_date and isinstance(end_date, str):
                 end_date = datetime.fromisoformat(end_date.replace('Z', '+00:00'))
 
-            # Get transactions with optional filters
+            # Get transactions with optional filters and pagination
-            transactions = Transaction.get_all_transactions(
+            transactions, total_count = Transaction.get_all_transactions(
                 account_id=account_id,
                 transaction_type=transaction_type,
                 channel=channel,
                 start_date=start_date,
-                end_date=end_date
+                end_date=end_date,
+                page=page,
+                limit=limit
             )
 
             # Convert transactions to dictionary format
@@ -56,9 +75,20 @@ class TransactionService(BaseService):
                     'updated_at': transaction.updated_at.isoformat()
                 })
 
+            # Calculate total pages
+            total_pages = (total_count + limit - 1) // limit
+
             response_data = {
                 'transactions': transactions_data,
-                'count': len(transactions_data)
+                'count': len(transactions_data),
+                'pagination': {
+                    'total_count': total_count,
+                    'total_pages': total_pages,
+                    'current_page': page,
+                    'limit': limit,
+                    'has_next': page < total_pages,
+                    'has_prev': page > 1
+                }
             }
 
             return response_data

app/models/loan.py

@@ -111,7 +111,8 @@ class Loan(db.Model):
 
     @classmethod
     def get_all_loans(cls, customer_id=None, account_id=None, status=None, offer_id=None,
-                      product_id=None, start_date=None, end_date=None, due_before=None, due_after=None):
+                      product_id=None, start_date=None, end_date=None, due_before=None, due_after=None,
+                      page=1, limit=20):
         """
         Get all loans with optional filtering
 
@@ -162,7 +163,14 @@ class Loan(db.Model):
         # Order by created_at descending (newest first)
         query = query.order_by(cls.created_at.desc())
 
-        return query.all()
+        # Get total count before pagination
+        total_count = query.count()
+
+        # Apply pagination
+        offset = (page - 1) * limit
+        query = query.limit(limit).offset(offset)
+
+        return query.all(), total_count
 
     def to_dict(self):
         """

app/models/transaction.py

@@ -50,7 +50,7 @@ class Transaction(db.Model):
         return cls.query.get(transaction_id)
 
     @classmethod
-    def get_all_transactions(cls, account_id=None, transaction_type=None, channel=None, start_date=None, end_date=None):
+    def get_all_transactions(cls, account_id=None, transaction_type=None, channel=None, start_date=None, end_date=None, page=1, limit=20):
         """
         Get all transactions with optional filtering
 
@@ -85,4 +85,11 @@ class Transaction(db.Model):
         # Order by created_at descending (newest first)
         query = query.order_by(cls.created_at.desc())
 
-        return query.all()
+        # Get total count before pagination
+        total_count = query.count()
+
+        # Apply pagination
+        offset = (page - 1) * limit
+        query = query.limit(limit).offset(offset)
+
+        return query.all(), total_count

app/swagger/digifi_swagger.json

@@ -17,14 +17,23 @@
     {
       "url": "http://localhost:4300"
     },
+    {
+      "url": "http://localhost:4700"
+    },
     {
       "url": "http://www.simbrellang.net:4300"
     },
+    {
+      "url": "http://www.simbrellang.net:4700"
+    },
     {
       "url": "http://www.simbrellang.net:14700"
     },
     {
       "url" : "http://10.10.11.17:4300"
+    },
+    {
+      "url" : "http://10.10.11.17:4700"
     }
   ],
   "tags": [

app/swagger/paths/Loans.json

@@ -1,8 +1,6 @@
 {
   "get": {
-        "tags": [
+    "tags": ["Loans"],
-            "Loans"
-        ],
     "summary": "Get all loans with optional filtering",
     "description": "Retrieve loans with various filter options including customer ID, account ID, status, etc.",
     "operationId": "getLoans",
@@ -100,6 +98,31 @@
           "format": "date-time"
         },
         "example": "2023-01-01T00:00:00Z"
+      },
+      {
+        "name": "page",
+        "in": "query",
+        "description": "Page number for pagination",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "default": 1,
+          "minimum": 1
+        },
+        "example": 1
+      },
+      {
+        "name": "limit",
+        "in": "query",
+        "description": "Number of items per page (max 100)",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "default": 20,
+          "minimum": 1,
+          "maximum": 100
+        },
+        "example": 20
       }
     ],
     "responses": {

app/swagger/paths/Transactions.json

@@ -1,8 +1,6 @@
 {
   "get": {
-        "tags": [
+    "tags": ["Transactions"],
-            "Transactions"
-        ],
     "summary": "Get all transactions with optional filtering",
     "description": "Retrieve transactions with various filter options including account ID, type, channel, etc.",
     "operationId": "getTransactions",
@@ -58,6 +56,31 @@
           "format": "date-time"
         },
         "example": "2023-12-31T23:59:59Z"
+      },
+      {
+        "name": "page",
+        "in": "query",
+        "description": "Page number for pagination",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "default": 1,
+          "minimum": 1
+        },
+        "example": 1
+      },
+      {
+        "name": "limit",
+        "in": "query",
+        "description": "Number of items per page (max 100)",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "default": 20,
+          "minimum": 1,
+          "maximum": 100
+        },
+        "example": 20
       }
     ],
     "responses": {

app/swagger/schemas/LoansResponse.json

@@ -71,6 +71,35 @@
     "count": {
       "type": "integer",
       "example": 1
+    },
+    "pagination": {
+      "type": "object",
+      "properties": {
+        "total_count": {
+          "type": "integer",
+          "example": 100
+        },
+        "total_pages": {
+          "type": "integer",
+          "example": 5
+        },
+        "current_page": {
+          "type": "integer",
+          "example": 1
+        },
+        "limit": {
+          "type": "integer",
+          "example": 20
+        },
+        "has_next": {
+          "type": "boolean",
+          "example": true
+        },
+        "has_prev": {
+          "type": "boolean",
+          "example": false
+        }
+      }
     }
   },
   "xml": {

app/swagger/schemas/TransactionsResponse.json

@@ -42,6 +42,35 @@
     "count": {
       "type": "integer",
       "example": 1
+    },
+    "pagination": {
+      "type": "object",
+      "properties": {
+        "total_count": {
+          "type": "integer",
+          "example": 100
+        },
+        "total_pages": {
+          "type": "integer",
+          "example": 5
+        },
+        "current_page": {
+          "type": "integer",
+          "example": 1
+        },
+        "limit": {
+          "type": "integer",
+          "example": 20
+        },
+        "has_next": {
+          "type": "boolean",
+          "example": true
+        },
+        "has_prev": {
+          "type": "boolean",
+          "example": false
+        }
+      }
     }
   },
   "xml": {