diff --git a/tests/abri/abri_relay_getscstenantdata_multitenant_response.xml b/tests/abri/abri_relay_getscstenantdata_multitenant_response.xml
index d95e3ce81..7a3b26efa 100644
--- a/tests/abri/abri_relay_getscstenantdata_multitenant_response.xml
+++ b/tests/abri/abri_relay_getscstenantdata_multitenant_response.xml
@@ -1,8 +1,8 @@
- 10071650064015400721609261195827
+ 10071650064015400721607700900456
- 400721509286114923
- 02769674129
+ 400721507700900789
+ 01632960456
diff --git a/tests/abri/abri_relay_getscstenantdata_success_response.xml b/tests/abri/abri_relay_getscstenantdata_success_response.xml
index 8f3080898..9056a8c81 100644
--- a/tests/abri/abri_relay_getscstenantdata_success_response.xml
+++ b/tests/abri/abri_relay_getscstenantdata_success_response.xml
@@ -1,6 +1,6 @@
- 10042020051017136847309853460810
- 02473757484
+ 10042020051017136847307700900123
+ 01632960123
Blindness
diff --git a/tests/orchestration/test_tenant_data_sync_orchestrator.py b/tests/orchestration/test_tenant_data_sync_orchestrator.py
index 1980a45c9..3bbfbe439 100644
--- a/tests/orchestration/test_tenant_data_sync_orchestrator.py
+++ b/tests/orchestration/test_tenant_data_sync_orchestrator.py
@@ -106,9 +106,9 @@ def test_run_creates_an_associated_deal_contact_per_signatory_and_returns_a_summ
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '136847309853460810'
- '02473757484'
+ '136847307700900123'
+ '01632960123'
)
# Act
@@ -123,10 +123,10 @@ def test_run_creates_an_associated_deal_contact_per_signatory_and_returns_a_summ
sdk_client.crm.contacts.basic_api.create.assert_called_once_with(
simple_public_object_input_for_create=SimplePublicObjectInputForCreate(
properties={
- "firstname": "Amanjeet",
- "lastname": "Okello",
- "mobilephone": "09853460810",
- "phone": "02473757484",
+ "firstname": "Jane",
+ "lastname": "Doe",
+ "mobilephone": "07700900123",
+ "phone": "01632960123",
"is_vulnerable": "false",
}
)
@@ -173,16 +173,16 @@ def test_run_creates_a_separate_contact_for_each_signatory(
]
assert created_properties == [
{
- "firstname": "Harper",
- "lastname": "Solecka",
- "mobilephone": "09261195827",
+ "firstname": "Ann",
+ "lastname": "Bloggs",
+ "mobilephone": "07700900456",
"is_vulnerable": "false",
},
{
- "firstname": "Naoimh",
- "lastname": "Malyar",
- "mobilephone": "09286114923",
- "phone": "02769674129",
+ "firstname": "Beth",
+ "lastname": "Sample",
+ "mobilephone": "07700900789",
+ "phone": "01632960456",
"is_vulnerable": "false",
},
]
@@ -200,8 +200,8 @@ def test_run_picks_the_best_priority_number_of_each_kind_for_a_contact(
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '1368473'
+ '1368473'
"07000000099" # no priority: sorts last
' ' # blank number: ignored
'07000000020'
@@ -232,8 +232,8 @@ def test_run_fills_secondary_phone_number_with_the_best_leftover_number(
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '1368473'
+ '1368473'
'07000000005' # best mobile
'07000000020'
'01000000007' # best leftover
@@ -248,8 +248,8 @@ def test_run_fills_secondary_phone_number_with_the_best_leftover_number(
sdk_client.crm.contacts.basic_api.create.assert_called_once_with(
simple_public_object_input_for_create=SimplePublicObjectInputForCreate(
properties={
- "firstname": "Amanjeet",
- "lastname": "Okello",
+ "firstname": "Jane",
+ "lastname": "Doe",
"mobilephone": "07000000005",
"phone": "01000000003",
"secondary_phone_number": "01000000007",
@@ -269,14 +269,14 @@ def test_run_records_vulnerabilities_on_the_tenants_own_contact(
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '4007216'
+ '4007216'
"Blindness"
"Hard of hearing"
"BLINDNESS" # within-tenant duplicate
""
- '4007215'
+ '4007215'
)
sdk_client.crm.contacts.basic_api.create.side_effect = [
MagicMock(id="60123"),
@@ -298,14 +298,14 @@ def test_run_records_vulnerabilities_on_the_tenants_own_contact(
]
assert created_properties == [
{
- "firstname": "Harper",
- "lastname": "Solecka",
+ "firstname": "Ann",
+ "lastname": "Bloggs",
"is_vulnerable": "true",
"vulnerability_description": "Blindness\nHard of hearing",
},
{
- "firstname": "Naoimh",
- "lastname": "Malyar",
+ "firstname": "Beth",
+ "lastname": "Sample",
"is_vulnerable": "false",
},
]
@@ -435,7 +435,7 @@ def _pii_echoing_api_error() -> ContactsApiException:
api_error.body = json.dumps(
{
"status": "error",
- "message": 'Invalid value "09853460810" for mobilephone (Amanjeet Okello)',
+ "message": 'Invalid value "07700900123" for mobilephone (Jane Doe)',
"correlationId": "corr-abc-123",
"category": "VALIDATION_ERROR",
}
@@ -451,8 +451,8 @@ def test_run_raises_an_error_scrubbed_of_the_hubspot_response_body(
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '136847309853460810'
+ '136847307700900123'
)
sdk_client.crm.contacts.basic_api.create.side_effect = _pii_echoing_api_error()
@@ -465,9 +465,9 @@ def test_run_raises_an_error_scrubbed_of_the_hubspot_response_body(
assert "400" in str(exc_info.value)
assert "VALIDATION_ERROR" in str(exc_info.value)
assert "corr-abc-123" in str(exc_info.value)
- assert "Amanjeet" not in rendered_traceback
- assert "Okello" not in rendered_traceback
- assert "09853460810" not in rendered_traceback
+ assert "Jane" not in rendered_traceback
+ assert "Doe" not in rendered_traceback
+ assert "07700900123" not in rendered_traceback
def test_run_fails_fast_when_association_fails_and_reports_the_orphaned_contact(
@@ -497,8 +497,8 @@ def test_run_fails_fast_when_association_fails_and_reports_the_orphaned_contact(
assert sdk_client.crm.contacts.basic_api.create.call_count == 1 # fail fast
rendered_traceback = "".join(traceback.format_exception(error))
assert "corr-abc-123" in str(error) # scrubbed diagnostics carried through
- assert "Solecka" not in rendered_traceback
- assert "09261195827" not in rendered_traceback
+ assert "Bloggs" not in rendered_traceback
+ assert "07700900456" not in rendered_traceback
def test_run_retries_a_rate_limited_hubspot_call_before_succeeding(
@@ -508,8 +508,8 @@ def test_run_retries_a_rate_limited_hubspot_call_before_succeeding(
) -> None:
# Arrange
mock_session.post.return_value.content = _tenancy_response(
- '1368473'
+ '1368473'
)
rate_limited = ContactsApiException(status=429, reason="Too Many Requests")
rate_limited.headers = {"x-hubspot-ratelimit-interval-milliseconds": "0"}