diff --git a/backend/pom.xml b/backend/pom.xml index 45cb4be3..33c1483e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -103,6 +103,11 @@ org.springframework.boot spring-boot-starter-webmvc-test test + + + org.awaitility + awaitility + test diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityActorDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityActorDTO.java new file mode 100644 index 00000000..6bc095e5 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityActorDTO.java @@ -0,0 +1,10 @@ +package org.raddatz.familienarchiv.audit; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Nullable; + +public record ActivityActorDTO( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String initials, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String color, + @Nullable String name +) {} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityFeedRow.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityFeedRow.java new file mode 100644 index 00000000..384b311e --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/ActivityFeedRow.java @@ -0,0 +1,15 @@ +package org.raddatz.familienarchiv.audit; + +import java.time.Instant; +import java.util.UUID; + +public interface ActivityFeedRow { + String getKind(); + UUID getActorId(); + String getActorInitials(); + String getActorColor(); + String getActorName(); + UUID getDocumentId(); + Instant getHappenedAt(); + boolean isYouMentioned(); +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryRepository.java new file mode 100644 index 00000000..adc933d0 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryRepository.java @@ -0,0 +1,109 @@ +package org.raddatz.familienarchiv.audit; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.time.OffsetDateTime; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface AuditLogQueryRepository extends JpaRepository { + + @Query(value = """ + SELECT a.document_id + FROM audit_log a + WHERE a.kind IN ('TEXT_SAVED', 'ANNOTATION_CREATED') + AND a.actor_id = :userId + AND a.document_id IS NOT NULL + ORDER BY a.happened_at DESC + LIMIT 1 + """, nativeQuery = true) + Optional findMostRecentDocumentIdByActor(@Param("userId") UUID userId); + + @Query(value = """ + SELECT * FROM ( + SELECT DISTINCT ON (a.actor_id, a.document_id, a.kind, date_trunc('hour', a.happened_at)) + a.kind AS kind, + a.actor_id AS actorId, + CASE + WHEN u.first_name IS NOT NULL AND u.last_name IS NOT NULL + THEN UPPER(LEFT(u.first_name, 1)) || UPPER(LEFT(u.last_name, 1)) + WHEN u.first_name IS NOT NULL THEN UPPER(LEFT(u.first_name, 1)) + WHEN u.last_name IS NOT NULL THEN UPPER(LEFT(u.last_name, 1)) + ELSE '?' + END AS actorInitials, + COALESCE(u.color, '') AS actorColor, + CONCAT_WS(' ', u.first_name, u.last_name) AS actorName, + a.document_id AS documentId, + a.happened_at AS happened_at, + (a.kind = 'MENTION_CREATED' + AND a.payload->>'mentionedUserId' = :currentUserId) AS youMentioned + FROM audit_log a + LEFT JOIN users u ON u.id = a.actor_id + WHERE a.kind IN ('TEXT_SAVED','FILE_UPLOADED','ANNOTATION_CREATED','COMMENT_ADDED','MENTION_CREATED') + AND a.document_id IS NOT NULL + ORDER BY a.actor_id, a.document_id, a.kind, + date_trunc('hour', a.happened_at), a.happened_at DESC + ) deduped + ORDER BY happened_at DESC + LIMIT :limit + """, nativeQuery = true) + List findDedupedActivityFeed( + @Param("currentUserId") String currentUserId, + @Param("limit") int limit); + + @Query(value = """ + SELECT + COUNT(DISTINCT (a.document_id::text || '|' || (a.payload->>'pageNumber'))) AS pages, + COUNT(*) FILTER (WHERE a.kind = 'ANNOTATION_CREATED') AS annotated, + COUNT(DISTINCT a.payload->>'blockId') FILTER (WHERE a.kind = 'TEXT_SAVED') AS transcribed, + COUNT(DISTINCT a.document_id) FILTER (WHERE a.kind = 'FILE_UPLOADED') AS uploaded, + COUNT(DISTINCT (a.document_id::text || '|' || (a.payload->>'pageNumber'))) + FILTER (WHERE (a.kind = 'ANNOTATION_CREATED' OR a.kind = 'TEXT_SAVED') + AND a.actor_id::text = :userId) AS yourPages + FROM audit_log a + WHERE a.happened_at >= :weekStart + AND a.kind IN ('ANNOTATION_CREATED','TEXT_SAVED','FILE_UPLOADED') + """, nativeQuery = true) + PulseStatsRow getPulseStats( + @Param("weekStart") OffsetDateTime weekStart, + @Param("userId") String userId); + + @Query(value = """ + SELECT DISTINCT ON (a.document_id) + a.document_id AS documentId, + a.actor_id AS actorId + FROM audit_log a + WHERE a.kind = :kind + AND a.document_id IN :documentIds + AND a.actor_id IS NOT NULL + ORDER BY a.document_id, a.happened_at DESC + """, nativeQuery = true) + List findMostRecentActorPerDocument( + @Param("documentIds") List documentIds, + @Param("kind") String kind); + + @Query(value = """ + SELECT + a.document_id AS documentId, + CASE + WHEN u.first_name IS NOT NULL AND u.last_name IS NOT NULL + THEN UPPER(LEFT(u.first_name, 1)) || UPPER(LEFT(u.last_name, 1)) + WHEN u.first_name IS NOT NULL THEN UPPER(LEFT(u.first_name, 1)) + WHEN u.last_name IS NOT NULL THEN UPPER(LEFT(u.last_name, 1)) + ELSE '?' + END AS actorInitials, + COALESCE(u.color, '') AS actorColor, + CONCAT_WS(' ', u.first_name, u.last_name) AS actorName + FROM audit_log a + LEFT JOIN users u ON u.id = a.actor_id + WHERE a.kind IN ('ANNOTATION_CREATED', 'TEXT_SAVED', 'BLOCK_REVIEWED') + AND a.document_id IN :documentIds + AND a.actor_id IS NOT NULL + GROUP BY a.document_id, a.actor_id, u.first_name, u.last_name, u.color + ORDER BY a.document_id, MIN(a.happened_at) + """, nativeQuery = true) + List findContributorsPerDocument(@Param("documentIds") List documentIds); +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryService.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryService.java new file mode 100644 index 00000000..da887b05 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditLogQueryService.java @@ -0,0 +1,49 @@ +package org.raddatz.familienarchiv.audit; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.OffsetDateTime; +import java.util.*; + +@Service +@RequiredArgsConstructor +public class AuditLogQueryService { + + private final AuditLogQueryRepository queryRepository; + + public Optional findMostRecentDocumentForUser(UUID userId) { + return queryRepository.findMostRecentDocumentIdByActor(userId); + } + + public List findActivityFeed(UUID currentUserId, int limit) { + return queryRepository.findDedupedActivityFeed(currentUserId.toString(), limit); + } + + public PulseStatsRow getPulseStats(OffsetDateTime weekStart, UUID userId) { + return queryRepository.getPulseStats(weekStart, userId.toString()); + } + + public Map findMostRecentActorPerDocument(List documentIds, String kind) { + if (documentIds.isEmpty()) return Map.of(); + List rows = queryRepository.findMostRecentActorPerDocument(documentIds, kind); + Map result = new LinkedHashMap<>(); + for (Object[] row : rows) { + UUID docId = (UUID) row[0]; + UUID actorId = (UUID) row[1]; + result.put(docId, actorId); + } + return result; + } + + public Map> findContributorsPerDocument(List documentIds) { + if (documentIds.isEmpty()) return Map.of(); + List rows = queryRepository.findContributorsPerDocument(documentIds); + Map> result = new LinkedHashMap<>(); + for (ContributorRow row : rows) { + result.computeIfAbsent(row.getDocumentId(), k -> new ArrayList<>()) + .add(new ActivityActorDTO(row.getActorInitials(), row.getActorColor(), row.getActorName())); + } + return result; + } +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditService.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditService.java index 5f8c5a4e..0dcb6e9e 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/AuditService.java @@ -2,6 +2,8 @@ package org.raddatz.familienarchiv.audit; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.core.task.TaskExecutor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionSynchronization; @@ -16,6 +18,8 @@ import java.util.UUID; public class AuditService { private final AuditLogRepository auditLogRepository; + @Qualifier("auditExecutor") + private final TaskExecutor auditExecutor; @Async("auditExecutor") public void log(AuditKind kind, UUID actorId, UUID documentId, Map payload) { @@ -27,7 +31,10 @@ public class AuditService { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override public void afterCommit() { - writeLog(kind, actorId, documentId, payload); + // Run on a separate thread: the afterCommit() callback fires while Spring's + // transaction synchronizations are still active on the current thread, which + // prevents SimpleJpaRepository.save() from starting a new transaction inline. + auditExecutor.execute(() -> writeLog(kind, actorId, documentId, payload)); } }); } else { diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/ContributorRow.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/ContributorRow.java new file mode 100644 index 00000000..6ee5058e --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/ContributorRow.java @@ -0,0 +1,10 @@ +package org.raddatz.familienarchiv.audit; + +import java.util.UUID; + +public interface ContributorRow { + UUID getDocumentId(); + String getActorInitials(); + String getActorColor(); + String getActorName(); +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/audit/PulseStatsRow.java b/backend/src/main/java/org/raddatz/familienarchiv/audit/PulseStatsRow.java new file mode 100644 index 00000000..e374cccc --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/audit/PulseStatsRow.java @@ -0,0 +1,9 @@ +package org.raddatz.familienarchiv.audit; + +public interface PulseStatsRow { + long getPages(); + long getAnnotated(); + long getTranscribed(); + long getUploaded(); + long getYourPages(); +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/config/AsyncConfig.java b/backend/src/main/java/org/raddatz/familienarchiv/config/AsyncConfig.java index c2a2f55a..9a7caa80 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/config/AsyncConfig.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/config/AsyncConfig.java @@ -31,7 +31,10 @@ public class AsyncConfig { executor.setMaxPoolSize(2); executor.setQueueCapacity(50); executor.setThreadNamePrefix("Audit-"); - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + // AbortPolicy instead of CallerRunsPolicy: if CallerRunsPolicy ran the task on the + // afterCommit() callback thread, Spring's transaction synchronizations would still be + // active on that thread and SimpleJpaRepository.save() would throw IllegalStateException. + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy()); return executor; } } \ No newline at end of file diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java b/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java index e29e164f..bbef336d 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java @@ -17,7 +17,6 @@ import org.raddatz.familienarchiv.dto.DocumentSearchResult; import org.raddatz.familienarchiv.dto.DocumentUpdateDTO; import org.raddatz.familienarchiv.dto.TagOperator; import org.raddatz.familienarchiv.dto.DocumentVersionSummary; -import org.raddatz.familienarchiv.dto.IncompleteDocumentDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.Document; @@ -28,6 +27,7 @@ import org.raddatz.familienarchiv.model.DocumentVersion; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; +import org.raddatz.familienarchiv.security.SecurityUtils; import org.raddatz.familienarchiv.service.DocumentService; import org.raddatz.familienarchiv.service.DocumentVersionService; import org.raddatz.familienarchiv.service.FileService; @@ -197,12 +197,6 @@ public class DocumentController { return Map.of("count", documentService.getIncompleteCount()); } - @GetMapping("/incomplete") - public List getIncomplete( - @Parameter(description = "Maximum number of results") @RequestParam(defaultValue = "10") int size) { - return documentService.findIncompleteDocuments(size); - } - @GetMapping("/incomplete/next") public ResponseEntity getNextIncomplete(@RequestParam UUID excludeId) { return documentService.findNextIncompleteDocument(excludeId) @@ -210,12 +204,6 @@ public class DocumentController { .orElse(ResponseEntity.noContent().build()); } - @GetMapping("/recent-activity") - public ResponseEntity> getRecentActivity( - @RequestParam(defaultValue = "5") int size) { - return ResponseEntity.ok(documentService.getRecentActivity(size)); - } - @GetMapping("/search") public ResponseEntity search( @RequestParam(required = false) String q, @@ -286,13 +274,6 @@ public class DocumentController { } private UUID requireUserId(Authentication authentication) { - if (authentication == null || !authentication.isAuthenticated()) { - throw DomainException.unauthorized("Authentication required"); - } - AppUser user = userService.findByEmail(authentication.getName()); - if (user == null) { - throw DomainException.unauthorized("User not found"); - } - return user.getId(); + return SecurityUtils.requireUserId(authentication, userService); } } diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java b/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java index 7b36cd26..82338bc2 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java @@ -5,12 +5,11 @@ import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.dto.CreateTranscriptionBlockDTO; import org.raddatz.familienarchiv.dto.ReorderTranscriptionBlocksDTO; import org.raddatz.familienarchiv.dto.UpdateTranscriptionBlockDTO; -import org.raddatz.familienarchiv.exception.DomainException; -import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.TranscriptionBlock; import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; +import org.raddatz.familienarchiv.security.SecurityUtils; import org.raddatz.familienarchiv.service.TranscriptionService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.http.HttpStatus; @@ -100,13 +99,6 @@ public class TranscriptionBlockController { } private UUID requireUserId(Authentication authentication) { - if (authentication == null || !authentication.isAuthenticated()) { - throw DomainException.unauthorized("Authentication required"); - } - AppUser user = userService.findByEmail(authentication.getName()); - if (user == null) { - throw DomainException.unauthorized("User not found"); - } - return user.getId(); + return SecurityUtils.requireUserId(authentication, userService); } } diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/ActivityFeedItemDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/ActivityFeedItemDTO.java new file mode 100644 index 00000000..0fcdd312 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/ActivityFeedItemDTO.java @@ -0,0 +1,18 @@ +package org.raddatz.familienarchiv.dashboard; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Nullable; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; +import org.raddatz.familienarchiv.audit.AuditKind; + +import java.time.OffsetDateTime; +import java.util.UUID; + +public record ActivityFeedItemDTO( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) AuditKind kind, + @Nullable ActivityActorDTO actor, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID documentId, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String documentTitle, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) OffsetDateTime happenedAt, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) boolean youMentioned +) {} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java new file mode 100644 index 00000000..1869c2f4 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java @@ -0,0 +1,42 @@ +package org.raddatz.familienarchiv.dashboard; + +import lombok.RequiredArgsConstructor; +import org.raddatz.familienarchiv.security.Permission; +import org.raddatz.familienarchiv.security.RequirePermission; +import org.raddatz.familienarchiv.security.SecurityUtils; +import org.raddatz.familienarchiv.service.UserService; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.UUID; + +@RestController +@RequestMapping("/api/dashboard") +@RequirePermission(Permission.READ_ALL) +@RequiredArgsConstructor +public class DashboardController { + + private final DashboardService dashboardService; + private final UserService userService; + + @GetMapping("/resume") + public DashboardResumeDTO getResume(Authentication authentication) { + UUID userId = SecurityUtils.requireUserId(authentication, userService); + return dashboardService.getResume(userId); + } + + @GetMapping("/pulse") + public DashboardPulseDTO getPulse(Authentication authentication) { + UUID userId = SecurityUtils.requireUserId(authentication, userService); + return dashboardService.getPulse(userId); + } + + @GetMapping("/activity") + public List getActivity( + Authentication authentication, + @RequestParam(defaultValue = "7") int limit) { + UUID userId = SecurityUtils.requireUserId(authentication, userService); + return dashboardService.getActivity(userId, Math.min(limit, 20)); + } +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardPulseDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardPulseDTO.java new file mode 100644 index 00000000..59d9e931 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardPulseDTO.java @@ -0,0 +1,15 @@ +package org.raddatz.familienarchiv.dashboard; + +import io.swagger.v3.oas.annotations.media.Schema; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; + +import java.util.List; + +public record DashboardPulseDTO( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int pages, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int annotated, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int transcribed, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int uploaded, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int yourPages, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) List contributors +) {} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardResumeDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardResumeDTO.java new file mode 100644 index 00000000..44c04b9a --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardResumeDTO.java @@ -0,0 +1,19 @@ +package org.raddatz.familienarchiv.dashboard; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Nullable; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; + +import java.util.List; +import java.util.UUID; + +public record DashboardResumeDTO( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID documentId, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String title, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String caption, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String excerpt, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int totalBlocks, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int pct, + @Nullable String thumbnailUrl, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) List collaborators +) {} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java new file mode 100644 index 00000000..d749a164 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java @@ -0,0 +1,181 @@ +package org.raddatz.familienarchiv.dashboard; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; +import org.raddatz.familienarchiv.audit.ActivityFeedRow; +import org.raddatz.familienarchiv.audit.AuditLogQueryService; +import org.raddatz.familienarchiv.audit.PulseStatsRow; +import org.raddatz.familienarchiv.model.AppUser; +import org.raddatz.familienarchiv.model.Document; +import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.service.TranscriptionService; +import org.raddatz.familienarchiv.service.UserService; +import org.springframework.stereotype.Service; + +import java.time.DayOfWeek; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.temporal.TemporalAdjusters; +import java.util.*; +import java.util.stream.Stream; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Slf4j +public class DashboardService { + + private final AuditLogQueryService auditLogQueryService; + private final DocumentService documentService; + private final TranscriptionService transcriptionService; + private final UserService userService; + + public DashboardResumeDTO getResume(UUID userId) { + Optional docIdOpt = auditLogQueryService.findMostRecentDocumentForUser(userId); + if (docIdOpt.isEmpty()) return null; + + UUID docId = docIdOpt.get(); + Document doc; + try { + doc = documentService.getDocumentById(docId); + } catch (Exception e) { + log.warn("Resume: document {} not found for user {}", docId, userId); + return null; + } + + List blocks = transcriptionService.listBlocks(docId); + String excerpt = blocks.stream() + .filter(b -> b.getText() != null && !b.getText().isBlank()) + .min(Comparator.comparingInt(TranscriptionBlock::getSortOrder)) + .map(b -> b.getText().length() > 200 ? b.getText().substring(0, 200) + "…" : b.getText()) + .orElse(""); + + int totalBlocks = blocks.size(); + long reviewedBlocks = blocks.stream().filter(TranscriptionBlock::isReviewed).count(); + int pct = totalBlocks > 0 ? (int) (reviewedBlocks * 100L / totalBlocks) : 0; + + String caption = buildCaption(doc); + + List collaboratorIds = blocks.stream() + .map(TranscriptionBlock::getUpdatedBy) + .filter(Objects::nonNull) + .distinct() + .limit(5) + .toList(); + + List collaborators = collaboratorIds.stream() + .map(uid -> { + try { + AppUser u = userService.getById(uid); + return toActorDTO(u); + } catch (Exception e) { + return null; + } + }) + .filter(Objects::nonNull) + .toList(); + + return new DashboardResumeDTO(docId, doc.getTitle(), caption, excerpt, + totalBlocks, pct, null, collaborators); + } + + public DashboardPulseDTO getPulse(UUID userId) { + OffsetDateTime weekStart = OffsetDateTime.now(ZoneOffset.UTC) + .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) + .withHour(0).withMinute(0).withSecond(0).withNano(0); + + PulseStatsRow stats = auditLogQueryService.getPulseStats(weekStart, userId); + + List feed = auditLogQueryService.findActivityFeed(userId, 50); + List contributors = feed.stream() + .filter(r -> r.getActorId() != null) + .map(r -> new ActivityActorDTO(r.getActorInitials(), r.getActorColor(), r.getActorName())) + .filter(a -> !a.initials().isBlank()) + .distinct() + .limit(6) + .toList(); + + return new DashboardPulseDTO( + (int) stats.getPages(), + (int) stats.getAnnotated(), + (int) stats.getTranscribed(), + (int) stats.getUploaded(), + (int) stats.getYourPages(), + contributors + ); + } + + public List getActivity(UUID currentUserId, int limit) { + List rows = auditLogQueryService.findActivityFeed(currentUserId, limit); + + List docIds = rows.stream() + .map(ActivityFeedRow::getDocumentId) + .filter(Objects::nonNull) + .distinct() + .toList(); + + Map titleCache = new HashMap<>(); + try { + documentService.getDocumentsByIds(docIds) + .forEach(d -> titleCache.put(d.getId(), d.getTitle())); + } catch (Exception e) { + log.warn("Activity: failed to bulk-load document titles", e); + } + + return rows.stream().map(row -> { + ActivityActorDTO actor = row.getActorId() != null + ? new ActivityActorDTO(row.getActorInitials(), row.getActorColor(), row.getActorName()) + : null; + String docTitle = titleCache.getOrDefault(row.getDocumentId(), ""); + return new ActivityFeedItemDTO( + org.raddatz.familienarchiv.audit.AuditKind.valueOf(row.getKind()), + actor, + row.getDocumentId(), + docTitle, + row.getHappenedAt().atOffset(ZoneOffset.UTC), + row.isYouMentioned() + ); + }).toList(); + } + + private String buildCaption(Document doc) { + StringBuilder sb = new StringBuilder(); + if (doc.getSender() != null) sb.append(personName(doc.getSender())); + if (!doc.getReceivers().isEmpty()) { + String receivers = doc.getReceivers().stream() + .map(this::personName).collect(Collectors.joining(", ")); + if (!sb.isEmpty()) sb.append(" an "); + sb.append(receivers); + } + if (doc.getDocumentDate() != null) { + if (!sb.isEmpty()) sb.append(" · "); + sb.append(doc.getDocumentDate()); + } + return sb.toString(); + } + + private String personName(Person p) { + if (p == null) return ""; + if (p.getFirstName() != null && p.getLastName() != null) return p.getFirstName() + " " + p.getLastName(); + if (p.getFirstName() != null) return p.getFirstName(); + if (p.getLastName() != null) return p.getLastName(); + return ""; + } + + private ActivityActorDTO toActorDTO(AppUser u) { + String initials = ""; + if (u.getFirstName() != null && !u.getFirstName().isBlank()) + initials += u.getFirstName().charAt(0); + if (u.getLastName() != null && !u.getLastName().isBlank()) + initials += u.getLastName().charAt(0); + if (initials.isBlank() && u.getEmail() != null) + initials = u.getEmail().substring(0, 1).toUpperCase(); + String fullName = Stream.of(u.getFirstName(), u.getLastName()) + .filter(Objects::nonNull) + .collect(Collectors.joining(" ")); + return new ActivityActorDTO(initials.toUpperCase(), u.getColor(), fullName); + } +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java index 833c047b..36d63ca7 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java @@ -1,20 +1,19 @@ package org.raddatz.familienarchiv.dto; import io.swagger.v3.oas.annotations.media.Schema; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; import java.time.LocalDate; +import java.util.List; import java.util.UUID; -/** - * A single row in one of the three Mission Control Strip queues. - * Annotation/block counts drive the per-document mini progress bar - * in the Transkription column and the percentage label in Lesefertig. - */ public record TranscriptionQueueItemDTO( @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String title, LocalDate documentDate, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int annotationCount, @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int textedBlockCount, - @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int reviewedBlockCount + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int reviewedBlockCount, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) List contributors, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) boolean hasMoreContributors ) {} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java b/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java index 3ac33625..6b2b8419 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java @@ -19,6 +19,10 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; + @Entity @Table(name = "users") @Data @@ -74,6 +78,28 @@ public class AppUser { @Schema(requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createdAt; + @Column(nullable = false) + @Builder.Default + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + private String color = ""; + + private static final String[] PALETTE = { + "#7a4f9a", "#5a8a6a", "#3060b0", "#a0522d", "#c0446e", "#c17a00", "#0e7490", "#1d4ed8" + }; + + public static String computeColor(UUID id) { + return PALETTE[Math.abs(id.hashCode()) % PALETTE.length]; + } + + @PrePersist + @PreUpdate + @PostLoad + void deriveColor() { + if (id != null && (color == null || color.isEmpty())) { + this.color = computeColor(id); + } + } + public boolean hasPermission(String permission) { if (groups == null || groups.isEmpty()) { return false; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java b/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java new file mode 100644 index 00000000..dd5dceb7 --- /dev/null +++ b/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java @@ -0,0 +1,24 @@ +package org.raddatz.familienarchiv.security; + +import org.raddatz.familienarchiv.exception.DomainException; +import org.raddatz.familienarchiv.model.AppUser; +import org.raddatz.familienarchiv.service.UserService; +import org.springframework.security.core.Authentication; + +import java.util.UUID; + +public final class SecurityUtils { + + private SecurityUtils() {} + + public static UUID requireUserId(Authentication authentication, UserService userService) { + if (authentication == null || !authentication.isAuthenticated()) { + throw DomainException.unauthorized("Authentication required"); + } + AppUser user = userService.findByEmail(authentication.getName()); + if (user == null) { + throw DomainException.unauthorized("User not found"); + } + return user.getId(); + } +} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java index 0007fd5d..c27afdd9 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java @@ -484,6 +484,10 @@ public class DocumentService { return doc; } + public List getDocumentsByIds(List ids) { + return documentRepository.findAllById(ids); + } + public List getDocumentsWithoutVersions() { return documentRepository.findDocumentsWithoutVersions(); } diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java index bc0118fa..6b82abb9 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java @@ -1,6 +1,8 @@ package org.raddatz.familienarchiv.service; import lombok.RequiredArgsConstructor; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; +import org.raddatz.familienarchiv.audit.AuditLogQueryService; import org.raddatz.familienarchiv.dto.TranscriptionQueueItemDTO; import org.raddatz.familienarchiv.dto.TranscriptionWeeklyStatsDTO; import org.raddatz.familienarchiv.repository.DocumentRepository; @@ -8,38 +10,29 @@ import org.raddatz.familienarchiv.repository.TranscriptionQueueProjection; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; +import java.util.UUID; -/** - * Serves the three Mission Control Strip queues (Segmentierung / Transkription / Lesefertig) - * and the weekly activity pulse used by the column headers. - */ @Service @RequiredArgsConstructor public class TranscriptionQueueService { private static final int DEFAULT_QUEUE_SIZE = 5; + private static final int MAX_CONTRIBUTORS = 5; private final DocumentRepository documentRepository; + private final AuditLogQueryService auditLogQueryService; public List getSegmentationQueue() { - return documentRepository.findSegmentationQueue(DEFAULT_QUEUE_SIZE) - .stream() - .map(this::toDTO) - .toList(); + return enrichWithContributors(documentRepository.findSegmentationQueue(DEFAULT_QUEUE_SIZE)); } public List getTranscriptionQueue() { - return documentRepository.findTranscriptionQueue(DEFAULT_QUEUE_SIZE) - .stream() - .map(this::toDTO) - .toList(); + return enrichWithContributors(documentRepository.findTranscriptionQueue(DEFAULT_QUEUE_SIZE)); } public List getReadyToReadQueue() { - return documentRepository.findReadyToReadQueue(DEFAULT_QUEUE_SIZE) - .stream() - .map(this::toDTO) - .toList(); + return enrichWithContributors(documentRepository.findReadyToReadQueue(DEFAULT_QUEUE_SIZE)); } public TranscriptionWeeklyStatsDTO getWeeklyStats() { @@ -50,14 +43,27 @@ public class TranscriptionQueueService { ); } - private TranscriptionQueueItemDTO toDTO(TranscriptionQueueProjection p) { + private List enrichWithContributors(List projections) { + if (projections.isEmpty()) return List.of(); + List ids = projections.stream().map(TranscriptionQueueProjection::getId).toList(); + Map> contributorMap = auditLogQueryService.findContributorsPerDocument(ids); + return projections.stream() + .map(p -> toDTO(p, contributorMap.getOrDefault(p.getId(), List.of()))) + .toList(); + } + + private TranscriptionQueueItemDTO toDTO(TranscriptionQueueProjection p, List allContributors) { + boolean hasMore = allContributors.size() > MAX_CONTRIBUTORS; + List capped = hasMore ? allContributors.subList(0, MAX_CONTRIBUTORS) : allContributors; return new TranscriptionQueueItemDTO( p.getId(), p.getTitle(), p.getDocumentDate(), p.getAnnotationCount(), p.getTextedBlockCount(), - p.getReviewedBlockCount() + p.getReviewedBlockCount(), + capped, + hasMore ); } } diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java index c52cf103..01bbff54 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java @@ -142,7 +142,8 @@ public class TranscriptionService { if (!text.equals(previousText)) { Optional annotation = annotationRepository.findById(block.getAnnotationId()); int pageNumber = annotation.map(DocumentAnnotation::getPageNumber).orElse(0); - auditService.logAfterCommit(AuditKind.TEXT_SAVED, userId, documentId, Map.of("pageNumber", pageNumber)); + auditService.logAfterCommit(AuditKind.TEXT_SAVED, userId, documentId, + Map.of("pageNumber", pageNumber, "blockId", saved.getId().toString())); } Document doc = documentService.getDocumentById(documentId); diff --git a/backend/src/main/resources/db/migration/V46__add_audit_log.sql b/backend/src/main/resources/db/migration/V46__add_audit_log.sql index 2a01126a..a8d19e2e 100644 --- a/backend/src/main/resources/db/migration/V46__add_audit_log.sql +++ b/backend/src/main/resources/db/migration/V46__add_audit_log.sql @@ -6,7 +6,7 @@ CREATE TABLE audit_log ( happened_at TIMESTAMPTZ NOT NULL DEFAULT now(), -- ON DELETE SET NULL is by design: GDPR right-to-erasure. Deleted users' events -- retain their timestamp and kind but lose actor attribution. - actor_id UUID REFERENCES app_users(id) ON DELETE SET NULL, + actor_id UUID REFERENCES users(id) ON DELETE SET NULL, kind VARCHAR(50) NOT NULL, document_id UUID REFERENCES documents(id) ON DELETE CASCADE, payload JSONB @@ -19,4 +19,7 @@ CREATE INDEX idx_audit_log_kind ON audit_log (kind); -- Enforce append-only at the database layer: the application role may INSERT -- but must not UPDATE or DELETE audit rows. -REVOKE UPDATE, DELETE ON audit_log FROM app_user; +-- NOTE: This REVOKE is a no-op when the current user is the table owner. +-- PostgreSQL owners retain all privileges regardless of REVOKE. The append-only +-- guarantee is enforced at the application layer only. +REVOKE UPDATE, DELETE ON audit_log FROM CURRENT_USER; diff --git a/backend/src/main/resources/db/migration/V47__add_user_color.sql b/backend/src/main/resources/db/migration/V47__add_user_color.sql new file mode 100644 index 00000000..ac6317f7 --- /dev/null +++ b/backend/src/main/resources/db/migration/V47__add_user_color.sql @@ -0,0 +1,8 @@ +-- Add deterministic avatar color to app_users. +-- Assigned at application layer (AppUser.java) from a fixed 8-colour palette. +-- Also corrects V46's REVOKE which hardcoded 'app_user' instead of CURRENT_USER. + +ALTER TABLE users ADD COLUMN color VARCHAR(20) NOT NULL DEFAULT ''; + +-- Fix V46 append-only enforcement for the actual application role. +REVOKE UPDATE, DELETE ON audit_log FROM CURRENT_USER; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceIntegrationTest.java new file mode 100644 index 00000000..b8401d18 --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceIntegrationTest.java @@ -0,0 +1,53 @@ +package org.raddatz.familienarchiv.audit; + +import org.junit.jupiter.api.Test; +import org.raddatz.familienarchiv.PostgresContainerConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.transaction.support.TransactionTemplate; +import software.amazon.awssdk.services.s3.S3Client; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@ActiveProfiles("test") +@Import(PostgresContainerConfig.class) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) +class AuditServiceIntegrationTest { + + @MockitoBean S3Client s3Client; + @Autowired AuditService auditService; + @Autowired AuditLogRepository auditLogRepository; + @Autowired TransactionTemplate transactionTemplate; + + @Test + void logAfterCommit_writes_ANNOTATION_CREATED_row_after_transaction_commits() { + transactionTemplate.execute(status -> { + auditService.logAfterCommit(AuditKind.ANNOTATION_CREATED, null, null, null); + return null; + }); + + await().atMost(5, SECONDS).until(() -> auditLogRepository.count() > 0); + assertThat(auditLogRepository.findAll()) + .extracting(AuditLog::getKind) + .containsExactly(AuditKind.ANNOTATION_CREATED); + } + + @Test + void logAfterCommit_writes_no_row_when_transaction_rolls_back() { + try { + transactionTemplate.execute(status -> { + auditService.logAfterCommit(AuditKind.ANNOTATION_CREATED, null, null, null); + throw new RuntimeException("force rollback"); + }); + } catch (RuntimeException ignored) {} + + assertThat(auditLogRepository.count()).isZero(); + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceTest.java index 205f07eb..292d770d 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditServiceTest.java @@ -7,6 +7,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.core.task.TaskExecutor; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.*; class AuditServiceTest { @Mock AuditLogRepository auditLogRepository; + @Mock TaskExecutor auditExecutor; @InjectMocks AuditService auditService; @Test @@ -94,9 +96,7 @@ class AuditServiceTest { } @Test - void logAfterCommit_registersCallback_andSavesOnlyAfterCommit_whenTransactionIsActive() { - when(auditLogRepository.save(any())).thenAnswer(inv -> inv.getArgument(0)); - + void logAfterCommit_registersCallback_andSubmitsToExecutor_afterCommit() { try (MockedStatic mocked = mockStatic(TransactionSynchronizationManager.class)) { mocked.when(TransactionSynchronizationManager::isActualTransactionActive).thenReturn(true); @@ -106,15 +106,16 @@ class AuditServiceTest { auditService.logAfterCommit(AuditKind.TEXT_SAVED, null, null, null); - // Callback registered but repo not yet called + // Callback registered but executor not yet invoked assertThat(captured).hasSize(1); - verify(auditLogRepository, never()).save(any()); + verify(auditExecutor, never()).execute(any()); // Simulate transaction commit captured.get(0).afterCommit(); - // Now the row should be saved - verify(auditLogRepository).save(any()); + // Write submitted to executor — not called inline + verify(auditExecutor).execute(any()); + verify(auditLogRepository, never()).save(any()); } } } diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java index 36b86449..f8aaf5dd 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java @@ -3,7 +3,6 @@ package org.raddatz.familienarchiv.controller; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.dto.DocumentSearchResult; import org.raddatz.familienarchiv.dto.DocumentVersionSummary; -import org.raddatz.familienarchiv.dto.IncompleteDocumentDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.Document; @@ -390,47 +389,14 @@ class DocumentControllerTest { .andExpect(jsonPath("$.count").value(3)); } - // ─── GET /api/documents/incomplete ─────────────────────────────────────── - - @Test - void getIncomplete_returns401_whenUnauthenticated() throws Exception { - mockMvc.perform(get("/api/documents/incomplete")) - .andExpect(status().isUnauthorized()); - } + // ─── GET /api/documents/incomplete (removed — superseded by dashboard) ──── @Test @WithMockUser - void getIncomplete_returns200_withDTOList() throws Exception { - UUID id = UUID.randomUUID(); - IncompleteDocumentDTO dto = new IncompleteDocumentDTO(id, "Unvollständig"); - when(documentService.findIncompleteDocuments(anyInt())).thenReturn(List.of(dto)); - + void getIncomplete_endpointRemoved() throws Exception { + // The path hits /{id} and fails UUID conversion — not a 200 anymore mockMvc.perform(get("/api/documents/incomplete")) - .andExpect(status().isOk()) - .andExpect(jsonPath("$[0].id").value(id.toString())) - .andExpect(jsonPath("$[0].title").value("Unvollständig")); - } - - @Test - @WithMockUser - void getIncomplete_withSizeParam_passesItToService() throws Exception { - when(documentService.findIncompleteDocuments(5)).thenReturn(List.of()); - - mockMvc.perform(get("/api/documents/incomplete").param("size", "5")) - .andExpect(status().isOk()); - - verify(documentService).findIncompleteDocuments(5); - } - - @Test - @WithMockUser - void getIncomplete_usesDefaultSizeWhenNotSpecified() throws Exception { - when(documentService.findIncompleteDocuments(anyInt())).thenReturn(List.of()); - - mockMvc.perform(get("/api/documents/incomplete")) - .andExpect(status().isOk()); - - verify(documentService).findIncompleteDocuments(10); + .andExpect(status().is4xxClientError()); } // ─── GET /api/documents/incomplete/next ────────────────────────────────── @@ -467,36 +433,14 @@ class DocumentControllerTest { .andExpect(status().isNoContent()); } - // ─── GET /api/documents/recent-activity ────────────────────────────────── - - @Test - void getRecentActivity_returns401_whenUnauthenticated() throws Exception { - mockMvc.perform(get("/api/documents/recent-activity")) - .andExpect(status().isUnauthorized()); - } + // ─── GET /api/documents/recent-activity (removed — superseded by dashboard) @Test @WithMockUser - void getRecentActivity_returnsOkWithDocuments() throws Exception { - Document doc1 = Document.builder().id(UUID.randomUUID()).title("Alpha").originalFilename("a.pdf").build(); - Document doc2 = Document.builder().id(UUID.randomUUID()).title("Beta").originalFilename("b.pdf").build(); - when(documentService.getRecentActivity(5)).thenReturn(List.of(doc1, doc2)); - - mockMvc.perform(get("/api/documents/recent-activity").param("size", "5")) - .andExpect(status().isOk()) - .andExpect(jsonPath("$[0].title").value("Alpha")) - .andExpect(jsonPath("$[1].title").value("Beta")); - } - - @Test - @WithMockUser - void getRecentActivity_appliesDefaultSizeOfFive_whenSizeParamOmitted() throws Exception { - when(documentService.getRecentActivity(5)).thenReturn(List.of()); - + void getRecentActivity_endpointRemoved() throws Exception { + // The path hits /{id} and fails UUID conversion — not a 200 anymore mockMvc.perform(get("/api/documents/recent-activity")) - .andExpect(status().isOk()); - - verify(documentService).getRecentActivity(5); + .andExpect(status().is4xxClientError()); } // ─── GET /api/documents/{id}/versions ──────────────────────────────────── diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java index 8b6f9fab..183d024f 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java @@ -17,6 +17,8 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; + import java.time.LocalDate; import java.util.List; import java.util.UUID; @@ -41,7 +43,9 @@ class TranscriptionQueueControllerTest { UUID.fromString("00000000-0000-0000-0000-000000000001"), "Testbrief", LocalDate.of(1920, 6, 15), - 3, 1, 0 + 3, 1, 0, + List.of(new ActivityActorDTO("TR", "#a6dad8", "Test Raddatz")), + false ); private static final TranscriptionWeeklyStatsDTO STATS = new TranscriptionWeeklyStatsDTO(2L, 5L); diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/AuditLogQueryRepositoryIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/AuditLogQueryRepositoryIntegrationTest.java new file mode 100644 index 00000000..5875baf5 --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/AuditLogQueryRepositoryIntegrationTest.java @@ -0,0 +1,94 @@ +package org.raddatz.familienarchiv.dashboard; + +import org.junit.jupiter.api.Test; +import org.raddatz.familienarchiv.audit.ActivityFeedRow; +import org.raddatz.familienarchiv.audit.AuditLogQueryRepository; +import org.raddatz.familienarchiv.audit.ContributorRow; +import org.raddatz.familienarchiv.audit.PulseStatsRow; +import org.raddatz.familienarchiv.PostgresContainerConfig; +import org.raddatz.familienarchiv.config.FlywayConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.jdbc.Sql; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +@DataJpaTest +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) +@Import({PostgresContainerConfig.class, FlywayConfig.class}) +class AuditLogQueryRepositoryIntegrationTest { + + static final UUID USER_ID = UUID.fromString("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"); + static final UUID DOC_ID = UUID.fromString("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"); + + @Autowired AuditLogQueryRepository auditLogQueryRepository; + + @Test + @Sql(statements = { + "INSERT INTO users (id, enabled, email, password) VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', true, 'testuser@test.com', 'pw')", + "INSERT INTO documents (id, title, original_filename, status) VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Test Doc', 'test.pdf', 'PLACEHOLDER')", + "INSERT INTO audit_log (kind, actor_id, document_id) VALUES ('ANNOTATION_CREATED', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')" + }) + void findMostRecentDocumentIdByActor_returns_document_with_annotation_only_events() { + Optional result = auditLogQueryRepository.findMostRecentDocumentIdByActor(USER_ID); + + assertThat(result).contains(DOC_ID); + } + + @Test + @Sql(statements = { + "INSERT INTO users (id, enabled, email, password) VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', true, 'testuser@test.com', 'pw')", + "INSERT INTO documents (id, title, original_filename, status) VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Test Doc', 'test.pdf', 'PLACEHOLDER')", + "INSERT INTO audit_log (kind, actor_id, document_id, payload) VALUES ('ANNOTATION_CREATED', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '{\"pageNumber\":1}')" + }) + void findDedupedActivityFeed_returnsAnnotationEntry() { + List rows = auditLogQueryRepository.findDedupedActivityFeed(USER_ID.toString(), 10); + + assertThat(rows).hasSize(1); + assertThat(rows.get(0).getKind()).isEqualTo("ANNOTATION_CREATED"); + assertThat(rows.get(0).getDocumentId()).isEqualTo(DOC_ID); + assertThat(rows.get(0).getHappenedAt()).isNotNull(); + } + + @Test + @Sql(statements = { + "INSERT INTO users (id, enabled, email, password) VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', true, 'testuser@test.com', 'pw')", + "INSERT INTO documents (id, title, original_filename, status) VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Test Doc', 'test.pdf', 'PLACEHOLDER')", + "INSERT INTO audit_log (kind, actor_id, document_id, payload) VALUES ('ANNOTATION_CREATED', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '{\"pageNumber\":1}')", + "INSERT INTO audit_log (kind, actor_id, document_id, payload) VALUES ('TEXT_SAVED', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '{\"blockId\":\"ccc\",\"pageNumber\":1}')", + "INSERT INTO audit_log (kind, document_id) VALUES ('FILE_UPLOADED', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')" + }) + void getPulseStats_countsAnnotationsTranscriptionsAndUploads() { + OffsetDateTime weekStart = OffsetDateTime.now(ZoneOffset.UTC).minusDays(7); + + PulseStatsRow stats = auditLogQueryRepository.getPulseStats(weekStart, USER_ID.toString()); + + assertThat(stats.getAnnotated()).isEqualTo(1); + assertThat(stats.getTranscribed()).isEqualTo(1); + assertThat(stats.getUploaded()).isEqualTo(1); + assertThat(stats.getYourPages()).isGreaterThanOrEqualTo(1); + } + + @Test + @Sql(statements = { + "INSERT INTO users (id, enabled, email, password, first_name, last_name, color) VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', true, 'testuser@test.com', 'pw', 'Anna', 'Meier', '#f00')", + "INSERT INTO documents (id, title, original_filename, status) VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Test Doc', 'test.pdf', 'PLACEHOLDER')", + "INSERT INTO audit_log (kind, actor_id, document_id) VALUES ('ANNOTATION_CREATED', 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')" + }) + void findContributorsPerDocument_returnsContributorWithInitialsAndColor() { + List rows = auditLogQueryRepository.findContributorsPerDocument(List.of(DOC_ID)); + + assertThat(rows).hasSize(1); + assertThat(rows.get(0).getDocumentId()).isEqualTo(DOC_ID); + assertThat(rows.get(0).getActorInitials()).isEqualTo("AM"); + assertThat(rows.get(0).getActorColor()).isEqualTo("#f00"); + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java new file mode 100644 index 00000000..0f1e4922 --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java @@ -0,0 +1,143 @@ +package org.raddatz.familienarchiv.dashboard; + +import org.junit.jupiter.api.Test; +import org.raddatz.familienarchiv.config.SecurityConfig; +import org.raddatz.familienarchiv.model.AppUser; +import org.raddatz.familienarchiv.security.PermissionAspect; +import org.raddatz.familienarchiv.service.CustomUserDetailsService; +import org.raddatz.familienarchiv.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.List; +import java.util.UUID; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(DashboardController.class) +@Import({SecurityConfig.class, PermissionAspect.class, AopAutoConfiguration.class}) +class DashboardControllerTest { + + @Autowired MockMvc mockMvc; + + @MockitoBean DashboardService dashboardService; + @MockitoBean UserService userService; + @MockitoBean CustomUserDetailsService customUserDetailsService; + + // ─── Security ──────────────────────────────────────────────────────────────── + + @Test + void resume_returns401_whenUnauthenticated() throws Exception { + mockMvc.perform(get("/api/dashboard/resume")) + .andExpect(status().isUnauthorized()); + } + + @Test + @WithMockUser + void resume_returns403_whenUserHasNoPermissions() throws Exception { + mockMvc.perform(get("/api/dashboard/resume")) + .andExpect(status().isForbidden()); + } + + @Test + void pulse_returns401_whenUnauthenticated() throws Exception { + mockMvc.perform(get("/api/dashboard/pulse")) + .andExpect(status().isUnauthorized()); + } + + @Test + @WithMockUser + void pulse_returns403_whenUserHasNoPermissions() throws Exception { + mockMvc.perform(get("/api/dashboard/pulse")) + .andExpect(status().isForbidden()); + } + + // ─── GET /api/dashboard/resume ──────────────────────────────────────────── + + @Test + @WithMockUser(authorities = "READ_ALL") + void resume_returnsNull_whenNoInProgressTranscription() throws Exception { + UUID userId = UUID.randomUUID(); + when(userService.findByEmail(any())).thenReturn( + AppUser.builder().id(userId).email("u@test.com").password("pw").build()); + when(dashboardService.getResume(userId)).thenReturn(null); + + mockMvc.perform(get("/api/dashboard/resume")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$").doesNotExist()); + } + + @Test + @WithMockUser(authorities = "READ_ALL") + void resume_returnsDocument_whenUserHasInProgressTranscription() throws Exception { + UUID userId = UUID.randomUUID(); + UUID docId = UUID.randomUUID(); + when(userService.findByEmail(any())).thenReturn( + AppUser.builder().id(userId).email("u@test.com").password("pw").build()); + + DashboardResumeDTO resume = new DashboardResumeDTO(docId, "Brief an Frieda", + "Frieda an Wilhelm · 1923", "Liebe Frieda…", 4, 38, null, List.of()); + when(dashboardService.getResume(userId)).thenReturn(resume); + + mockMvc.perform(get("/api/dashboard/resume")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.documentId").value(docId.toString())) + .andExpect(jsonPath("$.pct").value(38)); + } + + // ─── GET /api/dashboard/pulse ───────────────────────────────────────────── + + @Test + @WithMockUser(authorities = "READ_ALL") + void pulse_returnsWeekStats() throws Exception { + UUID userId = UUID.randomUUID(); + when(userService.findByEmail(any())).thenReturn( + AppUser.builder().id(userId).email("u@test.com").password("pw").build()); + + DashboardPulseDTO pulse = new DashboardPulseDTO(86, 23, 9, 47, 4, List.of()); + when(dashboardService.getPulse(userId)).thenReturn(pulse); + + mockMvc.perform(get("/api/dashboard/pulse")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.pages").value(86)) + .andExpect(jsonPath("$.annotated").value(23)); + } + + @Test + void activity_returns401_whenUnauthenticated() throws Exception { + mockMvc.perform(get("/api/dashboard/activity")) + .andExpect(status().isUnauthorized()); + } + + @Test + @WithMockUser + void activity_returns403_whenUserHasNoPermissions() throws Exception { + mockMvc.perform(get("/api/dashboard/activity")) + .andExpect(status().isForbidden()); + } + + // ─── GET /api/dashboard/activity ───────────────────────────────────────── + + @Test + @WithMockUser(authorities = "READ_ALL") + void activity_returnsDeduplicated_feed() throws Exception { + UUID userId = UUID.randomUUID(); + when(userService.findByEmail(any())).thenReturn( + AppUser.builder().id(userId).email("u@test.com").password("pw").build()); + when(dashboardService.getActivity(any(UUID.class), anyInt())).thenReturn(List.of()); + + mockMvc.perform(get("/api/dashboard/activity")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$").isArray()); + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java new file mode 100644 index 00000000..c62fdb8c --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java @@ -0,0 +1,109 @@ +package org.raddatz.familienarchiv.dashboard; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.raddatz.familienarchiv.audit.ActivityFeedRow; +import org.raddatz.familienarchiv.audit.AuditLogQueryService; +import org.raddatz.familienarchiv.model.AppUser; +import org.raddatz.familienarchiv.model.Document; +import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.service.TranscriptionService; +import org.raddatz.familienarchiv.service.UserService; + +import java.time.Instant; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class DashboardServiceTest { + + @Mock AuditLogQueryService auditLogQueryService; + @Mock DocumentService documentService; + @Mock TranscriptionService transcriptionService; + @Mock UserService userService; + + @InjectMocks DashboardService dashboardService; + + // ─── toActorDTO (via getResume collaborators) ───────────────────────────── + + @Test + void getResume_collaboratorName_isNullSafe_whenFirstNameIsNull() { + UUID userId = UUID.randomUUID(); + UUID docId = UUID.randomUUID(); + UUID collaboratorId = UUID.randomUUID(); + + Document doc = Document.builder() + .id(docId).title("Brief").originalFilename("brief.pdf") + .receivers(new HashSet<>()) + .build(); + + TranscriptionBlock block = TranscriptionBlock.builder() + .id(UUID.randomUUID()).annotationId(UUID.randomUUID()) + .documentId(docId).sortOrder(1).updatedBy(collaboratorId) + .build(); + + AppUser collaborator = AppUser.builder() + .id(collaboratorId).email("s@test.com").password("pw") + .firstName(null).lastName("Schmidt").color("#abc") + .build(); + + when(auditLogQueryService.findMostRecentDocumentForUser(userId)).thenReturn(Optional.of(docId)); + when(documentService.getDocumentById(docId)).thenReturn(doc); + when(transcriptionService.listBlocks(docId)).thenReturn(List.of(block)); + when(userService.getById(collaboratorId)).thenReturn(collaborator); + + DashboardResumeDTO result = dashboardService.getResume(userId); + + assertThat(result).isNotNull(); + assertThat(result.collaborators()).hasSize(1); + assertThat(result.collaborators().get(0).name()).isEqualTo("Schmidt"); + } + + // ─── getActivity bulk-load ──────────────────────────────────────────────── + + @Test + void getActivity_loadsDocumentTitles_withoutPerRowLookup() { + UUID userId = UUID.randomUUID(); + UUID docId = UUID.randomUUID(); + + ActivityFeedRow row = mockFeedRow(docId, "ANNOTATION_CREATED"); + when(auditLogQueryService.findActivityFeed(userId, 5)).thenReturn(List.of(row, row)); + + Document doc = Document.builder() + .id(docId).title("Familienbrief").originalFilename("f.pdf") + .receivers(new HashSet<>()) + .build(); + when(documentService.getDocumentsByIds(List.of(docId))).thenReturn(List.of(doc)); + + List items = dashboardService.getActivity(userId, 5); + + assertThat(items).hasSize(2); + assertThat(items.get(0).documentTitle()).isEqualTo("Familienbrief"); + verify(documentService, never()).getDocumentById(docId); + } + + private ActivityFeedRow mockFeedRow(UUID docId, String kind) { + return new ActivityFeedRow() { + public String getKind() { return kind; } + public UUID getActorId() { return null; } + public String getActorInitials() { return ""; } + public String getActorColor() { return ""; } + public String getActorName() { return ""; } + public UUID getDocumentId() { return docId; } + public Instant getHappenedAt() { return Instant.now(); } + public boolean isYouMentioned() { return false; } + }; + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java b/backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java new file mode 100644 index 00000000..8fec24fd --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java @@ -0,0 +1,38 @@ +package org.raddatz.familienarchiv.model; + +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +class AppUserTest { + + private static final List EXPECTED_PALETTE = List.of( + "#7a4f9a", "#5a8a6a", "#3060b0", "#a0522d", "#c0446e", "#c17a00", "#0e7490", "#1d4ed8" + ); + + @Test + void computeColor_returnsDeterministicPaletteColor() { + UUID id = UUID.fromString("12345678-1234-1234-1234-123456789abc"); + String color = AppUser.computeColor(id); + assertThat(EXPECTED_PALETTE).contains(color); + assertThat(AppUser.computeColor(id)).isEqualTo(color); + } + + @Test + void computeColor_isStableAcrossCalls() { + UUID id = UUID.randomUUID(); + assertThat(AppUser.computeColor(id)).isEqualTo(AppUser.computeColor(id)); + } + + @Test + void computeColor_variesAcrossDifferentIds() { + long distinct = java.util.stream.IntStream.range(0, 100) + .mapToObj(i -> AppUser.computeColor(UUID.randomUUID())) + .distinct() + .count(); + assertThat(distinct).isGreaterThan(1); + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java b/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java new file mode 100644 index 00000000..78f0dc24 --- /dev/null +++ b/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java @@ -0,0 +1,58 @@ +package org.raddatz.familienarchiv.security; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.raddatz.familienarchiv.exception.DomainException; +import org.raddatz.familienarchiv.model.AppUser; +import org.raddatz.familienarchiv.service.UserService; +import org.springframework.security.core.Authentication; + +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class SecurityUtilsTest { + + @Mock Authentication authentication; + @Mock UserService userService; + + @Test + void requireUserId_throwsUnauthorized_whenAuthenticationIsNull() { + assertThatThrownBy(() -> SecurityUtils.requireUserId(null, userService)) + .isInstanceOf(DomainException.class); + } + + @Test + void requireUserId_throwsUnauthorized_whenNotAuthenticated() { + when(authentication.isAuthenticated()).thenReturn(false); + assertThatThrownBy(() -> SecurityUtils.requireUserId(authentication, userService)) + .isInstanceOf(DomainException.class); + } + + @Test + void requireUserId_throwsUnauthorized_whenUserNotFound() { + when(authentication.isAuthenticated()).thenReturn(true); + when(authentication.getName()).thenReturn("ghost@example.com"); + when(userService.findByEmail("ghost@example.com")).thenReturn(null); + assertThatThrownBy(() -> SecurityUtils.requireUserId(authentication, userService)) + .isInstanceOf(DomainException.class); + } + + @Test + void requireUserId_returnsUserId_whenAuthenticated() { + UUID userId = UUID.randomUUID(); + AppUser user = AppUser.builder().id(userId).email("user@example.com").password("pw").build(); + when(authentication.isAuthenticated()).thenReturn(true); + when(authentication.getName()).thenReturn("user@example.com"); + when(userService.findByEmail("user@example.com")).thenReturn(user); + + UUID result = SecurityUtils.requireUserId(authentication, userService); + + assertThat(result).isEqualTo(userId); + } +} diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java index 0a76114b..6c7a47ac 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java @@ -1,10 +1,13 @@ package org.raddatz.familienarchiv.service; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.raddatz.familienarchiv.audit.ActivityActorDTO; +import org.raddatz.familienarchiv.audit.AuditLogQueryService; import org.raddatz.familienarchiv.dto.TranscriptionQueueItemDTO; import org.raddatz.familienarchiv.dto.TranscriptionWeeklyStatsDTO; import org.raddatz.familienarchiv.repository.DocumentRepository; @@ -13,17 +16,25 @@ import org.raddatz.familienarchiv.repository.TranscriptionWeeklyStatsProjection; import java.time.LocalDate; import java.util.List; +import java.util.Map; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) class TranscriptionQueueServiceTest { @Mock DocumentRepository documentRepository; + @Mock AuditLogQueryService auditLogQueryService; @InjectMocks TranscriptionQueueService service; + @BeforeEach + void stubContributors() { + lenient().when(auditLogQueryService.findContributorsPerDocument(any())).thenReturn(Map.of()); + } + // ─── getSegmentationQueue ───────────────────────────────────────────────── @Test @@ -42,6 +53,38 @@ class TranscriptionQueueServiceTest { assertThat(result.get(0).annotationCount()).isEqualTo(0); } + @Test + void getSegmentationQueue_returnsEmptyList_whenQueueIsEmpty() { + when(documentRepository.findSegmentationQueue(5)).thenReturn(List.of()); + + List result = service.getSegmentationQueue(); + + assertThat(result).isEmpty(); + verifyNoInteractions(auditLogQueryService); + } + + @Test + void getSegmentationQueue_returnsAllFive_andHasMoreFalse_whenExactlyFiveContributors() { + UUID docId = UUID.randomUUID(); + TranscriptionQueueProjection proj = mockQueueProjection(docId, "Brief", null, 0, 0, 0); + when(documentRepository.findSegmentationQueue(5)).thenReturn(List.of(proj)); + + List fiveActors = List.of( + new ActivityActorDTO("A1", "#111", "Alice One"), + new ActivityActorDTO("A2", "#222", "Alice Two"), + new ActivityActorDTO("A3", "#333", "Alice Three"), + new ActivityActorDTO("A4", "#444", "Alice Four"), + new ActivityActorDTO("A5", "#555", "Alice Five") + ); + when(auditLogQueryService.findContributorsPerDocument(List.of(docId))) + .thenReturn(Map.of(docId, fiveActors)); + + List result = service.getSegmentationQueue(); + + assertThat(result.get(0).contributors()).hasSize(5); + assertThat(result.get(0).hasMoreContributors()).isFalse(); + } + @Test void getSegmentationQueue_mapsDocumentDateWhenPresent() { LocalDate date = LocalDate.of(1920, 6, 15); @@ -108,6 +151,47 @@ class TranscriptionQueueServiceTest { assertThat(result.transcriptionCount()).isEqualTo(0L); } + // ─── contributors ──────────────────────────────────────────────────────── + + @Test + void getSegmentationQueue_includesContributors_whenAuditDataPresent() { + UUID docId = UUID.randomUUID(); + TranscriptionQueueProjection proj = mockQueueProjection(docId, "Brief", null, 0, 0, 0); + when(documentRepository.findSegmentationQueue(5)).thenReturn(List.of(proj)); + + ActivityActorDTO actor = new ActivityActorDTO("MR", "#a6dad8", "Max Raddatz"); + when(auditLogQueryService.findContributorsPerDocument(List.of(docId))) + .thenReturn(Map.of(docId, List.of(actor))); + + List result = service.getSegmentationQueue(); + + assertThat(result.get(0).contributors()).containsExactly(actor); + assertThat(result.get(0).hasMoreContributors()).isFalse(); + } + + @Test + void getSegmentationQueue_capsContributorsAtFive_andSetsHasMoreFlag() { + UUID docId = UUID.randomUUID(); + TranscriptionQueueProjection proj = mockQueueProjection(docId, "Brief", null, 0, 0, 0); + when(documentRepository.findSegmentationQueue(5)).thenReturn(List.of(proj)); + + List sixActors = List.of( + new ActivityActorDTO("A1", "#111", "Alice One"), + new ActivityActorDTO("A2", "#222", "Alice Two"), + new ActivityActorDTO("A3", "#333", "Alice Three"), + new ActivityActorDTO("A4", "#444", "Alice Four"), + new ActivityActorDTO("A5", "#555", "Alice Five"), + new ActivityActorDTO("A6", "#666", "Alice Six") + ); + when(auditLogQueryService.findContributorsPerDocument(List.of(docId))) + .thenReturn(Map.of(docId, sixActors)); + + List result = service.getSegmentationQueue(); + + assertThat(result.get(0).contributors()).hasSize(5); + assertThat(result.get(0).hasMoreContributors()).isTrue(); + } + // ─── helpers ───────────────────────────────────────────────────────────── private TranscriptionQueueProjection mockQueueProjection( diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java index e9d415a8..65584fe7 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java @@ -487,6 +487,7 @@ class TranscriptionServiceTest { org.mockito.ArgumentMatchers.eq(docId), payloadCaptor.capture()); assertThat(payloadCaptor.getValue()).containsEntry("pageNumber", 3); + assertThat(payloadCaptor.getValue()).containsEntry("blockId", blockId.toString()); } @Test diff --git a/docs/specs/documents-page-spec.html b/docs/specs/documents-page-spec.html new file mode 100644 index 00000000..f69e2ef1 --- /dev/null +++ b/docs/specs/documents-page-spec.html @@ -0,0 +1,665 @@ + + + + + +Dokumente-Seite — Design Spec + + + +
+ + +
+
+ Neue Route + Frontend + Backend +
+

Dokumente-Seite — /documents

+

+ Dedicated search and browse page for all documents. Separates the document list from the dashboard hub. Uses per-year group cards with flat divide-y rows, a horizontal split row (content left · metadata right), a circular progress ring, and contributor avatars. +

+
Spec · Leonie Voss · 2026-04-19 · Issue TBD
+
+ +
+

Design decisions

+

The hub (/) becomes pure dashboard — no more dual-mode switching. The "Documents" nav tab points to /documents, a focused search/browse page.

+

Row layout: two-column split — title and snippet occupy the full left column for maximum scan width; date, sender, receiver, archive location, progress ring and contributor avatars live in a fixed 240px right panel. This keeps metadata consistently positioned across all rows.

+

List structure: one white card container per year group (matching the current border border-line bg-surface shadow-sm pattern), rows separated by divide-y dividers — no gaps, no individual row cards. The year label is an inset header row within each card.

+

Progress ring shows work completion as a percentage (0–100%). It is driven by a new completionPercentage field on the search result DTO, computed server-side from annotation block counts. Contributor avatars require a new contributors array (initials + color) on the search DTO.

+
+ +
+ + +
+
Section 1
+
Full page mockup — filter panel open, search active
+
Scaled at ~56%. Desktop 1200px concept width.
+ +
+ +
+ +
+ Documents + Persons + Letters + Admin +
+
Hochlader
MR
+
+ +
+
+ + brief +
+ 31 Dokumente +
+ New Document
+
+ +
+ 31 documents + Sort +
Date ↓
+
+ + Filters 1 +
+
+ +
+
+ Date range +
From
To
+
+
+ Sender +
Search person…
+
+
+ Receiver +
Search person…
+
+
+ Tags + BriefFotoPostkarteUrkunde +
+
+ +
+ + +
+
1924
+
+
+
Demo: Ierlicher Brief — Belgern
+
… Hiermit übersende ich Ihnen den gewünschten Brief meines Vaters, welcher einige interessante Hinweise zur Familiengeschichte enthält …
+
Brief
Familie
+
+
+
+
Date 31. Mai 1924
+
From Louise Aon Boden
+
To Marcel Raddatz
+
Archive Box 3 · Folder A
+
+
+
+ +
100%
+
+
MR
LS
+
+
+
+
+ + +
+
1923
+
+
+
W-0614 – 8. September 1923 – Tölz
+
… Clara schreibt über die Ankunft in Tölz und erwähnt den letzten Brief von Fauld Rupley, der noch keine Antwort erhalten hat …
+
Brief
+
+
+
+
Date 8. Sept. 1923
+
From Clara Lam
+
To Fauld Rupley
+
Archive Box 1 · Folder C
+
+
+
+ +
75%
+
+
AK
+
+
+
+
+
+
W-0196 – 2. September 1923 – B. Lichterfelde
+
… Prediger's Haushaltung enthält einen Brief; Zusammen mit der Vollmacht aus dem Vorjahr ergibt sich folgendes Bild …
+
Brief
+
+
+
+
Date 2. Sept. 1923
+
From Müller de Gruym
+
To Herbert Cram
+
+
+
+ +
40%
+
+
MR
LS
AK
+
+
+
+
+
+
W-0397 – 2. September 1923 – B. Lichterfelde
+
… zum einleitend Kommentar hieraus, den Herrn, zum Brief az sechzig und weitere Passagen …
+
Brief
+
+
+
+
Date 2. Sept. 1923
+
From Müller de Gruym
+
+
+
+ +
0%
+
+ No contributors +
+
+
+
+ +
+
+ Fig 1 — /documents · 1200px · search: "brief" · filter panel open · sort: Date ↓ +
+ +
+ + +
+
Section 2
+
Page structure & zones
+ +
+
+

① Global search bar

+

Full-width row below the topbar. Contains the search input (flex-1), result count (right of input), and "+ New Document" button. Background white, bottom border border-line. Sticky — stays visible on scroll.

+

Same search bar pattern as the current homepage. Debounce 500 ms on text input; immediate on clear.

+
+
+

② Sort / count bar

+

Slim bar below search. Shows result count (left), sort dropdown (right), and Filters toggle button (far right). Background white, bottom border border-line. Sticky — stacks below search bar on scroll.

+

Filters button shows a mint badge with active filter count. When filters are open the button fills navy.

+
+
+

③ Collapsible filter panel

+

Drops open below the sort bar. Contains four groups: Date range (two inputs), Sender (PersonTypeahead), Receiver (PersonTypeahead), Tags (clickable pills). White background, bottom border border-line.

+

Closed by default on page load unless URL already has active filter params. Animate open/close with transition-all duration-200.

+
+
+ +
+
Routing: New route frontend/src/routes/documents/+page.svelte and +page.server.ts. AppNav "Documents" tab href changes from / to /documents. Homepage +page.svelte loses dual-mode — always renders dashboard. No redirect from /?q=….
+
+
+ +
+ + +
+
Section 2b
+
Mobile breakpoints
+
Three responsive tiers: <sm (mobile), sm–lg (tablet), lg+ (desktop).
+ +
+
+

< sm — < 640px (mobile)

+

Document row: single-column block. Left/right split collapses. Metadata (date, from, to, archive) moves below the tags row as a 2×2 compact grid. Progress ring and contributor stack appear in a bottom row directly below the grid.

+

Filter panel: single-column stack (flex-col). Sort bar wraps if needed.

+
+
+

sm – lg — 640–1023px

+

Document row: two-column split restored. Metadata column narrower: sm:w-48 (192px) instead of w-60 to fit tablet viewports.

+

Sticky bars span full width via negative margins. Filter panel: flex-row flex-wrap, groups can wrap.

+
+
+

lg+ — ≥ 1024px (desktop)

+

Full two-column split. Metadata column: lg:w-60 (240px). Filter panel: four groups in a single row. Max content width max-w-7xl (1280px) — from app layout container, no extra padding on list body.

+
+
+ + +
+
+
+
+ +
+ Dokumente +
MR
+
+
+
+
+ + brief +
+ 31 Dok. +
+
+ 31 documents + Sort +
Date ↓
+
Filters
+
+
+
+
1924
+ +
+
Demo: Ierlicher Brief — Belgern
+
… Hiermit übersende ich Ihnen den gewünschten Brief …
+
Brief
+
+
Date 31. Mai 1924
+
From L. von Boden
+
Archive Box 3 · A
+
To M. Raddatz
+
+
+
+ +
100%
+
+
MR
LS
+
+
+ +
+
W-0614 – Sept. 1923 – Tölz
+
… Clara schreibt über den letzten Brief von Fauld Rupley …
+
Brief
+
+
Date 8. Sept. 1923
+
From Clara Lam
+
+
To F. Rupley
+
+
+
+ +
75%
+
+
AK
+
+
+
+
+
+ Fig 2 — /documents · 375px mobile · search "brief" · filter closed +
+ +
+

Mobile row — CSS-only approach

+

No JS needed. The <a> link is always block. On sm+ the inner element switches to flex items-stretch, showing the right metadata column (hidden sm:flex) and hiding the mobile compact grid (sm:hidden).

+

This means the DOM contains both layouts simultaneously — the metadata grid inside the left column (mobile only) and the right metadata panel (sm+ only). Both share the same data, just rendered differently.

+

Minimum touch target: the entire row is the <a>, guaranteed ≥44px on mobile given title + snippet + tags + metadata grid.

+
+
+
+ +
+ + +
+
Section 3
+
Year group card
+
One card per year group. Rows inside use divide-y — no gaps between rows.
+ +
+
+

Card container

+

Matches current DocumentList outer container exactly: border border-line bg-surface shadow-sm. No border-radius (keeps it flush). Margin between consecutive year cards: mb-4.

+

Rendered only when sort = DATE. For other sort modes (SENDER, RECEIVER, TITLE) the year header is replaced by the relevant group label using the same card pattern.

+
+
+

Year header row

+

First child of each card. Background bg-sand, text text-xs font-bold uppercase tracking-widest text-ink-3. Height py-1.5 px-5. Bottom border border-b border-line.

+

Not a standalone divider — it is part of the card so the top border of the card frames the year label on three sides.

+
+
+
+ +
+ + +
+
Section 4
+
Document row — two-column split
+ +
+
+

Left column — content

+

Flex-1, min-width 0. Padding p-4 pr-5. Right border border-r border-line-2.

+

Title — font-serif text-base font-bold text-ink with search highlight underlines. mb-1.5.

+

Snippet — font-serif text-sm italic text-ink-2 line-clamp-2 mb-2 with highlight underlines. Only rendered when a match snippet is present.

+

Tags — existing tag pill pattern bg-muted text-ink text-[10px] font-bold uppercase tracking-widest rounded px-2 py-0.5. Gap gap-1.5 flex-wrap.

+
+
+

Right column — metadata panel

+

Fixed width w-60 (240px). Padding p-3.5. Flex column, justify-between.

+

Meta lines (top group) — font-sans text-[11px] text-ink-2 mb-1. Label: font-bold uppercase tracking-wide text-[10px] text-ink-3 mr-1.5. Lines: Date · From · To · Archive (Box · Folder). Archive only rendered when archiveBox is set.

+

Bottom row — flexbox, space-between. Left: progress ring. Right: ContributorStack.

+
+
+ +
+
Accessibility: The ring conveys progress by both percentage text and arc fill — not colour alone. Contributors show initials as text inside the avatar. Both pass the redundant-cue requirement from the Leonie Voss persona. Minimum touch target for the row link: the full row is the <a> element, always ≥44px tall given the content. Row hover: hover:bg-muted/50 transition-colors duration-200.
+
+
+ +
+ + +
+
Section 5
+
Progress ring
+ +
+
+

Anatomy

+

SVG donut ring, 36×36px. Track circle: stroke="#E4E2D7" (stroke-brand-sand) width 3px. Fill arc: stroke="#A6DAD8" (stroke-accent) width 3px, stroke-linecap="round". Rotated −90° so arc starts at 12 o'clock.

+

Centre label: percentage text font-sans text-[8px] font-bold. Colour: mint (text-accent-dark) when >0%, gray-400 when 0%.

+

Circumference of r=13: 2π×13 ≈ 81.7px. Stroke-dasharray: {pct * 81.7} 81.7.

+
+
+

Data source — new API field

+

New field completionPercentage: number (0–100, integer) on the document search result DTO. Computed server-side:

+

round((reviewedBlocks / max(totalBlocks, 1)) * 100)

+

If a document has no annotation blocks yet (no transcription started), returns 0. Backend change: new subquery in the document search repository to COUNT annotation blocks (all vs. reviewed) per document, joined into the search projection.

+
+
+
+ +
+ + +
+
Section 6
+
Contributor avatar stack
+ +
+
+

Anatomy

+

Reuse existing ContributorStack.svelte component (added in commit 031f6ea). Avatars 22×22px, -ml-1.5 overlap, white 2px border.

+

Show max 3 avatars. If more: +N text element in gray-400. When no contributors: render text-[9px] text-ink-3 uppercase tracking-wide label "No contributors".

+
+
+

Data source — new API field

+

New field contributors: ActivityActorDTO[] on the document search result DTO. ActivityActorDTO already exists (used in dashboard queue items): { initials: string, color: string, name?: string }.

+

Backend: join from document → annotation_blocks → created_by → users. Distinct by user. Order by most-recent contribution. Limit 4. New query in document search repository.

+
+
+
+ +
+ + +
+
Section 7
+
Backend changes required
+ +
+
New fields on document search DTO — Two new fields must be added to the object returned by GET /api/documents/search. These require a new projection or join in the repository layer. No schema migration needed — purely computed from existing annotation_block data.
+
+ +
+ + + + + + + + +
FieldTypeSourceNotes
completionPercentageint (0–100)COUNT(reviewed annotation blocks) / COUNT(all blocks)0 when no blocks exist
contributorsActivityActorDTO[]Distinct users with annotation_block contributions, ordered by recencyMax 4; reuse existing DTO
archiveBoxString?Already on Document entity — just not in search responseExpose existing field
archiveFolderString?Already on Document entity — just not in search responseExpose existing field
+
+
+ +
+ + +
+
Section 8 — Implementation Reference
+
Exact Tailwind classes & pixel values
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ElementTailwind classesPixels / valueNotes
Page chrome
Search bar wrapperbg-white border-b border-line -mx-4 sm:-mx-6 lg:-mx-8 px-4 sm:px-6 lg:px-8 py-3.5 flex items-center gap-3 sticky top-[65px] z-20padding 14px responsiveTopbar = 1px accent + 64px nav = 65px. Negative margins break out of container padding so bar spans full container width.
Search inputflex-1 h-9 border border-ink rounded-sm px-3 font-sans text-sm text-ink bg-whiteheight 36pxActive: navy border
Sort bar wrapperbg-white border-b border-line -mx-4 sm:-mx-6 lg:-mx-8 px-4 sm:px-6 lg:px-8 py-2.5 flex items-center gap-3 sticky top-[113px] z-20padding 10px responsiveStacks below search bar (65 + 48 = 113px)
Filters toggle (closed)h-7 px-3 border border-line rounded-sm font-sans text-[10px] font-bold uppercase tracking-wide text-ink flex items-center gap-1.5height 28px—
Filters toggle (open)h-7 px-3 bg-ink text-white rounded-sm font-sans text-[10px] font-bold uppercase tracking-wide flex items-center gap-1.5height 28pxNavy fill when active
Filter panel wrapperbg-white border-b border-line -mx-4 sm:-mx-6 lg:-mx-8 px-4 sm:px-6 lg:px-8 py-4 flex flex-col sm:flex-row sm:flex-wrap gap-4padding 16px responsiveUse Svelte slide transition; stacks vertically on mobile
List bodypy-5vertical padding onlyNo extra horizontal padding — app container handles it
Year group card
Card containerborder border-line bg-surface shadow-sm mb-4 overflow-hidden—Matches current DocumentList outer div exactly
Year headerbg-sand border-b border-line px-5 py-1.5 font-sans text-[10px] font-bold uppercase tracking-widest text-ink-3padding 6px 20px—
Row listdivide-y divide-line-2—Matches current <ul> pattern
Document row
Row wrapper <li>group transition-colors duration-200 hover:bg-muted/50—Same hover pattern as current
Row inner (link)block sm:flex sm:items-stretch—Full-row <a href="/documents/{id}">; flex only on sm+
Left columnp-4 sm:flex-1 sm:min-w-0 sm:pr-5 sm:border-r sm:border-line-2padding 16pxRight border only on sm+
Right column (sm+)hidden sm:flex sm:w-48 lg:w-60 flex-shrink-0 p-3.5 flex-col justify-between gap-2sm: 192px · lg: 240pxHidden on mobile; narrower on tablet
Mobile metadata gridsm:hidden border-t border-line-2 mt-3 pt-3 grid grid-cols-2 gap-x-4 gap-y-0.5—2×2 compact grid shown only on mobile, inside left col
Mobile meta bottom rowsm:hidden flex items-center justify-between mt-3—Ring + contributors on mobile, shown only <sm
Document titlefont-serif text-base font-bold text-ink mb-1.5 leading-snug group-hover:underline16px / 700—
Snippet textfont-serif text-sm italic text-ink-2 line-clamp-2 mb-214pxOnly when snippet present
Meta labelfont-sans text-[10px] font-bold uppercase tracking-wide text-ink-3 mr-1.510px / 700DATE · FROM · TO · ARCHIVE
Meta valuefont-sans text-[11px] text-ink-211px—
Progress ring
SVG containerrelative w-9 h-9 flex-shrink-036×36px—
Track circlestroke="var(--c-sand)" stroke-width="3"r=13, circumference 81.7px—
Fill arcstroke="var(--c-accent)" stroke-width="3" stroke-linecap="round"dasharray = pct/100 × 81.7rotate(−90deg)
Percentage labelabsolute inset-0 flex items-center justify-center font-sans text-[8px] font-bold8px / 800Mint when >0, gray-400 when 0
New files
NEW frontend/src/routes/documents/+page.svelte——Document list page (extract from homepage)
NEW frontend/src/routes/documents/+page.server.ts——Loads search results, same API call as current homepage
CHANGED frontend/src/routes/AppNav.svelte——Documents tab href: / → /documents
CHANGED frontend/src/routes/+page.svelte——Remove dual-mode logic; always render dashboard
CHANGED frontend/src/routes/+page.server.ts——Remove search branch; always fetch dashboard data
CHANGED frontend/src/routes/DocumentList.svelte——Refactor to new two-column layout + year cards
NEW query backend/.../DocumentSearchRepository——Add completionPercentage + contributors to search projection
+
+
+ +
+ + diff --git a/frontend/messages/de.json b/frontend/messages/de.json index 920886a2..31a922f5 100644 --- a/frontend/messages/de.json +++ b/frontend/messages/de.json @@ -363,6 +363,7 @@ "doc_panel_discussion_annotation_tab": "Annotation · Seite {page}", "pdf_annotations_show": "Annotierungen anzeigen", "pdf_annotations_hide": "Annotierungen verbergen", + "upload_action": "Hochladen", "upload_drop_hint": "Einzeln oder mehrere Dateien auf einmal hochladen", "upload_accepted_types": "PDF, JPEG, PNG, TIFF", "upload_filename_hint": "Tipp: 2024-03-15_Mueller_Hans.pdf → Datum und Absender werden vorausgefüllt", @@ -706,5 +707,47 @@ "admin_new_invite_expires": "Ablaufdatum (optional)", "admin_invite_created_title": "Einladung erstellt", "admin_invite_created_desc": "Teile diesen Link mit der einzuladenden Person:", - "admin_invite_revoke_confirm": "Einladung wirklich widerrufen?" + "admin_invite_revoke_confirm": "Einladung wirklich widerrufen?", + + "greeting_morning": "Guten Morgen, {name}.", + "greeting_day": "Hallo, {name}.", + "greeting_evening": "Guten Abend, {name}.", + + "dashboard_resume_label": "Weiter, wo du aufgehört hast", + "dashboard_blocks": "{count} Abschnitte", + "dashboard_resume_cta": "Weitertranskribieren", + "dashboard_resume_other": "oder anderen Brief wählen", + "dashboard_empty_title": "Noch kein Dokument begonnen", + "dashboard_empty_body": "Wähle ein Dokument aus dem Archiv, um mit der Transkription zu beginnen.", + "dashboard_empty_cta": "Zum Archiv", + + "dashboard_mission_caption": "Offene Aufgaben", + "queue_segment": "Segmentieren", + "queue_segment_blurb": "Seiten aufteilen", + "queue_transcribe": "Transkribieren", + "queue_transcribe_blurb": "Text erfassen", + "queue_review": "Prüfen", + "queue_review_blurb": "Texte kontrollieren", + "queue_n_open": "{n} offen", + "queue_show_all": "Alle anzeigen →", + + "pulse_eyebrow": "Diese Woche", + "pulse_headline": "Ihr habt {pages} Seiten bearbeitet.", + "pulse_you": "Du selbst hast {pages} davon bearbeitet.", + "pulse_contributors": "Mitwirkende", + "pulse_transcribed": "Textstellen markiert", + "pulse_reviewed": "Textstellen transkribiert", + "pulse_uploaded": "Dokumente hochgeladen", + + "feed_caption": "Kommentare & Aktivität", + "feed_show_all": "Alle anzeigen", + "feed_for_you": "für dich", + + "audit_action_text_saved": "hat Text gespeichert in", + "audit_action_file_uploaded": "hat eine Datei hochgeladen:", + "audit_action_annotation_created": "hat eine Markierung erstellt in", + "audit_action_comment_added": "hat kommentiert:", + "audit_action_mention_created": "hat dich erwähnt in", + + "dropzone_release": "Loslassen zum Hochladen" } diff --git a/frontend/messages/en.json b/frontend/messages/en.json index 18fda68a..c594b6e0 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -363,6 +363,7 @@ "doc_panel_discussion_annotation_tab": "Annotation · Page {page}", "pdf_annotations_show": "Show annotations", "pdf_annotations_hide": "Hide annotations", + "upload_action": "Upload", "upload_drop_hint": "Drop one or multiple files at once", "upload_accepted_types": "PDF, JPEG, PNG, TIFF", "upload_filename_hint": "Tip: 2024-03-15_Mueller_Hans.pdf → date and sender pre-filled", @@ -706,5 +707,47 @@ "admin_new_invite_expires": "Expiry date (optional)", "admin_invite_created_title": "Invite created", "admin_invite_created_desc": "Share this link with the person you are inviting:", - "admin_invite_revoke_confirm": "Really revoke this invite?" + "admin_invite_revoke_confirm": "Really revoke this invite?", + + "greeting_morning": "Good morning, {name}.", + "greeting_day": "Hello, {name}.", + "greeting_evening": "Good evening, {name}.", + + "dashboard_resume_label": "Continue where you left off", + "dashboard_blocks": "{count} sections", + "dashboard_resume_cta": "Continue transcribing", + "dashboard_resume_other": "or choose another document", + "dashboard_empty_title": "No document started yet", + "dashboard_empty_body": "Choose a document from the archive to start transcribing.", + "dashboard_empty_cta": "To the archive", + + "dashboard_mission_caption": "Open tasks", + "queue_segment": "Segment", + "queue_segment_blurb": "Split pages", + "queue_transcribe": "Transcribe", + "queue_transcribe_blurb": "Capture text", + "queue_review": "Review", + "queue_review_blurb": "Check texts", + "queue_n_open": "{n} open", + "queue_show_all": "Show all →", + + "pulse_eyebrow": "This week", + "pulse_headline": "You have worked on {pages} pages.", + "pulse_you": "You personally worked on {pages} of them.", + "pulse_contributors": "Contributors", + "pulse_transcribed": "Passages annotated", + "pulse_reviewed": "Passages transcribed", + "pulse_uploaded": "Documents uploaded", + + "feed_caption": "Comments & activity", + "feed_show_all": "Show all", + "feed_for_you": "for you", + + "audit_action_text_saved": "saved text in", + "audit_action_file_uploaded": "uploaded a file:", + "audit_action_annotation_created": "created an annotation in", + "audit_action_comment_added": "commented:", + "audit_action_mention_created": "mentioned you in", + + "dropzone_release": "Release to upload" } diff --git a/frontend/messages/es.json b/frontend/messages/es.json index 1e59d1c6..3195c2a9 100644 --- a/frontend/messages/es.json +++ b/frontend/messages/es.json @@ -363,6 +363,7 @@ "doc_panel_discussion_annotation_tab": "Anotación · Página {page}", "pdf_annotations_show": "Mostrar anotaciones", "pdf_annotations_hide": "Ocultar anotaciones", + "upload_action": "Subir", "upload_drop_hint": "Uno o varios archivos a la vez", "upload_accepted_types": "PDF, JPEG, PNG, TIFF", "upload_filename_hint": "Consejo: 2024-03-15_Mueller_Hans.pdf → fecha y remitente prellenados", @@ -706,5 +707,47 @@ "admin_new_invite_expires": "Fecha de vencimiento (opcional)", "admin_invite_created_title": "Invitación creada", "admin_invite_created_desc": "Comparte este enlace con la persona invitada:", - "admin_invite_revoke_confirm": "¿Realmente revocar esta invitación?" + "admin_invite_revoke_confirm": "¿Realmente revocar esta invitación?", + + "greeting_morning": "Buenos días, {name}.", + "greeting_day": "Hola, {name}.", + "greeting_evening": "Buenas noches, {name}.", + + "dashboard_resume_label": "Continuar donde lo dejaste", + "dashboard_blocks": "{count} secciones", + "dashboard_resume_cta": "Continuar transcripción", + "dashboard_resume_other": "o elige otro documento", + "dashboard_empty_title": "Aún no has comenzado ningún documento", + "dashboard_empty_body": "Elige un documento del archivo para empezar a transcribir.", + "dashboard_empty_cta": "Al archivo", + + "dashboard_mission_caption": "Tareas pendientes", + "queue_segment": "Segmentar", + "queue_segment_blurb": "Dividir páginas", + "queue_transcribe": "Transcribir", + "queue_transcribe_blurb": "Capturar texto", + "queue_review": "Revisar", + "queue_review_blurb": "Controlar textos", + "queue_n_open": "{n} pendiente", + "queue_show_all": "Ver todo →", + + "pulse_eyebrow": "Esta semana", + "pulse_headline": "Habéis trabajado {pages} páginas.", + "pulse_you": "Tú mismo has trabajado {pages} de ellas.", + "pulse_contributors": "Colaboradores", + "pulse_transcribed": "Fragmentos anotados", + "pulse_reviewed": "Fragmentos transcritos", + "pulse_uploaded": "Documentos subidos", + + "feed_caption": "Comentarios y actividad", + "feed_show_all": "Ver todo", + "feed_for_you": "para ti", + + "audit_action_text_saved": "guardó texto en", + "audit_action_file_uploaded": "subió un archivo:", + "audit_action_annotation_created": "creó una anotación en", + "audit_action_comment_added": "comentó:", + "audit_action_mention_created": "te mencionó en", + + "dropzone_release": "Suelta para subir" } diff --git a/frontend/src/lib/components/ContributorStack.svelte b/frontend/src/lib/components/ContributorStack.svelte new file mode 100644 index 00000000..fc627627 --- /dev/null +++ b/frontend/src/lib/components/ContributorStack.svelte @@ -0,0 +1,42 @@ + + +{#if safeContributors.length === 0} + +{:else} + + {#each safeContributors as actor, i (actor.initials + '-' + actor.color)} + + {actor.initials} + + {/each} + {#if hasMore} + + … + + {/if} + +{/if} diff --git a/frontend/src/lib/components/ContributorStack.svelte.spec.ts b/frontend/src/lib/components/ContributorStack.svelte.spec.ts new file mode 100644 index 00000000..877167cd --- /dev/null +++ b/frontend/src/lib/components/ContributorStack.svelte.spec.ts @@ -0,0 +1,50 @@ +import { describe, it, expect, afterEach } from 'vitest'; +import { cleanup, render } from 'vitest-browser-svelte'; +import { page } from 'vitest/browser'; + +import ContributorStack from './ContributorStack.svelte'; +import type { components } from '$lib/generated/api'; + +type ActivityActorDTO = components['schemas']['ActivityActorDTO']; + +afterEach(() => cleanup()); + +const makeActor = (overrides: Partial = {}): ActivityActorDTO => ({ + initials: 'MR', + color: '#7a4f9a', + name: 'Max Raddatz', + ...overrides +}); + +describe('ContributorStack', () => { + it('contributor avatar is announced by screen readers with actor name', async () => { + const actor = makeActor({ name: 'Anna Meier', initials: 'AM' }); + render(ContributorStack, { contributors: [actor], hasMore: false }); + await expect.element(page.getByRole('img', { name: 'Anna Meier' })).toBeInTheDocument(); + }); + + it('falls back to initials as accessible name when actor name is null', async () => { + const actor = makeActor({ name: undefined, initials: 'AM' }); + render(ContributorStack, { contributors: [actor], hasMore: false }); + await expect.element(page.getByRole('img', { name: 'AM' })).toBeInTheDocument(); + }); + + it('renders two avatars without crashing when actors have identical initials', async () => { + const actors = [ + makeActor({ name: undefined, initials: 'AM', color: '#aa0000' }), + makeActor({ name: undefined, initials: 'AM', color: '#0000bb' }) + ]; + render(ContributorStack, { contributors: actors, hasMore: false }); + await expect.element(page.getByText('AM').first()).toBeInTheDocument(); + }); + + it('renders overflow indicator when hasMore is true', async () => { + render(ContributorStack, { contributors: [makeActor()], hasMore: true }); + await expect.element(page.getByText('…')).toBeInTheDocument(); + }); + + it('renders empty placeholder when no contributors', async () => { + render(ContributorStack, { contributors: [], hasMore: false }); + await expect.element(page.getByTitle('Noch niemand angefangen')).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/lib/components/DashboardActivityFeed.svelte b/frontend/src/lib/components/DashboardActivityFeed.svelte new file mode 100644 index 00000000..d24fdd91 --- /dev/null +++ b/frontend/src/lib/components/DashboardActivityFeed.svelte @@ -0,0 +1,83 @@ + + +
+
+

+ {m.feed_caption()} +

+ {m.feed_show_all()} +
+ + {#if feed.length > 0} +
    + {#each feed as item (item.happenedAt + item.documentId + item.kind)} +
  • + {#if item.actor} + {item.actor.initials} + {:else} + ? + {/if} + +
    +

    + {#if item.actor} + {item.actor.name ?? item.actor.initials} + {/if} + {verb(item.kind)} + + {item.documentTitle} + + {#if item.youMentioned} + + {m.feed_for_you()} + + {/if} +

    +

    {formatDate(item.happenedAt)}

    +
    +
    • + {/each} +
+ {/if} +
diff --git a/frontend/src/lib/components/DashboardActivityFeed.svelte.spec.ts b/frontend/src/lib/components/DashboardActivityFeed.svelte.spec.ts new file mode 100644 index 00000000..b12c682c --- /dev/null +++ b/frontend/src/lib/components/DashboardActivityFeed.svelte.spec.ts @@ -0,0 +1,42 @@ +import { describe, it, expect, afterEach } from 'vitest'; +import { cleanup, render } from 'vitest-browser-svelte'; +import { page } from 'vitest/browser'; + +import DashboardActivityFeed from './DashboardActivityFeed.svelte'; +import type { components } from '$lib/generated/api'; + +type ActivityFeedItemDTO = components['schemas']['ActivityFeedItemDTO']; + +afterEach(() => { + cleanup(); +}); + +const baseItem: ActivityFeedItemDTO = { + kind: 'TEXT_SAVED', + actor: { initials: 'MR', color: '#7a4f9a', name: 'Max Raddatz' }, + documentId: 'doc-1', + documentTitle: 'Brief 1920', + happenedAt: '2026-04-19T10:00:00Z', + youMentioned: false +}; + +describe('DashboardActivityFeed', () => { + it('renders "für dich" badge when youMentioned is true', async () => { + const item: ActivityFeedItemDTO = { ...baseItem, kind: 'MENTION_CREATED', youMentioned: true }; + render(DashboardActivityFeed, { feed: [item] }); + const badge = page.getByText('für dich'); + await expect.element(badge).toBeInTheDocument(); + }); + + it('does not render "für dich" badge when youMentioned is false', async () => { + render(DashboardActivityFeed, { feed: [baseItem] }); + const badge = page.getByText('für dich'); + await expect.element(badge).not.toBeInTheDocument(); + }); + + it('renders empty state when feed is empty', async () => { + render(DashboardActivityFeed, { feed: [] }); + const section = page.getByText('Kommentare & Aktivität'); + await expect.element(section).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/lib/components/DashboardFamilyPulse.svelte b/frontend/src/lib/components/DashboardFamilyPulse.svelte new file mode 100644 index 00000000..44f89542 --- /dev/null +++ b/frontend/src/lib/components/DashboardFamilyPulse.svelte @@ -0,0 +1,70 @@ + + +{#if pulse !== null} +
+

+ {m.pulse_eyebrow()} +

+ + {#if pulse.pages > 0} +

+ {m.pulse_headline({ pages: pulse.pages })} +

+ {/if} + + {#if pulse.yourPages > 0} +

+ {m.pulse_you({ pages: pulse.yourPages })} +

+ {/if} + + {#if pulse.contributors.length > 0} +
+

{m.pulse_contributors()}

+ {#each pulse.contributors as c (c.initials + c.color)} + {c.initials} + {/each} +
+ {/if} + +
+
+ {pulse.annotated} + + ●{m.pulse_transcribed()} + +
+
+ {pulse.transcribed} + + ●{m.pulse_reviewed()} + +
+
+ {pulse.uploaded} + + ●{m.pulse_uploaded()} + +
+
+
+{/if} diff --git a/frontend/src/lib/components/DashboardResumeStrip.svelte b/frontend/src/lib/components/DashboardResumeStrip.svelte index 1e7e9e31..e9c7620f 100644 --- a/frontend/src/lib/components/DashboardResumeStrip.svelte +++ b/frontend/src/lib/components/DashboardResumeStrip.svelte @@ -1,37 +1,115 @@ -{#if lastVisited} +{#if resumeDoc === null}
- {m.dashboard_resume_label()} - - {lastVisited.title || m.dashboard_resume_fallback()} + + + + +

{m.dashboard_empty_title()}

+

{m.dashboard_empty_body()}

+ + {m.dashboard_empty_cta()}
+{:else} +
+ + +
+

+ ● + {m.dashboard_resume_label()} + · + {m.dashboard_blocks({ count: resumeDoc.totalBlocks })} +

+ +

{resumeDoc.title}

+ +

{resumeDoc.caption}

+ +
+ {resumeDoc.excerpt} +
+ +
+ {resumeDoc.pct}% +
+
+
+ {#each resumeDoc.collaborators.slice(0, 3) as collab (collab.initials + collab.color)} + {collab.initials} + {/each} +
+ +
+ + {m.dashboard_resume_cta()} + + + {m.dashboard_resume_other()} + +
+
+
{/if} diff --git a/frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts b/frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts index 2fac46b0..2250ff2e 100644 --- a/frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts +++ b/frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts @@ -3,48 +3,53 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import DashboardResumeStrip from './DashboardResumeStrip.svelte'; +import type { components } from '$lib/generated/api'; + +type DashboardResumeDTO = components['schemas']['DashboardResumeDTO']; afterEach(() => { cleanup(); - localStorage.clear(); }); +const mockResume: DashboardResumeDTO = { + documentId: 'doc-123', + title: 'Geburtsurkunde 1920', + caption: 'Max Mustermann · 1920-01-01', + excerpt: 'Hiermit wird beurkundet…', + totalBlocks: 4, + pct: 75, + collaborators: [] +}; + describe('DashboardResumeStrip', () => { - it('renders nothing when no last-visited document in localStorage', async () => { - render(DashboardResumeStrip, {}); - const strip = page.getByTestId('resume-strip'); - await expect.element(strip).not.toBeInTheDocument(); + it('renders empty state heading when resumeDoc is null', async () => { + render(DashboardResumeStrip, { resumeDoc: null }); + const heading = page.getByRole('heading', { name: /Noch kein Dokument begonnen/i }); + await expect.element(heading).toBeInTheDocument(); }); - it('shows the strip with link when localStorage has a document', async () => { - localStorage.setItem( - 'familienarchiv.lastVisited', - JSON.stringify({ id: 'doc-123', title: 'Geburtsurkunde 1920' }) - ); - render(DashboardResumeStrip, {}); - const strip = page.getByTestId('resume-strip'); - await expect.element(strip).toBeInTheDocument(); - const link = page.getByRole('link', { name: /Geburtsurkunde 1920/ }); - await expect.element(link).toBeInTheDocument(); + it('renders progressbar with correct aria-valuenow when resumeDoc is provided', async () => { + render(DashboardResumeStrip, { resumeDoc: mockResume }); + const bar = page.getByRole('progressbar'); + await expect.element(bar).toBeInTheDocument(); + await expect.element(bar).toHaveAttribute('aria-valuenow', '75'); + }); + + it('shows document title when resumeDoc is provided', async () => { + render(DashboardResumeStrip, { resumeDoc: mockResume }); + const title = page.getByRole('heading', { name: /Geburtsurkunde 1920/i }); + await expect.element(title).toBeInTheDocument(); + }); + + it('links to the document for the CTA', async () => { + render(DashboardResumeStrip, { resumeDoc: mockResume }); + const link = page.getByRole('link', { name: /Weitertranskribieren/i }); await expect.element(link).toHaveAttribute('href', '/documents/doc-123'); }); - it('uses title fallback text when title is empty', async () => { - localStorage.setItem( - 'familienarchiv.lastVisited', - JSON.stringify({ id: 'doc-456', title: '' }) - ); - render(DashboardResumeStrip, {}); - const strip = page.getByTestId('resume-strip'); - await expect.element(strip).toBeInTheDocument(); - const link = page.getByRole('link'); - await expect.element(link).toHaveAttribute('href', '/documents/doc-456'); - }); - - it('renders nothing when localStorage contains malformed JSON', async () => { - localStorage.setItem('familienarchiv.lastVisited', '{not valid json'); - render(DashboardResumeStrip, {}); - const strip = page.getByTestId('resume-strip'); - await expect.element(strip).not.toBeInTheDocument(); + it('shows block count label', async () => { + render(DashboardResumeStrip, { resumeDoc: mockResume }); + const label = page.getByText(/4 Abschnitte/i); + await expect.element(label).toBeInTheDocument(); }); }); diff --git a/frontend/src/lib/components/MissionControlStrip.svelte.spec.ts b/frontend/src/lib/components/MissionControlStrip.svelte.spec.ts index 8bcd25b0..50ee31cf 100644 --- a/frontend/src/lib/components/MissionControlStrip.svelte.spec.ts +++ b/frontend/src/lib/components/MissionControlStrip.svelte.spec.ts @@ -20,6 +20,8 @@ function makeDoc( annotationCount: 0, textedBlockCount: 0, reviewedBlockCount: 0, + contributors: [], + hasMoreContributors: false, ...overrides }; } diff --git a/frontend/src/lib/components/ReadyColumn.svelte b/frontend/src/lib/components/ReadyColumn.svelte index 20fc91d4..680b9d0c 100644 --- a/frontend/src/lib/components/ReadyColumn.svelte +++ b/frontend/src/lib/components/ReadyColumn.svelte @@ -3,6 +3,7 @@ import * as m from '$lib/paraglide/messages.js'; import { getLocale } from '$lib/paraglide/runtime.js'; import { formatMCDate } from '$lib/utils/date.js'; import type { components } from '$lib/generated/api'; +import ContributorStack from './ContributorStack.svelte'; type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO']; @@ -51,6 +52,9 @@ function reviewedPct(doc: TranscriptionQueueItemDTO): number { {/if} +
+ +
{/each} diff --git a/frontend/src/lib/components/ReadyColumn.svelte.spec.ts b/frontend/src/lib/components/ReadyColumn.svelte.spec.ts index 1674e44a..a4af3d28 100644 --- a/frontend/src/lib/components/ReadyColumn.svelte.spec.ts +++ b/frontend/src/lib/components/ReadyColumn.svelte.spec.ts @@ -15,6 +15,8 @@ function makeDoc(overrides: Partial = {}): Transcript annotationCount: 0, textedBlockCount: 0, reviewedBlockCount: 0, + contributors: [], + hasMoreContributors: false, ...overrides }; } diff --git a/frontend/src/lib/components/SegmentationColumn.svelte b/frontend/src/lib/components/SegmentationColumn.svelte index f7361444..b46153c6 100644 --- a/frontend/src/lib/components/SegmentationColumn.svelte +++ b/frontend/src/lib/components/SegmentationColumn.svelte @@ -3,6 +3,7 @@ import * as m from '$lib/paraglide/messages.js'; import { getLocale } from '$lib/paraglide/runtime.js'; import { formatMCDate } from '$lib/utils/date.js'; import type { components } from '$lib/generated/api'; +import ContributorStack from './ContributorStack.svelte'; type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO']; @@ -44,6 +45,9 @@ let { docs, weeklyCount }: Props = $props(); >{formatMCDate(doc.documentDate, getLocale())} {/if} +
+ +
{/each} diff --git a/frontend/src/lib/components/SegmentationColumn.svelte.spec.ts b/frontend/src/lib/components/SegmentationColumn.svelte.spec.ts index 52de56af..8f0c538d 100644 --- a/frontend/src/lib/components/SegmentationColumn.svelte.spec.ts +++ b/frontend/src/lib/components/SegmentationColumn.svelte.spec.ts @@ -15,6 +15,8 @@ function makeDoc(overrides: Partial = {}): Transcript annotationCount: 0, textedBlockCount: 0, reviewedBlockCount: 0, + contributors: [], + hasMoreContributors: false, ...overrides }; } diff --git a/frontend/src/lib/components/TranscriptionColumn.svelte b/frontend/src/lib/components/TranscriptionColumn.svelte index ef4b742b..9c168f98 100644 --- a/frontend/src/lib/components/TranscriptionColumn.svelte +++ b/frontend/src/lib/components/TranscriptionColumn.svelte @@ -3,6 +3,7 @@ import * as m from '$lib/paraglide/messages.js'; import { getLocale } from '$lib/paraglide/runtime.js'; import { formatMCDate } from '$lib/utils/date.js'; import type { components } from '$lib/generated/api'; +import ContributorStack from './ContributorStack.svelte'; type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO']; @@ -67,6 +68,9 @@ function blockProgress(doc: TranscriptionQueueItemDTO): number { {:else} — {/if} +
+ +
{/each} diff --git a/frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts b/frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts index 170671db..05b09d9b 100644 --- a/frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts +++ b/frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts @@ -15,6 +15,8 @@ function makeDoc(overrides: Partial = {}): Transcript annotationCount: 0, textedBlockCount: 0, reviewedBlockCount: 0, + contributors: [], + hasMoreContributors: false, ...overrides }; } diff --git a/frontend/src/lib/generated/api.ts b/frontend/src/lib/generated/api.ts index ba57d088..f3ac663b 100644 --- a/frontend/src/lib/generated/api.ts +++ b/frontend/src/lib/generated/api.ts @@ -324,6 +324,22 @@ export interface paths { patch?: never; trace?: never; }; + "/api/invites": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["listInvites"]; + put?: never; + post: operations["createInvite"]; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; "/api/groups": { parameters: { query?: never; @@ -356,6 +372,22 @@ export interface paths { patch?: never; trace?: never; }; + "/api/documents/{id}/file": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["getDocumentFile"]; + put?: never; + post: operations["attachFile"]; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; "/api/documents/{documentId}/transcription-blocks": { parameters: { query?: never; @@ -532,6 +564,22 @@ export interface paths { patch?: never; trace?: never; }; + "/api/auth/register": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get?: never; + put?: never; + post: operations["register"]; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; "/api/auth/forgot-password": { parameters: { query?: never; @@ -1044,22 +1092,6 @@ export interface paths { patch?: never; trace?: never; }; - "/api/documents/{id}/file": { - parameters: { - query?: never; - header?: never; - path?: never; - cookie?: never; - }; - get: operations["getDocumentFile"]; - put?: never; - post?: never; - delete?: never; - options?: never; - head?: never; - patch?: never; - trace?: never; - }; "/api/documents/{documentId}/transcription-blocks/{blockId}/history": { parameters: { query?: never; @@ -1108,38 +1140,6 @@ export interface paths { patch?: never; trace?: never; }; - "/api/documents/recent-activity": { - parameters: { - query?: never; - header?: never; - path?: never; - cookie?: never; - }; - get: operations["getRecentActivity"]; - put?: never; - post?: never; - delete?: never; - options?: never; - head?: never; - patch?: never; - trace?: never; - }; - "/api/documents/incomplete": { - parameters: { - query?: never; - header?: never; - path?: never; - cookie?: never; - }; - get: operations["getIncomplete"]; - put?: never; - post?: never; - delete?: never; - options?: never; - head?: never; - patch?: never; - trace?: never; - }; "/api/documents/incomplete/next": { parameters: { query?: never; @@ -1188,6 +1188,70 @@ export interface paths { patch?: never; trace?: never; }; + "/api/dashboard/resume": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["getResume"]; + put?: never; + post?: never; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; + "/api/dashboard/pulse": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["getPulse"]; + put?: never; + post?: never; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; + "/api/dashboard/activity": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["getActivity"]; + put?: never; + post?: never; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; + "/api/auth/invite/{code}": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get: operations["getInvitePrefill"]; + put?: never; + post?: never; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; "/api/admin/import-status": { parameters: { query?: never; @@ -1236,6 +1300,22 @@ export interface paths { patch?: never; trace?: never; }; + "/api/invites/{id}": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + get?: never; + put?: never; + post?: never; + delete: operations["revokeInvite"]; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; } export type webhooks = Record; export interface components { @@ -1253,12 +1333,13 @@ export interface components { AppUser: { /** Format: uuid */ id: string; + /** Format: email */ + email: string; password?: string; firstName?: string; lastName?: string; /** Format: date */ birthDate?: string; - email: string; contact?: string; enabled: boolean; notifyOnReply: boolean; @@ -1266,6 +1347,7 @@ export interface components { groups: components["schemas"]["UserGroup"][]; /** Format: date-time */ createdAt: string; + color: string; }; UserGroup: { /** Format: uuid */ @@ -1405,6 +1487,7 @@ export interface components { blockIds?: string[]; }; CreateUserRequest: { + /** Format: email */ email: string; initialPassword?: string; groupIds?: string[]; @@ -1470,11 +1553,40 @@ export interface components { }; TriggerSenderTrainingDTO: { /** Format: uuid */ - personId?: string; + personId: string; }; BatchOcrDTO: { documentIds: string[]; }; + CreateInviteRequest: { + label?: string; + /** Format: int32 */ + maxUses?: number; + prefillFirstName?: string; + prefillLastName?: string; + prefillEmail?: string; + groupIds?: string[]; + /** Format: date-time */ + expiresAt?: string; + }; + InviteListItemDTO: { + /** Format: uuid */ + id: string; + code: string; + displayCode: string; + label?: string; + /** Format: int32 */ + useCount: number; + /** Format: int32 */ + maxUses?: number; + /** Format: date-time */ + expiresAt?: string; + revoked: boolean; + status: string; + /** Format: date-time */ + createdAt: string; + shareableUrl?: string; + }; GroupDTO: { name?: string; permissions?: string[]; @@ -1580,6 +1692,15 @@ export interface components { token?: string; newPassword?: string; }; + RegisterRequest: { + code: string; + /** Format: email */ + email: string; + password: string; + firstName?: string; + lastName?: string; + notifyOnMention?: boolean; + }; ForgotPasswordRequest: { email?: string; }; @@ -1633,6 +1754,11 @@ export interface components { /** Format: int64 */ transcriptionCount: number; }; + ActivityActorDTO: { + initials: string; + color: string; + name?: string; + }; TranscriptionQueueItemDTO: { /** Format: uuid */ id: string; @@ -1645,6 +1771,8 @@ export interface components { textedBlockCount: number; /** Format: int32 */ reviewedBlockCount: number; + contributors: components["schemas"]["ActivityActorDTO"][]; + hasMoreContributors: boolean; }; TagTreeNodeDTO: { /** Format: uuid */ @@ -1754,6 +1882,8 @@ export interface components { /** Format: int64 */ totalElements?: number; pageable?: components["schemas"]["PageableObject"]; + first?: boolean; + last?: boolean; /** Format: int32 */ size?: number; content?: components["schemas"]["NotificationDTO"][]; @@ -1762,8 +1892,6 @@ export interface components { sort?: components["schemas"]["SortObject"]; /** Format: int32 */ numberOfElements?: number; - first?: boolean; - last?: boolean; empty?: boolean; }; PageableObject: { @@ -1847,10 +1975,47 @@ export interface components { summarySnippet?: string; summaryOffsets: components["schemas"]["MatchOffset"][]; }; - IncompleteDocumentDTO: { + DashboardResumeDTO: { /** Format: uuid */ - id: string; + documentId: string; title: string; + caption: string; + excerpt: string; + /** Format: int32 */ + totalBlocks: number; + /** Format: int32 */ + pct: number; + thumbnailUrl?: string; + collaborators: components["schemas"]["ActivityActorDTO"][]; + }; + DashboardPulseDTO: { + /** Format: int32 */ + pages: number; + /** Format: int32 */ + annotated: number; + /** Format: int32 */ + transcribed: number; + /** Format: int32 */ + uploaded: number; + /** Format: int32 */ + yourPages: number; + contributors: components["schemas"]["ActivityActorDTO"][]; + }; + ActivityFeedItemDTO: { + /** @enum {string} */ + kind: "FILE_UPLOADED" | "STATUS_CHANGED" | "METADATA_UPDATED" | "TEXT_SAVED" | "BLOCK_REVIEWED" | "ANNOTATION_CREATED" | "COMMENT_ADDED" | "MENTION_CREATED"; + actor?: components["schemas"]["ActivityActorDTO"]; + /** Format: uuid */ + documentId: string; + documentTitle: string; + /** Format: date-time */ + happenedAt: string; + youMentioned: boolean; + }; + InvitePrefillDTO: { + firstName: string; + lastName: string; + email: string; }; }; responses: never; @@ -2619,6 +2784,52 @@ export interface operations { }; }; }; + listInvites: { + parameters: { + query?: { + status?: string; + }; + header?: never; + path?: never; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["InviteListItemDTO"][]; + }; + }; + }; + }; + createInvite: { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + requestBody: { + content: { + "application/json": components["schemas"]["CreateInviteRequest"]; + }; + }; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["InviteListItemDTO"]; + }; + }; + }; + }; getAllGroups: { parameters: { query?: never; @@ -2687,6 +2898,57 @@ export interface operations { }; }; }; + getDocumentFile: { + parameters: { + query?: never; + header?: never; + path: { + id: string; + }; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": string; + }; + }; + }; + }; + attachFile: { + parameters: { + query?: never; + header?: never; + path: { + id: string; + }; + cookie?: never; + }; + requestBody?: { + content: { + "multipart/form-data": { + /** Format: binary */ + file: string; + }; + }; + }; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["Document"]; + }; + }; + }; + }; listBlocks: { parameters: { query?: never; @@ -3086,6 +3348,30 @@ export interface operations { }; }; }; + register: { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + requestBody: { + content: { + "application/json": components["schemas"]["RegisterRequest"]; + }; + }; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["AppUser"]; + }; + }; + }; + }; forgotPassword: { parameters: { query?: never; @@ -3603,9 +3889,7 @@ export interface operations { [name: string]: unknown; }; content: { - "*/*": { - [key: string]: unknown; - }; + "*/*": components["schemas"]["TrainingInfoResponse"]; }; }; }; @@ -3850,28 +4134,6 @@ export interface operations { }; }; }; - getDocumentFile: { - parameters: { - query?: never; - header?: never; - path: { - id: string; - }; - cookie?: never; - }; - requestBody?: never; - responses: { - /** @description OK */ - 200: { - headers: { - [name: string]: unknown; - }; - content: { - "*/*": string; - }; - }; - }; - }; getBlockHistory: { parameters: { query?: never; @@ -3953,51 +4215,6 @@ export interface operations { }; }; }; - getRecentActivity: { - parameters: { - query?: { - size?: number; - }; - header?: never; - path?: never; - cookie?: never; - }; - requestBody?: never; - responses: { - /** @description OK */ - 200: { - headers: { - [name: string]: unknown; - }; - content: { - "*/*": components["schemas"]["Document"][]; - }; - }; - }; - }; - getIncomplete: { - parameters: { - query?: { - /** @description Maximum number of results */ - size?: number; - }; - header?: never; - path?: never; - cookie?: never; - }; - requestBody?: never; - responses: { - /** @description OK */ - 200: { - headers: { - [name: string]: unknown; - }; - content: { - "*/*": components["schemas"]["IncompleteDocumentDTO"][]; - }; - }; - }; - }; getNextIncomplete: { parameters: { query: { @@ -4068,6 +4285,90 @@ export interface operations { }; }; }; + getResume: { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["DashboardResumeDTO"]; + }; + }; + }; + }; + getPulse: { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["DashboardPulseDTO"]; + }; + }; + }; + }; + getActivity: { + parameters: { + query?: { + limit?: number; + }; + header?: never; + path?: never; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["ActivityFeedItemDTO"][]; + }; + }; + }; + }; + getInvitePrefill: { + parameters: { + query?: never; + header?: never; + path: { + code: string; + }; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "*/*": components["schemas"]["InvitePrefillDTO"]; + }; + }; + }; + }; importStatus: { parameters: { query?: never; @@ -4129,4 +4430,28 @@ export interface operations { }; }; }; + revokeInvite: { + parameters: { + query?: never; + header?: never; + path: { + id: string; + }; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description OK */ + 200: { + headers: { + [name: string]: unknown; + }; + content?: never; + }; + }; + }; } + +export type DashboardResumeDTO = components['schemas']['DashboardResumeDTO']; +export type DashboardPulseDTO = components['schemas']['DashboardPulseDTO']; +export type ActivityFeedItemDTO = components['schemas']['ActivityFeedItemDTO']; diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index 3aada446..33671854 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -2,6 +2,7 @@ import './layout.css'; import { page } from '$app/state'; import { onMount } from 'svelte'; +import * as m from '$lib/paraglide/messages.js'; import LanguageSwitcher from '$lib/components/LanguageSwitcher.svelte'; import ThemeToggle from '$lib/components/ThemeToggle.svelte'; import NotificationBell from '$lib/components/NotificationBell.svelte'; @@ -28,7 +29,9 @@ onMount(() => { }); const isAuthPage = $derived( - ['/login', '/forgot-password', '/reset-password'].some((p) => page.url.pathname.startsWith(p)) + ['/login', '/register', '/forgot-password', '/reset-password'].some((p) => + page.url.pathname.startsWith(p) + ) ); const userInitials = $derived.by(() => { @@ -50,6 +53,31 @@ const userInitials = $derived.by(() => {
+ {#if data?.user} + + + {m.upload_action()} + + {/if}