feat: add handling for when not enrolled, but there is a Cardholder

Author: angela-tran

benefits/enrollment_init/api.py

@@ -38,8 +38,21 @@ class CardholderUpdateModel(BaseDataClass):
 
 @dataclass
 class CardholderResponse(BaseDataClass):
-    FareCategory: int
+    FirstName: str | None = None
+    MiddleName: str | None = None
+    LastName: str | None = None
+    PhoneNumber: str | None = None
+    DateOfBirth: str | None = None
+    Email: str | None = None
+    CellPhoneNumber: str | None = None
+    FaxNumber: str | None = None
+    Gender: str | None = None
+    Identifier: str | None = None
+    FareCategory: int | None = None
     FareCategoryExpiry: datetime | None = None
+    TransitAccountId: int | None = None
+    PersonalCareAssistant: bool | None = None
+    # there are more fields that can be returned, but we don't need them and they're not in the PUT parameters
 
     def __post_init__(self):
         """Parses any date parameters into aware Python datetime objects.

benefits/enrollment_init/enrollment.py

@@ -1,11 +1,13 @@
+from dataclasses import asdict
+
 from requests import HTTPError
 
 from benefits.core import session
 from benefits.core.models.enrollment import EnrollmentFlow
 from benefits.enrollment.enrollment import Status, resolve_enrollment_decision
 from benefits.enrollment_init.models import InitConfig, InitGroup
 
-from .api import CardholderResponse, Client, TransitAccountResponse
+from .api import CardholderResponse, CardholderUpdateModel, Client, TransitAccountResponse
 
 
 def enroll(request, init_config: InitConfig, flow: EnrollmentFlow, group: InitGroup, token: str):
@@ -35,7 +37,11 @@ def enroll(request, init_config: InitConfig, flow: EnrollmentFlow, group: InitGr
             elif decision.should_enroll:
                 if not already_enrolled:
                     if decision.expiry_to_send is None:
-                        client.post_cardholder(fare_category=group.group_id, transit_account_id=transit_account.Id)
+                        if cardholder is None:
+                            client.post_cardholder(fare_category=group.group_id, transit_account_id=transit_account.Id)
+                        else:
+                            cardholder_update_model = CardholderUpdateModel(**asdict(cardholder))
+                            client.put_cardholder(cardholder_id=cardholder.Id, cardholder_update_model=cardholder_update_model)
                     else:
                         # post_cardholder with expiry_to_send
                         raise NotImplementedError()

tests/pytest/enrollment_init/test_enrollment.py

@@ -40,6 +40,7 @@ def test_enroll_system_error(
     mock_error_response.json.return_value = mock_error
     http_error = HTTPError(response=mock_error_response)
     mock_client.post_cardholder.side_effect = http_error
+    mock_client.get_cardholder.return_value = None
 
     status, exception = enroll(
         request=app_request,
@@ -72,6 +73,7 @@ def test_enroll_exception_http_error_400(
         response=mock_error_response,
     )
     mock_client.post_cardholder.side_effect = http_error
+    mock_client.get_cardholder.return_value = None
 
     status, exception = enroll(
         request=app_request,
@@ -99,6 +101,7 @@ def test_enroll_exception_non_http_error(
     mock_client = mock_client_cls.return_value
 
     mock_client.post_cardholder.side_effect = Exception("some other exception")
+    mock_client.get_cardholder.return_value = None
 
     status, exception = enroll(
         request=app_request,
@@ -128,6 +131,7 @@ def test_enroll_success_flow_does_not_support_expiration_no_expiry(
     mock_client = mock_client_cls.return_value
 
     mock_client.get_transit_account.return_value = mocked_TransitAccountResponse
+    mock_client.get_cardholder.return_value = None
 
     status, exception = enroll(
         request=app_request,