From bb7d872a61eeb03072e9fa517544399e28f86e4e Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 5 May 2026 12:23:28 +0200 Subject: [PATCH] refactor(document): move document sub-packages transcription/annotation/comment Co-Authored-By: Claude Sonnet 4.6 --- .../annotation}/AnnotationController.java | 10 ++++---- .../annotation}/AnnotationRepository.java | 4 ++-- .../annotation}/AnnotationService.java | 11 +++++---- .../annotation}/CreateAnnotationDTO.java | 3 ++- .../annotation}/DocumentAnnotation.java | 2 +- .../annotation}/UpdateAnnotationDTO.java | 2 +- .../comment}/CommentController.java | 8 +++---- .../comment}/CommentRepository.java | 4 ++-- .../comment}/CommentService.java | 12 ++++++---- .../comment}/CreateCommentDTO.java | 2 +- .../comment}/DocumentComment.java | 5 ++-- .../CreateTranscriptionBlockDTO.java | 4 ++-- .../transcription}/MentionDTO.java | 2 +- .../transcription}/PersonMention.java | 2 +- .../ReorderTranscriptionBlocksDTO.java | 2 +- .../transcription}/TranscriptionBlock.java | 4 +++- .../TranscriptionBlockController.java | 14 +++++------ .../TranscriptionBlockQueryService.java | 6 ++--- .../TranscriptionBlockRepository.java | 5 ++-- .../TranscriptionBlockVersion.java | 2 +- .../TranscriptionBlockVersionRepository.java | 4 ++-- .../TranscriptionQueueController.java | 8 +++---- .../TranscriptionQueueItemDTO.java | 2 +- .../TranscriptionQueueProjection.java | 2 +- .../TranscriptionQueueService.java | 9 +++---- .../transcription}/TranscriptionService.java | 22 +++++++++-------- .../TranscriptionWeeklyStatsDTO.java | 2 +- .../TranscriptionWeeklyStatsProjection.java | 2 +- .../UpdateTranscriptionBlockDTO.java | 4 ++-- .../familienarchiv/ocr/OcrAsyncRunner.java | 7 +++--- .../repository/DocumentRepository.java | 2 ++ .../service/DocumentService.java | 12 ++++++---- .../annotation}/AnnotationControllerTest.java | 6 ++--- .../annotation}/AnnotationServiceTest.java | 11 +++++---- .../comment}/CommentControllerTest.java | 6 ++--- .../comment}/CommentServiceTest.java | 10 ++++---- .../TranscriptionBlockControllerTest.java | 8 +++---- ...nscriptionBlockMentionsRepositoryTest.java | 10 ++++---- ...riptionBlockRepositoryIntegrationTest.java | 3 ++- .../TranscriptionBlockRepositoryTest.java | 5 +++- .../TranscriptionQueueControllerTest.java | 8 +++---- .../TranscriptionQueueServiceTest.java | 11 +++++---- .../TranscriptionServiceGuidedTest.java | 10 ++++---- .../TranscriptionServiceTest.java | 24 ++++++++++--------- .../dto/UniquePointsValidatorTest.java | 1 + .../notification/NotificationServiceTest.java | 1 + .../ocr/OcrAsyncRunnerTest.java | 7 +++--- .../familienarchiv/ocr/OcrControllerTest.java | 4 ++-- .../ocr/OcrTrainingServiceTest.java | 4 ++-- .../ocr/SenderModelServiceTest.java | 2 +- .../ocr/TrainingDataExportServiceTest.java | 10 ++++---- .../repository/DocumentFtsTest.java | 6 +++-- .../repository/DocumentRepositoryTest.java | 8 +++++-- .../DocumentSearchEnrichmentTest.java | 6 +++-- .../repository/TrainingBlockQueryTest.java | 4 ++++ .../service/DocumentServiceSortTest.java | 2 ++ .../service/DocumentServiceTest.java | 2 ++ 57 files changed, 201 insertions(+), 148 deletions(-) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => document/annotation}/AnnotationController.java (89%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/annotation}/AnnotationRepository.java (80%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => document/annotation}/AnnotationService.java (92%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/annotation}/CreateAnnotationDTO.java (90%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/annotation}/DocumentAnnotation.java (97%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/annotation}/UpdateAnnotationDTO.java (92%) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => document/comment}/CommentController.java (93%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/comment}/CommentRepository.java (72%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => document/comment}/CommentService.java (94%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/comment}/CreateCommentDTO.java (81%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/comment}/DocumentComment.java (93%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/CreateTranscriptionBlockDTO.java (84%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/MentionDTO.java (84%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/transcription}/PersonMention.java (93%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/ReorderTranscriptionBlocksDTO.java (81%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/transcription}/TranscriptionBlock.java (95%) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => document/transcription}/TranscriptionBlockController.java (87%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionBlockQueryService.java (86%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionBlockRepository.java (94%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/transcription}/TranscriptionBlockVersion.java (94%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionBlockVersionRepository.java (68%) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => document/transcription}/TranscriptionQueueController.java (83%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/TranscriptionQueueItemDTO.java (93%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionQueueProjection.java (88%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionQueueService.java (87%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionService.java (91%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/TranscriptionWeeklyStatsDTO.java (88%) rename backend/src/main/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionWeeklyStatsProjection.java (82%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/transcription}/UpdateTranscriptionBlockDTO.java (77%) rename backend/src/test/java/org/raddatz/familienarchiv/{controller => document/annotation}/AnnotationControllerTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => document/annotation}/AnnotationServiceTest.java (97%) rename backend/src/test/java/org/raddatz/familienarchiv/{controller => document/comment}/CommentControllerTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => document/comment}/CommentServiceTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{controller => document/transcription}/TranscriptionBlockControllerTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionBlockMentionsRepositoryTest.java (92%) rename backend/src/test/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionBlockRepositoryIntegrationTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{repository => document/transcription}/TranscriptionBlockRepositoryTest.java (96%) rename backend/src/test/java/org/raddatz/familienarchiv/{controller => document/transcription}/TranscriptionQueueControllerTest.java (95%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionQueueServiceTest.java (95%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionServiceGuidedTest.java (90%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => document/transcription}/TranscriptionServiceTest.java (96%) diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/AnnotationController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java similarity index 89% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/AnnotationController.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java index 8311cbe2..ab672577 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/AnnotationController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java @@ -1,15 +1,15 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.annotation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; -import org.raddatz.familienarchiv.dto.UpdateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; -import org.raddatz.familienarchiv.service.AnnotationService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.service.DocumentService; import org.raddatz.familienarchiv.service.UserService; import jakarta.validation.Valid; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/AnnotationRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationRepository.java similarity index 80% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/AnnotationRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationRepository.java index 6e75fd59..9d4b8755 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/AnnotationRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationRepository.java @@ -1,6 +1,6 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.annotation; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/AnnotationService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationService.java similarity index 92% rename from backend/src/main/java/org/raddatz/familienarchiv/service/AnnotationService.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationService.java index 2250e8fc..ff605286 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/AnnotationService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationService.java @@ -1,15 +1,16 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.annotation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; -import org.raddatz.familienarchiv.dto.UpdateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.DocumentAnnotation; -import org.raddatz.familienarchiv.repository.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; import org.springframework.context.annotation.Lazy; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateAnnotationDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java similarity index 90% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/CreateAnnotationDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java index 846d9321..133bc69b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateAnnotationDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java @@ -1,7 +1,8 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.Valid; import jakarta.validation.constraints.DecimalMax; +import org.raddatz.familienarchiv.dto.UniquePoints; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentAnnotation.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/DocumentAnnotation.java similarity index 97% rename from backend/src/main/java/org/raddatz/familienarchiv/model/DocumentAnnotation.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/DocumentAnnotation.java index 5aaaff2d..4ba37f4b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentAnnotation.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/DocumentAnnotation.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.annotation; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateAnnotationDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UpdateAnnotationDTO.java similarity index 92% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateAnnotationDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UpdateAnnotationDTO.java index 19fa3c7d..35199388 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateAnnotationDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UpdateAnnotationDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/CommentController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java similarity index 93% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/CommentController.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java index 57911095..130f5ade 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/CommentController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java @@ -1,13 +1,13 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.comment; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.raddatz.familienarchiv.dto.CreateCommentDTO; +import org.raddatz.familienarchiv.document.comment.CreateCommentDTO; import org.raddatz.familienarchiv.model.AppUser; -import org.raddatz.familienarchiv.model.DocumentComment; +import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; -import org.raddatz.familienarchiv.service.CommentService; +import org.raddatz.familienarchiv.document.comment.CommentService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/CommentRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentRepository.java similarity index 72% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/CommentRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentRepository.java index 61e2da59..9b696751 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/CommentRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentRepository.java @@ -1,6 +1,6 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.comment; -import org.raddatz.familienarchiv.model.DocumentComment; +import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/CommentService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java similarity index 94% rename from backend/src/main/java/org/raddatz/familienarchiv/service/CommentService.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java index 862a4e2e..50ff734f 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/CommentService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java @@ -1,15 +1,17 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.comment; import lombok.RequiredArgsConstructor; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; -import org.raddatz.familienarchiv.dto.MentionDTO; +import org.raddatz.familienarchiv.document.transcription.MentionDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; +import org.raddatz.familienarchiv.service.UserService; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.AppUser; -import org.raddatz.familienarchiv.model.DocumentComment; -import org.raddatz.familienarchiv.model.TranscriptionBlock; -import org.raddatz.familienarchiv.repository.CommentRepository; +import org.raddatz.familienarchiv.document.comment.DocumentComment; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.comment.CommentRepository; import org.raddatz.familienarchiv.notification.NotificationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateCommentDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CreateCommentDTO.java similarity index 81% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/CreateCommentDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/comment/CreateCommentDTO.java index f1862978..edd333b3 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateCommentDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CreateCommentDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.comment; import lombok.Data; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentComment.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java similarity index 93% rename from backend/src/main/java/org/raddatz/familienarchiv/model/DocumentComment.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java index 2277d2a5..badd0e2b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentComment.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.comment; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -6,7 +6,8 @@ import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import org.raddatz.familienarchiv.dto.MentionDTO; +import org.raddatz.familienarchiv.document.transcription.MentionDTO; +import org.raddatz.familienarchiv.model.AppUser; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateTranscriptionBlockDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CreateTranscriptionBlockDTO.java similarity index 84% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/CreateTranscriptionBlockDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CreateTranscriptionBlockDTO.java index d3d6a332..105b1e49 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateTranscriptionBlockDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CreateTranscriptionBlockDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import jakarta.validation.Valid; import jakarta.validation.constraints.Min; @@ -7,7 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.raddatz.familienarchiv.model.PersonMention; +import org.raddatz.familienarchiv.document.transcription.PersonMention; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/MentionDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/MentionDTO.java similarity index 84% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/MentionDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/MentionDTO.java index 09bf4ba5..a9d0b8d1 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/MentionDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/MentionDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonMention.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/PersonMention.java similarity index 93% rename from backend/src/main/java/org/raddatz/familienarchiv/model/PersonMention.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/PersonMention.java index 2ca2033e..33f4e885 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonMention.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/PersonMention.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/ReorderTranscriptionBlocksDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/ReorderTranscriptionBlocksDTO.java similarity index 81% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/ReorderTranscriptionBlocksDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/ReorderTranscriptionBlocksDTO.java index 7a7e2efb..efb81285 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/ReorderTranscriptionBlocksDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/ReorderTranscriptionBlocksDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlock.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlock.java similarity index 95% rename from backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlock.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlock.java index 6d3e167d..bab9c5dd 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlock.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlock.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; @@ -6,6 +6,8 @@ import lombok.*; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; +import org.raddatz.familienarchiv.model.BlockSource; + import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java similarity index 87% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java index da162ffa..9ea2e0ee 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionBlockController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java @@ -1,17 +1,17 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.transcription; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; 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.model.TranscriptionBlock; -import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; +import org.raddatz.familienarchiv.document.transcription.CreateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.transcription.ReorderTranscriptionBlocksDTO; +import org.raddatz.familienarchiv.document.transcription.UpdateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.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.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionBlockQueryService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java similarity index 86% rename from backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionBlockQueryService.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java index bc21c7ad..e71666e5 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionBlockQueryService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java @@ -1,9 +1,9 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; import lombok.RequiredArgsConstructor; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.repository.CompletionStatsRow; -import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; import org.springframework.stereotype.Service; import java.util.HashMap; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java similarity index 94% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java index 5c2d34e2..dbb89bda 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java @@ -1,6 +1,7 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.repository.CompletionStatsRow; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlockVersion.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersion.java similarity index 94% rename from backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlockVersion.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersion.java index 9a923e04..4cf640db 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/TranscriptionBlockVersion.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersion.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockVersionRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersionRepository.java similarity index 68% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockVersionRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersionRepository.java index b4d8399b..3d645b72 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionBlockVersionRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockVersionRepository.java @@ -1,6 +1,6 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; -import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionQueueController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueController.java similarity index 83% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionQueueController.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueController.java index 59591795..f6145e2d 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/TranscriptionQueueController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueController.java @@ -1,11 +1,11 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.transcription; import lombok.RequiredArgsConstructor; -import org.raddatz.familienarchiv.dto.TranscriptionQueueItemDTO; -import org.raddatz.familienarchiv.dto.TranscriptionWeeklyStatsDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueItemDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsDTO; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; -import org.raddatz.familienarchiv.service.TranscriptionQueueService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueItemDTO.java similarity index 93% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueItemDTO.java index 36d63ca7..bf756a2b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionQueueItemDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueItemDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; import org.raddatz.familienarchiv.audit.ActivityActorDTO; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionQueueProjection.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueProjection.java similarity index 88% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionQueueProjection.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueProjection.java index ff23d43e..8c1f5de7 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionQueueProjection.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueProjection.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; import java.time.LocalDate; import java.util.UUID; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueService.java similarity index 87% rename from backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueService.java index 50ffbac6..13dd51f2 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionQueueService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueService.java @@ -1,11 +1,12 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; 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.TranscriptionQueueProjection; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueItemDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueProjection; import org.springframework.stereotype.Service; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionService.java similarity index 91% rename from backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionService.java index c7ff4c1e..b14e76f5 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionService.java @@ -1,23 +1,25 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; -import org.raddatz.familienarchiv.dto.CreateTranscriptionBlockDTO; -import org.raddatz.familienarchiv.dto.ReorderTranscriptionBlocksDTO; -import org.raddatz.familienarchiv.dto.UpdateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.transcription.CreateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.transcription.ReorderTranscriptionBlocksDTO; +import org.raddatz.familienarchiv.document.transcription.UpdateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.BlockSource; +import org.raddatz.familienarchiv.service.DocumentService; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.ocr.ScriptType; -import org.raddatz.familienarchiv.model.TranscriptionBlock; -import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; -import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository; -import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersion; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersionRepository; import org.raddatz.familienarchiv.ocr.SenderModelService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionWeeklyStatsDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsDTO.java similarity index 88% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionWeeklyStatsDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsDTO.java index 5cbbe923..7fb12be9 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TranscriptionWeeklyStatsDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionWeeklyStatsProjection.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsProjection.java similarity index 82% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionWeeklyStatsProjection.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsProjection.java index 0b1e6f14..b8a28d8d 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/TranscriptionWeeklyStatsProjection.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionWeeklyStatsProjection.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; /** * Spring Data projection for the weekly activity pulse stats. diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateTranscriptionBlockDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/UpdateTranscriptionBlockDTO.java similarity index 77% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateTranscriptionBlockDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/UpdateTranscriptionBlockDTO.java index 210d4c74..307352f2 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateTranscriptionBlockDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/UpdateTranscriptionBlockDTO.java @@ -1,11 +1,11 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.transcription; import jakarta.validation.Valid; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.raddatz.familienarchiv.model.PersonMention; +import org.raddatz.familienarchiv.document.transcription.PersonMention; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java index 65f95601..2582fe18 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java @@ -2,13 +2,14 @@ package org.raddatz.familienarchiv.ocr; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; -import org.raddatz.familienarchiv.service.AnnotationService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.TranscriptionService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.service.FileService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/DocumentRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/repository/DocumentRepository.java index cc2fbfc1..d493dc41 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/DocumentRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/repository/DocumentRepository.java @@ -1,5 +1,7 @@ package org.raddatz.familienarchiv.repository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueProjection; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsProjection; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; import org.springframework.data.domain.Page; 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 ff9c7213..bfe3ec73 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java @@ -17,6 +17,10 @@ import org.raddatz.familienarchiv.dto.DocumentUpdateDTO; import org.raddatz.familienarchiv.dto.IncompleteDocumentDTO; import org.raddatz.familienarchiv.dto.MatchOffset; import org.raddatz.familienarchiv.dto.SearchMatchData; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueProjection; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsProjection; import org.raddatz.familienarchiv.tag.TagOperator; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; @@ -104,19 +108,19 @@ public class DocumentService { return documentRepository.save(doc); } - public List findSegmentationQueue(int limit) { + public List findSegmentationQueue(int limit) { return documentRepository.findSegmentationQueue(limit); } - public List findTranscriptionQueue(int limit) { + public List findTranscriptionQueue(int limit) { return documentRepository.findTranscriptionQueue(limit); } - public List findReadyToReadQueue(int limit) { + public List findReadyToReadQueue(int limit) { return documentRepository.findReadyToReadQueue(limit); } - public org.raddatz.familienarchiv.repository.TranscriptionWeeklyStatsProjection findWeeklyStats() { + public TranscriptionWeeklyStatsProjection findWeeklyStats() { return documentRepository.findWeeklyStats(); } diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/AnnotationControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/AnnotationControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java index 368a21a0..1b6b98c7 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/AnnotationControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java @@ -1,13 +1,13 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.annotation; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.config.SecurityConfig; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.security.PermissionAspect; -import org.raddatz.familienarchiv.service.AnnotationService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.service.CustomUserDetailsService; import org.raddatz.familienarchiv.service.DocumentService; import org.raddatz.familienarchiv.service.UserService; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/AnnotationServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationServiceTest.java similarity index 97% rename from backend/src/test/java/org/raddatz/familienarchiv/service/AnnotationServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationServiceTest.java index 02bc6f9b..2b81d67a 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/AnnotationServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.annotation; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -8,11 +8,12 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.ArgumentCaptor; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; -import org.raddatz.familienarchiv.dto.UpdateAnnotationDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO; import org.raddatz.familienarchiv.exception.DomainException; -import org.raddatz.familienarchiv.model.DocumentAnnotation; -import org.raddatz.familienarchiv.repository.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; import org.springframework.dao.DataIntegrityViolationException; import java.util.Map; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/CommentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/CommentControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java index 58714e7f..45aa3369 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/CommentControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java @@ -1,10 +1,10 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.comment; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.config.SecurityConfig; -import org.raddatz.familienarchiv.model.DocumentComment; +import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.raddatz.familienarchiv.security.PermissionAspect; -import org.raddatz.familienarchiv.service.CommentService; +import org.raddatz.familienarchiv.document.comment.CommentService; import org.raddatz.familienarchiv.service.CustomUserDetailsService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/CommentServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/service/CommentServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java index 3b3a1012..ccbd371d 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/CommentServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.comment; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -7,12 +7,14 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; +import org.raddatz.familienarchiv.service.UserService; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.AppUser; -import org.raddatz.familienarchiv.model.DocumentComment; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.comment.DocumentComment; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.model.UserGroup; -import org.raddatz.familienarchiv.repository.CommentRepository; +import org.raddatz.familienarchiv.document.comment.CommentRepository; import org.raddatz.familienarchiv.notification.NotificationService; import java.time.LocalDateTime; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionBlockControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionBlockControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java index bed7ff8f..601acd99 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionBlockControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java @@ -1,15 +1,15 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.config.SecurityConfig; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.AppUser; -import org.raddatz.familienarchiv.model.TranscriptionBlock; -import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersion; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.service.CustomUserDetailsService; -import org.raddatz.familienarchiv.service.TranscriptionService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockMentionsRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockMentionsRepositoryTest.java similarity index 92% rename from backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockMentionsRepositoryTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockMentionsRepositoryTest.java index 87af6bd5..35c22688 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockMentionsRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockMentionsRepositoryTest.java @@ -1,15 +1,17 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.repository.DocumentRepository; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.PersonMention; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.PersonMention; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryIntegrationTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java index dde0c089..b350da56 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryIntegrationTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java @@ -1,7 +1,8 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; +import org.raddatz.familienarchiv.repository.CompletionStatsRow; import org.raddatz.familienarchiv.config.FlywayConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java similarity index 96% rename from backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java index c948ceed..78402ca9 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TranscriptionBlockRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java @@ -1,10 +1,13 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.document.transcription; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; +import org.raddatz.familienarchiv.repository.DocumentRepository; import org.raddatz.familienarchiv.model.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java similarity index 95% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java index 87593460..5cd55211 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java @@ -1,14 +1,14 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.config.SecurityConfig; -import org.raddatz.familienarchiv.dto.TranscriptionQueueItemDTO; -import org.raddatz.familienarchiv.dto.TranscriptionWeeklyStatsDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueItemDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsDTO; import org.raddatz.familienarchiv.repository.DocumentRepository; import org.raddatz.familienarchiv.person.PersonRepository; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.service.CustomUserDetailsService; -import org.raddatz.familienarchiv.service.TranscriptionQueueService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueServiceTest.java similarity index 95% rename from backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueServiceTest.java index 624a3f82..8c3f7d2f 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionQueueServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,10 +8,11 @@ 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.TranscriptionQueueProjection; -import org.raddatz.familienarchiv.repository.TranscriptionWeeklyStatsProjection; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueItemDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsDTO; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueProjection; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsProjection; import java.time.LocalDate; import java.util.List; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceGuidedTest.java similarity index 90% rename from backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceGuidedTest.java index 2593b2a6..6f5205c6 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceGuidedTest.java @@ -1,12 +1,14 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.audit.AuditService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.model.BlockSource; -import org.raddatz.familienarchiv.model.TranscriptionBlock; -import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository; -import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersionRepository; import org.raddatz.familienarchiv.ocr.SenderModelService; import java.util.Optional; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceTest.java similarity index 96% rename from backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceTest.java index adf2439c..9413ab3f 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.document.transcription; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -8,21 +8,23 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditService; -import org.raddatz.familienarchiv.dto.CreateAnnotationDTO; -import org.raddatz.familienarchiv.dto.CreateTranscriptionBlockDTO; -import org.raddatz.familienarchiv.dto.ReorderTranscriptionBlocksDTO; -import org.raddatz.familienarchiv.dto.UpdateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.service.DocumentService; +import org.raddatz.familienarchiv.document.transcription.CreateTranscriptionBlockDTO; +import org.raddatz.familienarchiv.document.transcription.ReorderTranscriptionBlocksDTO; +import org.raddatz.familienarchiv.document.transcription.UpdateTranscriptionBlockDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.BlockSource; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.person.Person; -import org.raddatz.familienarchiv.model.PersonMention; +import org.raddatz.familienarchiv.document.transcription.PersonMention; import org.raddatz.familienarchiv.ocr.ScriptType; -import org.raddatz.familienarchiv.model.TranscriptionBlock; -import org.raddatz.familienarchiv.model.TranscriptionBlockVersion; -import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository; -import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersion; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersionRepository; import org.raddatz.familienarchiv.ocr.SenderModelService; import java.util.Map; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java index be2690c4..eef0dd4f 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java @@ -4,6 +4,7 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; import org.junit.jupiter.api.Test; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; import java.util.List; import java.util.Set; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java index 3e81dc64..5f73068b 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java @@ -7,6 +7,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.notification.NotificationDTO; +import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.notification.NotificationRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java index 8235e9d5..b5f366e4 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java @@ -5,14 +5,15 @@ 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.dto.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.TranscriptionService; -import org.raddatz.familienarchiv.service.AnnotationService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.service.FileService; import org.raddatz.familienarchiv.ocr.SenderModelService; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java index 43d686cb..999dd9dc 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java @@ -159,8 +159,8 @@ class OcrControllerTest { @Test @WithMockUser(authorities = "ADMIN") void exportTrainingData_returns200_withZipContentType_whenBlocksExist() throws Exception { - org.raddatz.familienarchiv.model.TranscriptionBlock block = - org.raddatz.familienarchiv.model.TranscriptionBlock.builder() + org.raddatz.familienarchiv.document.transcription.TranscriptionBlock block = + org.raddatz.familienarchiv.document.transcription.TranscriptionBlock.builder() .id(UUID.randomUUID()).documentId(UUID.randomUUID()) .annotationId(UUID.randomUUID()).text("x").sortOrder(0).build(); when(trainingDataExportService.queryEligibleBlocks()).thenReturn(List.of(block)); diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java index 4511a3a3..6fea6540 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java @@ -9,12 +9,12 @@ import org.raddatz.familienarchiv.ocr.OcrTrainingRun; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.ocr.SenderModel; import org.raddatz.familienarchiv.ocr.TrainingStatus; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.ocr.OcrTrainingRunRepository; import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.ocr.SenderModelService; -import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java index 70965cd2..b7f41116 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java @@ -15,7 +15,7 @@ import org.raddatz.familienarchiv.ocr.SenderModelRepository; import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.ocr.SenderModelService; -import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java index 3073f222..eafa98ec 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java @@ -9,14 +9,16 @@ import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.*; -import org.raddatz.familienarchiv.repository.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.repository.DocumentRepository; -import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.AnnotationService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.service.FileService; -import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.raddatz.familienarchiv.ocr.TrainingLabel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java index 221c4660..83be47ed 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java @@ -5,12 +5,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; import org.raddatz.familienarchiv.person.PersonRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java index ec00b824..d1736247 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java @@ -3,13 +3,17 @@ package org.raddatz.familienarchiv.repository; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueProjection; +import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStatsProjection; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.model.ThumbnailAspect; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; import org.raddatz.familienarchiv.person.PersonRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java index e1987092..41b78865 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java @@ -6,12 +6,14 @@ import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.service.DocumentService; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.DocumentAnnotation; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; -import org.raddatz.familienarchiv.model.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; import org.raddatz.familienarchiv.person.PersonRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java index d0420f35..964a52cc 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java @@ -4,6 +4,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; +import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; +import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.person.PersonRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java index ec1df6b4..1f7f9948 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java @@ -6,6 +6,8 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.audit.AuditLogQueryService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.raddatz.familienarchiv.dto.DocumentSearchResult; import org.raddatz.familienarchiv.dto.DocumentSort; import org.raddatz.familienarchiv.model.Document; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java index fa63c5e4..2e4f71e9 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java @@ -9,6 +9,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.audit.AuditKind; import org.raddatz.familienarchiv.audit.AuditLogQueryService; import org.raddatz.familienarchiv.audit.AuditService; +import org.raddatz.familienarchiv.document.annotation.AnnotationService; +import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.raddatz.familienarchiv.dto.DocumentSearchItem; import org.raddatz.familienarchiv.dto.DocumentSearchResult; import org.raddatz.familienarchiv.dto.DocumentSort;