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

refactor(shared): move remaining services to domain packages (stats→dashboard, filestorage, importing, notification, exception)

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Marcel
2026-05-05 12:55:51 +02:00
parent 930b1d23ce
commit 5e53a261fc
44 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java → backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsControllerTest.java
View File

@@ -1,11 +1,11 @@
package org.raddatz.familienarchiv.controller;
package org.raddatz.familienarchiv.dashboard;
import org.junit.jupiter.api.Test;
import org.raddatz.familienarchiv.security.SecurityConfig;
import org.raddatz.familienarchiv.dto.StatsDTO;
import org.raddatz.familienarchiv.dashboard.StatsDTO;
import org.raddatz.familienarchiv.security.PermissionAspect;
import org.raddatz.familienarchiv.user.CustomUserDetailsService;
import org.raddatz.familienarchiv.service.StatsService;
import org.raddatz.familienarchiv.dashboard.StatsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;

4
backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java → backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsServiceTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.dashboard;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -6,7 +6,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.dto.StatsDTO;
import org.raddatz.familienarchiv.dashboard.StatsDTO;
import org.raddatz.familienarchiv.person.PersonService;
import static org.assertj.core.api.Assertions.assertThat;

2
backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java
View File

@@ -15,7 +15,7 @@ import org.raddatz.familienarchiv.security.PermissionAspect;
import org.raddatz.familienarchiv.user.CustomUserDetailsService;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.DocumentVersionService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.user.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;

2
backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java
View File

@@ -13,7 +13,7 @@ import org.raddatz.familienarchiv.document.DocumentSort;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.document.DocumentRepository;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.tag.TagService;
import org.raddatz.familienarchiv.person.PersonService;
import org.springframework.data.domain.PageImpl;

2
backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java
View File

@@ -25,7 +25,7 @@ import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.person.Person;
import org.raddatz.familienarchiv.tag.Tag;
import org.raddatz.familienarchiv.document.DocumentRepository;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.tag.TagService;
import org.raddatz.familienarchiv.person.PersonService;
import org.springframework.data.domain.Page;

2
backend/src/test/java/org/raddatz/familienarchiv/document/ThumbnailServiceTest.java
View File

@@ -12,7 +12,7 @@ import org.mockito.ArgumentCaptor;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.document.ThumbnailAspect;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.test.util.ReflectionTestUtils;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.S3Client;

2
backend/src/test/java/org/raddatz/familienarchiv/model/PolygonConverterTest.java → backend/src/test/java/org/raddatz/familienarchiv/document/annotation/PolygonConverterTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.model;
package org.raddatz.familienarchiv.document.annotation;
import org.junit.jupiter.api.Test;

2
backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java → backend/src/test/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidatorTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.dto;
package org.raddatz.familienarchiv.document.annotation;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.Validation;

1
backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java
View File

@@ -10,7 +10,6 @@ import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentRepository;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;

2
backend/src/test/java/org/raddatz/familienarchiv/service/FileServiceTest.java → backend/src/test/java/org/raddatz/familienarchiv/filestorage/FileServiceTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.filestorage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

2
backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java → backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.importing;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

2
backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java
View File

@@ -10,7 +10,7 @@ import org.raddatz.familienarchiv.notification.NotificationType;
import org.raddatz.familienarchiv.security.PermissionAspect;
import org.raddatz.familienarchiv.user.CustomUserDetailsService;
import org.raddatz.familienarchiv.notification.NotificationService;
import org.raddatz.familienarchiv.service.SseEmitterRegistry;
import org.raddatz.familienarchiv.notification.SseEmitterRegistry;
import org.raddatz.familienarchiv.user.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;

3
backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java
View File

@@ -10,10 +10,9 @@ import org.raddatz.familienarchiv.notification.NotificationDTO;
import org.raddatz.familienarchiv.document.comment.DocumentComment;
import org.raddatz.familienarchiv.exception.DomainException;
import org.raddatz.familienarchiv.user.AppUser;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.notification.NotificationRepository;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.service.SseEmitterRegistry;
import org.raddatz.familienarchiv.notification.SseEmitterRegistry;
import org.raddatz.familienarchiv.user.UserService;
import org.springframework.data.domain.PageImpl;
import org.springframework.mail.MailException;

2
backend/src/test/java/org/raddatz/familienarchiv/service/SseEmitterRegistryTest.java → backend/src/test/java/org/raddatz/familienarchiv/notification/SseEmitterRegistryTest.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.notification;
import org.junit.jupiter.api.Test;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

3
backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java
View File

@@ -7,7 +7,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO;
import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
@@ -16,7 +15,7 @@ import org.raddatz.familienarchiv.ocr.OcrJobRepository;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
import org.raddatz.familienarchiv.document.annotation.AnnotationService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.ocr.SenderModelService;
import java.util.ArrayList;

1
backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java
View File

@@ -7,7 +7,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.raddatz.familienarchiv.exception.DomainException;
import org.raddatz.familienarchiv.exception.ErrorCode;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
import org.raddatz.familienarchiv.ocr.OcrJobRepository;

2
backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
View File

@@ -12,11 +12,9 @@ import org.raddatz.familienarchiv.exception.DomainException;
import org.raddatz.familienarchiv.exception.ErrorCode;
import org.raddatz.familienarchiv.user.UserService;
import org.raddatz.familienarchiv.user.CustomUserDetailsService;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.security.PermissionAspect;
import org.raddatz.familienarchiv.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;

1
backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java
View File

@@ -8,7 +8,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.raddatz.familienarchiv.ocr.OcrStatusDTO;
import org.raddatz.familienarchiv.exception.DomainException;
import org.raddatz.familienarchiv.exception.ErrorCode;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;

3
backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java
View File

@@ -8,7 +8,6 @@ import org.junit.jupiter.api.BeforeAll;
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.document.annotation.AnnotationRepository;
import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
import org.raddatz.familienarchiv.document.BlockSource;
@@ -20,7 +19,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepos
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.annotation.AnnotationService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService;
import org.raddatz.familienarchiv.ocr.TrainingLabel;
import org.springframework.beans.factory.annotation.Autowired;

1
backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java
View File

@@ -9,7 +9,6 @@ import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
import org.raddatz.familienarchiv.document.DocumentRepository;
import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository;
import org.raddatz.familienarchiv.model.*;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.document.BlockSource;

2
backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
View File

@@ -7,7 +7,7 @@ import org.raddatz.familienarchiv.security.PermissionAspect;
import org.raddatz.familienarchiv.user.CustomUserDetailsService;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.DocumentVersionService;
import org.raddatz.familienarchiv.service.MassImportService;
import org.raddatz.familienarchiv.importing.MassImportService;
import org.raddatz.familienarchiv.document.ThumbnailBackfillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;