Merge pull request #11 from paywithextend/check-validity-of-status-strings

Author: byjoh

extend/models.py

@@ -2,6 +2,50 @@
 from typing import TypedDict, Literal, NotRequired
 
 
+class ValidatableEnum(Enum):
+    @classmethod
+    def is_valid(cls, value: str) -> bool:
+        try:
+            cls(value)
+            return True
+        except ValueError:
+            return False
+
+
+class CreditCardStatus(ValidatableEnum):
+    ACTIVE = "ACTIVE"
+    PENDING = "PENDING"
+    INACTIVE = "INACTIVE"
+    EXPIRED = "EXPIRED"
+    BLOCKED = "BLOCKED"
+    CLOSED = "CLOSED"
+
+
+class VirtualCardStatus(ValidatableEnum):
+    ACTIVE = "ACTIVE"
+    CANCELLED = "CANCELLED"
+    EXPIRED = "EXPIRED"
+    PENDING = "PENDING"
+    CLOSED = "CLOSED"
+    CONSUMED = "CONSUMED"
+
+
+class TransactionStatus(ValidatableEnum):
+    PENDING = "PENDING"
+    CLEARED = "CLEARED"
+    DECLINED = "DECLINED"
+    NO_MATCH = "NO_MATCH"
+    AVS_PASS = "AVS_PASS"
+    AVS_FAIL = "AVS_FAIL"
+    AUTH_REVERSAL = "AUTH_REVERSAL"
+
+
+class TransactionType(ValidatableEnum):
+    DEBIT = "DEBIT"
+    CREDIT = "CREDIT"
+    AVS = "AVS"
+
+
 class VirtualCard(TypedDict):
     """Type definition for Virtual Card data.
     

extend/resources/credit_cards.py

@@ -2,6 +2,7 @@
 
 from extend.client import APIClient
 from .resource import Resource
+from ..models import CreditCardStatus
 
 
 class CreditCards(Resource):
@@ -18,6 +19,7 @@ async def get_credit_cards(
             per_page: Optional[int] = None,
             status: Optional[str] = None,
             search_term: Optional[str] = None,
+            sort_direction: Optional[str] = None,
     ) -> Dict:
         """Get a list of all credit cards associated with your account.
 
@@ -26,6 +28,7 @@ async def get_credit_cards(
             per_page (Optional[int]): Number of items per page
             status (Optional[str]): Filter cards by status (e.g., "ACTIVE", "CANCELLED")
             search_term (Optional[str]): Filter cards by search term (e.g., "Marketing")
+            sort_direction (Optional[str]): Direction to sort (ASC or DESC)
 
         Returns:
             Dict: A dictionary containing:
@@ -40,13 +43,16 @@ async def get_credit_cards(
             httpx.HTTPError: If the request fails
         """
 
+        if status and not CreditCardStatus.is_valid(status.upper()):
+            raise ValueError(f"{status} is not a valid status")
+
         params = {
             "page": page,
             "count": per_page,
-            "statuses": status,
+            "statuses": status.upper() if status else None,
             "search": search_term,
+            "sortDirection": sort_direction,
         }
-        params = {k: v for k, v in params.items() if v is not None}
 
         return await self._request(method="get", params=params)
 

extend/resources/transactions.py

@@ -2,6 +2,7 @@
 
 from extend.client import APIClient
 from .resource import Resource
+from ..models import TransactionStatus
 
 
 class Transactions(Resource):
@@ -18,6 +19,7 @@ async def get_transactions(
             per_page: Optional[int] = None,
             from_date: Optional[str] = None,
             to_date: Optional[str] = None,
+            status: Optional[str] = None,
             virtual_card_id: Optional[str] = None,
             min_amount_cents: Optional[int] = None,
             max_amount_cents: Optional[int] = None,
@@ -31,10 +33,11 @@ async def get_transactions(
             per_page (Optional[int]): Number of items per page
             from_date (Optional[str]): Start date in YYYY-MM-DD format
             to_date (Optional[str]): End date in YYYY-MM-DD format
+            status (Optional[str]): Filter transactions by status (e.g., "PENDING", "CLEARED", "DECLINED", "NO_MATCH", "AVS_PASS", "AVS_FAIL", "AUTH_REVERSAL")
             virtual_card_id (str): Filter by specific virtual card
             min_amount_cents (int): Minimum clearing amount in cents
             max_amount_cents (int): Maximum clearing amount in cents
-            search_term (Optional[str]): Filter cards by search term (e.g., "Marketing")
+            search_term (Optional[str]): Filter transactions by search term (e.g., "Subscription")
             sort_field (Optional[str]): Field to sort by, with optional direction
                                     Use "recipientName", "merchantName", "amount", "date" for ASC
                                     Use "-recipientName", "-merchantName", "-amount", "-date" for DESC
@@ -52,11 +55,15 @@ async def get_transactions(
             httpx.HTTPError: If the request fails
         """
 
+        if status and not TransactionStatus.is_valid(status.upper()):
+            raise ValueError(f"{status} is not a valid status")
+
         params = {
             "page": page,
             "count": per_page,
             "fromDate": from_date,
             "toDate": to_date,
+            "statuses": status.upper() if status else None,
             "virtualCardId": virtual_card_id,
             "minClearingBillingCents": min_amount_cents,
             "maxClearingBillingCents": max_amount_cents,

extend/resources/virtual_cards.py

@@ -1,7 +1,7 @@
 from typing import Optional, Dict
 
 from extend.client import APIClient
-from extend.models import CardCreationRequest
+from extend.models import CardCreationRequest, VirtualCardStatus
 from extend.validations import validate_card_creation_data, validate_card_update_data
 from .resource import Resource
 
@@ -29,7 +29,7 @@ async def get_virtual_cards(
         Args:
             page (Optional[int]): The page number for pagination (1-based)
             per_page (Optional[int]): Number of items per page
-            status (Optional[str]): Filter cards by status (e.g., "ACTIVE", "CANCELLED")
+            status (Optional[str]): Filter cards by status (e.g., "ACTIVE", "CANCELLED", "PENDING", "EXPIRED", "CLOSED", "CONSUMED")
             recipient (Optional[str]): Filter cards by recipient id (e.g., "u_1234")
             search_term (Optional[str]): Filter cards by search term (e.g., "Marketing")
             sort_field (Optional[str]): Field to sort by "createdAt", "updatedAt", "balanceCents", "displayName", "type", or "status"
@@ -47,10 +47,14 @@ async def get_virtual_cards(
         Raises:
             httpx.HTTPError: If the request fails
         """
+
+        if status and not VirtualCardStatus.is_valid(status.upper()):
+            raise ValueError(f"{status} is not a valid status")
+
         params = {
             "page": page,
             "count": per_page,
-            "statuses": status,
+            "statuses": status.upper() if status else None,
             "recipient": recipient,
             "search": search_term,
             "sortField": sort_field,