marcel/familienarchiv
1
0
Fork 0
Code Issues 118 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

test(audit): replace null-actorId bootstrap calls with createUserForBootstrap(), increase timeouts to 10s

Browse Source 
Removes the wait+clear cycles that existed only to drain the audit events
emitted by createUserOrUpdate(null, ...). Timeouts increased 5 → 10 s to
reduce CI flakiness under load.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-04-26 17:41:56 +02:00
parent 6d9910b805
commit a6c8af0971
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/test/java/org/raddatz/familienarchiv/audit/UserManagementAuditIntegrationTest.java
View File

@@ -45,18 +45,13 @@ class UserManagementAuditIntegrationTest {
@Test @Test
void createAndDeleteUser_producesOrderedAuditEntries() { void createAndDeleteUser_producesOrderedAuditEntries() {
// Create the actor (admin) user directly — bypasses audit logging so no FK issue // Bootstrap actor with no audit event — clean slate guaranteed by @BeforeEach
CreateUserRequest adminReq = new CreateUserRequest(); CreateUserRequest adminReq = new CreateUserRequest();
adminReq.setEmail("admin@test.example.com"); adminReq.setEmail("admin@test.example.com");
adminReq.setInitialPassword("admin-secret"); adminReq.setInitialPassword("admin-secret");
AppUser actor = transactionTemplate.execute(status -> AppUser actor = transactionTemplate.execute(status -> userService.createUserForBootstrap(adminReq));
userService.createUserOrUpdate(null, adminReq));
UUID actorId = actor.getId(); UUID actorId = actor.getId();
// The admin creation is logged with null actorId — clear to start with a clean slate
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED));
transactionTemplate.execute(status -> { auditLogRepository.deleteAll(); return null; });
// Create the target user — should emit USER_CREATED // Create the target user — should emit USER_CREATED
CreateUserRequest req = new CreateUserRequest(); CreateUserRequest req = new CreateUserRequest();
req.setEmail("audit-test@example.com"); req.setEmail("audit-test@example.com");
@@ -65,7 +60,7 @@ class UserManagementAuditIntegrationTest {
userService.createUserOrUpdate(actorId, req); userService.createUserOrUpdate(actorId, req);
return null; return null;
}); });
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED)); await().atMost(10, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED));
// Delete the target user — should emit USER_DELETED // Delete the target user — should emit USER_DELETED
AppUser created = userRepository.findByEmail("audit-test@example.com").orElseThrow(); AppUser created = userRepository.findByEmail("audit-test@example.com").orElseThrow();
@@ -73,7 +68,7 @@ class UserManagementAuditIntegrationTest {
userService.deleteUser(actorId, created.getId()); userService.deleteUser(actorId, created.getId());
return null; return null;
}); });
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_DELETED)); await().atMost(10, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_DELETED));
List<AuditLog> events = auditLogQueryService.findRecentUserManagementEvents(10); List<AuditLog> events = auditLogQueryService.findRecentUserManagementEvents(10);
assertThat(events).hasSize(2); assertThat(events).hasSize(2);
@@ -83,27 +78,24 @@ class UserManagementAuditIntegrationTest {
@Test @Test
void updateUserGroups_producesGroupMembershipChangedEvent() { void updateUserGroups_producesGroupMembershipChangedEvent() {
// Create groups before creating users — required for group assignment on creation
GroupDTO groupADto = new GroupDTO(); groupADto.setName("Viewers"); groupADto.setPermissions(Set.of("READ_ALL")); GroupDTO groupADto = new GroupDTO(); groupADto.setName("Viewers"); groupADto.setPermissions(Set.of("READ_ALL"));
GroupDTO groupBDto = new GroupDTO(); groupBDto.setName("Editors"); groupBDto.setPermissions(Set.of("WRITE_ALL")); GroupDTO groupBDto = new GroupDTO(); groupBDto.setName("Editors"); groupBDto.setPermissions(Set.of("WRITE_ALL"));
UserGroup gA = transactionTemplate.execute(status -> userService.createGroup(groupADto)); UserGroup gA = transactionTemplate.execute(status -> userService.createGroup(groupADto));
UserGroup gB = transactionTemplate.execute(status -> userService.createGroup(groupBDto)); UserGroup gB = transactionTemplate.execute(status -> userService.createGroup(groupBDto));
// Create actor (bootstrap — null actorId, event not relevant) // Bootstrap actor with no audit event — clean slate guaranteed by @BeforeEach
CreateUserRequest actorReq = new CreateUserRequest(); CreateUserRequest actorReq = new CreateUserRequest();
actorReq.setEmail("actor-group-test@test.example.com"); actorReq.setEmail("actor-group-test@test.example.com");
actorReq.setInitialPassword("secret"); actorReq.setInitialPassword("secret");
AppUser actor = transactionTemplate.execute(status -> userService.createUserOrUpdate(null, actorReq)); AppUser actor = transactionTemplate.execute(status -> userService.createUserForBootstrap(actorReq));
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED));
transactionTemplate.execute(status -> { auditLogRepository.deleteAll(); return null; });
// Create target user pre-assigned to gA // Create target user pre-assigned to gA — emits USER_CREATED
CreateUserRequest targetReq = new CreateUserRequest(); CreateUserRequest targetReq = new CreateUserRequest();
targetReq.setEmail("target-group-test@test.example.com"); targetReq.setEmail("target-group-test@test.example.com");
targetReq.setInitialPassword("secret"); targetReq.setInitialPassword("secret");
targetReq.setGroupIds(List.of(gA.getId())); targetReq.setGroupIds(List.of(gA.getId()));
transactionTemplate.execute(status -> userService.createUserOrUpdate(actor.getId(), targetReq)); transactionTemplate.execute(status -> userService.createUserOrUpdate(actor.getId(), targetReq));
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED)); await().atMost(10, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.USER_CREATED));
transactionTemplate.execute(status -> { auditLogRepository.deleteAll(); return null; }); transactionTemplate.execute(status -> { auditLogRepository.deleteAll(); return null; });
AppUser target = userRepository.findByEmail("target-group-test@test.example.com").orElseThrow(); AppUser target = userRepository.findByEmail("target-group-test@test.example.com").orElseThrow();
@@ -113,7 +105,7 @@ class UserManagementAuditIntegrationTest {
dto.setGroupIds(List.of(gB.getId())); dto.setGroupIds(List.of(gB.getId()));
transactionTemplate.execute(status -> userService.adminUpdateUser(actor.getId(), target.getId(), dto)); transactionTemplate.execute(status -> userService.adminUpdateUser(actor.getId(), target.getId(), dto));
await().atMost(5, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.GROUP_MEMBERSHIP_CHANGED)); await().atMost(10, SECONDS).until(() -> auditLogRepository.existsByKind(AuditKind.GROUP_MEMBERSHIP_CHANGED));
List<AuditLog> events = auditLogQueryService.findRecentUserManagementEvents(10); List<AuditLog> events = auditLogQueryService.findRecentUserManagementEvents(10);
assertThat(events).hasSize(1); assertThat(events).hasSize(1);