Skip to content

Bau: assert on full audit events in send notification handler tests #8360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BeckaL wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bau: assert on full audit events in send notification handler tests #8360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5678bb0
BAU: Assert on full audit event
BeckaL May 19, 2026
fa1293d
BAU: Reuse existing shared constant for metadata pair key
BeckaL May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...pi/src/main/java/uk/gov/di/authentication/frontendapi/lambda/SendNotificationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import static uk.gov.di.authentication.frontendapi.domain.FrontendAuditableEvent.AUTH_PHONE_CODE_SENT_FOR_TEST_CLIENT;
import static uk.gov.di.authentication.frontendapi.domain.FrontendAuditableEvent.AUTH_PHONE_INVALID_CODE_REQUEST;
import static uk.gov.di.authentication.shared.domain.AuditableEvent.AUDIT_EVENT_EXTENSIONS_JOURNEY_TYPE;
import static uk.gov.di.authentication.shared.domain.AuditableEvent.AUDIT_EVENT_EXTENSIONS_MFA_METHOD;
import static uk.gov.di.authentication.shared.entity.ErrorResponse.INDEFINITELY_BLOCKED_SENDING_INT_NUMBERS_SMS;
import static uk.gov.di.authentication.shared.entity.ErrorResponse.INVALID_NOTIFICATION_TYPE;
import static uk.gov.di.authentication.shared.entity.ErrorResponse.PHONE_NUMBER_MISSING;
Expand All @@ -79,7 +80,6 @@ public class SendNotificationHandler extends BaseFrontendHandler<SendNotificatio
private static final Logger LOG = LogManager.getLogger(SendNotificationHandler.class);
private static final List<NotificationType> CONFIRMATION_NOTIFICATION_TYPES =
List.of(ACCOUNT_CREATED_CONFIRMATION, CHANGE_HOW_GET_SECURITY_CODES_CONFIRMATION);
public static final String AUDIT_EVENT_MFA_METHOD_FIELD = "mfa-method";
public static final String AUDIT_EVENT_DEFAULT_MFA_VALUE =
PriorityIdentifier.DEFAULT.toString().toLowerCase();

Expand Down Expand Up @@ -319,7 +319,7 @@ private APIGatewayProxyResponseEvent handlePhoneNumberVerification(
auditContext =
auditContext.withMetadataItem(
new AuditService.MetadataPair(
AUDIT_EVENT_MFA_METHOD_FIELD,
AUDIT_EVENT_EXTENSIONS_MFA_METHOD,
AUDIT_EVENT_DEFAULT_MFA_VALUE,
false));

Expand Down
16 changes: 14 additions & 2 deletions ...rc/test/java/uk/gov/di/authentication/frontendapi/lambda/SendNotificationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,14 @@ void shouldReturn204AndUseExistingOtpCodeIfOneExistsForVerifyPhoneRequest()
SESSION_ID,
CLIENT_SESSION_ID)),
"unique_notification_reference")));
verify(auditService).submitAuditEvent(eq(AUTH_PHONE_CODE_SENT), any());
var priorityPair = pair("mfa-method", "default");
var journeyTypePair = pair("journey-type", REGISTRATION);
var expectedAuditContext =
auditContext
.withPhoneNumber(CommonTestVariables.UK_MOBILE_NUMBER)
.withMetadataItem(priorityPair)
.withMetadataItem(journeyTypePair);
verify(auditService).submitAuditEvent(AUTH_PHONE_CODE_SENT, expectedAuditContext);
}

@ParameterizedTest
Expand Down Expand Up @@ -597,7 +604,12 @@ void shouldReturn204ForValidVerifyPhoneNumberRequest(String phoneNumber)
SESSION_ID,
CLIENT_SESSION_ID)),
"unique_notification_reference")));
verify(auditService).submitAuditEvent(eq(AUTH_PHONE_CODE_SENT), any());
var expectedAuditContext =
auditContext
.withPhoneNumber(phoneNumber)
.withMetadataItem(pair("mfa-method", "default"))
.withMetadataItem(pair("journey-type", REGISTRATION));
verify(auditService).submitAuditEvent(AUTH_PHONE_CODE_SENT, expectedAuditContext);
}

@ParameterizedTest
Expand Down
Loading