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

feat(dashboard): add kinds CSV query param to /api/dashboard/activity #302

Merged
marcel merged 11 commits from feat/issue-293-dashboard-activity-kinds-filter into main 2026-04-21 22:48:09 +02:00
Conversation 13 Commits 11 Files Changed 18 +9 -9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba0f9bb325 - Show all commits

6
backend/src/test/java/org/raddatz/familienarchiv/dashboard/AuditLogQueryRepositoryRolledUpTest.java
View File

@@ -3,6 +3,7 @@ package org.raddatz.familienarchiv.dashboard;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.PostgresContainerConfig;
import org.raddatz.familienarchiv.audit.ActivityFeedRow; import org.raddatz.familienarchiv.audit.ActivityFeedRow;
import org.raddatz.familienarchiv.audit.AuditKind;
import org.raddatz.familienarchiv.audit.AuditLogQueryRepository; import org.raddatz.familienarchiv.audit.AuditLogQueryRepository;
import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.config.FlywayConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +37,8 @@ class AuditLogQueryRepositoryRolledUpTest {
static final UUID DOC_ID = UUID.fromString("eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee"); static final UUID DOC_ID = UUID.fromString("eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee");
static final UUID OTHER_DOC_ID = UUID.fromString("ffffffff-ffff-ffff-ffff-ffffffffffff"); static final UUID OTHER_DOC_ID = UUID.fromString("ffffffff-ffff-ffff-ffff-ffffffffffff");
static final List<String> ALL_ELIGIBLE_KINDS = List.of( static final List<String> ALL_ELIGIBLE_KINDS =
"TEXT_SAVED", "FILE_UPLOADED", "ANNOTATION_CREATED", AuditKind.ROLLUP_ELIGIBLE.stream().map(Enum::name).toList();
"BLOCK_REVIEWED", "COMMENT_ADDED", "MENTION_CREATED");
private static final ObjectMapper MAPPER = new ObjectMapper(); private static final ObjectMapper MAPPER = new ObjectMapper();

12
backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java
View File

@@ -137,7 +137,7 @@ class DashboardControllerTest {
UUID userId = UUID.randomUUID(); UUID userId = UUID.randomUUID();
when(userService.findByEmail(any())).thenReturn( when(userService.findByEmail(any())).thenReturn(
AppUser.builder().id(userId).email("u@test.com").password("pw").build()); AppUser.builder().id(userId).email("u@test.com").password("pw").build());
when(dashboardService.getActivity(any(UUID.class), anyInt(), any(Set.class))).thenReturn(List.of()); when(dashboardService.getActivity(any(UUID.class), anyInt(), any())).thenReturn(List.of());
mockMvc.perform(get("/api/dashboard/activity")) mockMvc.perform(get("/api/dashboard/activity"))
.andExpect(status().isOk()) .andExpect(status().isOk())
@@ -150,12 +150,12 @@ class DashboardControllerTest {
UUID userId = UUID.randomUUID(); UUID userId = UUID.randomUUID();
when(userService.findByEmail(any())).thenReturn( when(userService.findByEmail(any())).thenReturn(
AppUser.builder().id(userId).email("u@test.com").password("pw").build()); AppUser.builder().id(userId).email("u@test.com").password("pw").build());
when(dashboardService.getActivity(any(UUID.class), anyInt(), any(Set.class))).thenReturn(List.of()); when(dashboardService.getActivity(any(UUID.class), anyInt(), any())).thenReturn(List.of());
mockMvc.perform(get("/api/dashboard/activity").param("limit", "9999")) mockMvc.perform(get("/api/dashboard/activity").param("limit", "9999"))
.andExpect(status().isOk()); .andExpect(status().isOk());
verify(dashboardService).getActivity(any(UUID.class), org.mockito.ArgumentMatchers.eq(40), any(Set.class)); verify(dashboardService).getActivity(any(UUID.class), org.mockito.ArgumentMatchers.eq(40), any());
} }
// ─── GET /api/dashboard/activity — kinds param ─────────────────────────── // ─── GET /api/dashboard/activity — kinds param ───────────────────────────
@@ -166,7 +166,7 @@ class DashboardControllerTest {
UUID userId = UUID.randomUUID(); UUID userId = UUID.randomUUID();
when(userService.findByEmail(any())).thenReturn( when(userService.findByEmail(any())).thenReturn(
AppUser.builder().id(userId).email("u@test.com").password("pw").build()); AppUser.builder().id(userId).email("u@test.com").password("pw").build());
when(dashboardService.getActivity(any(UUID.class), anyInt(), any(Set.class))).thenReturn(List.of()); when(dashboardService.getActivity(any(UUID.class), anyInt(), any())).thenReturn(List.of());
mockMvc.perform(get("/api/dashboard/activity") mockMvc.perform(get("/api/dashboard/activity")
.param("kinds", "FILE_UPLOADED", "TEXT_SAVED")) .param("kinds", "FILE_UPLOADED", "TEXT_SAVED"))
@@ -189,7 +189,7 @@ class DashboardControllerTest {
UUID userId = UUID.randomUUID(); UUID userId = UUID.randomUUID();
when(userService.findByEmail(any())).thenReturn( when(userService.findByEmail(any())).thenReturn(
AppUser.builder().id(userId).email("u@test.com").password("pw").build()); AppUser.builder().id(userId).email("u@test.com").password("pw").build());
when(dashboardService.getActivity(any(UUID.class), anyInt(), any(Set.class))).thenReturn(List.of()); when(dashboardService.getActivity(any(UUID.class), anyInt(), any())).thenReturn(List.of());
mockMvc.perform(get("/api/dashboard/activity")) mockMvc.perform(get("/api/dashboard/activity"))
.andExpect(status().isOk()); .andExpect(status().isOk());
@@ -204,7 +204,7 @@ class DashboardControllerTest {
UUID userId = UUID.randomUUID(); UUID userId = UUID.randomUUID();
when(userService.findByEmail(any())).thenReturn( when(userService.findByEmail(any())).thenReturn(
AppUser.builder().id(userId).email("u@test.com").password("pw").build()); AppUser.builder().id(userId).email("u@test.com").password("pw").build());
when(dashboardService.getActivity(any(UUID.class), anyInt(), any(Set.class))).thenReturn(List.of()); when(dashboardService.getActivity(any(UUID.class), anyInt(), any())).thenReturn(List.of());
mockMvc.perform(get("/api/dashboard/activity").param("kinds", "COMMENT_ADDED")) mockMvc.perform(get("/api/dashboard/activity").param("kinds", "COMMENT_ADDED"))
.andExpect(status().isOk()); .andExpect(status().isOk());