marcel/familienarchiv
1
0
Fork 0
Code Issues 111 Pull Requests 1 Actions 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/main/java/org/raddatz/familienarchiv/controller/StatsController.java → backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsController.java
View File

@@ -1,10 +1,10 @@
package org.raddatz.familienarchiv.controller;
package org.raddatz.familienarchiv.dashboard;
import lombok.RequiredArgsConstructor;
import org.raddatz.familienarchiv.dto.StatsDTO;
import org.raddatz.familienarchiv.dashboard.StatsDTO;
import org.raddatz.familienarchiv.security.Permission;
import org.raddatz.familienarchiv.security.RequirePermission;
import org.raddatz.familienarchiv.service.StatsService;
import org.raddatz.familienarchiv.dashboard.StatsService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

2
backend/src/main/java/org/raddatz/familienarchiv/dto/StatsDTO.java → backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsDTO.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.dto;
package org.raddatz.familienarchiv.dashboard;
/**
* Aggregate counts for the dashboard/persons stats bar.

4
backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java → backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsService.java
View File

@@ -1,9 +1,9 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.dashboard;
import lombok.RequiredArgsConstructor;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.person.PersonService;
import org.raddatz.familienarchiv.dto.StatsDTO;
import org.raddatz.familienarchiv.dashboard.StatsDTO;
import org.springframework.stereotype.Service;
@Service

2
backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java
View File

@@ -44,7 +44,7 @@ import org.raddatz.familienarchiv.security.RequirePermission;
import org.raddatz.familienarchiv.security.SecurityUtils;
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.data.domain.Sort;
import org.springframework.security.core.Authentication;

2
backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java
View File

@@ -38,7 +38,7 @@ import org.springframework.data.jpa.domain.Specification;
import org.raddatz.familienarchiv.exception.DomainException;
import org.raddatz.familienarchiv.exception.ErrorCode;
import org.raddatz.familienarchiv.person.PersonService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.raddatz.familienarchiv.tag.TagService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
backend/src/main/java/org/raddatz/familienarchiv/document/ThumbnailService.java
View File

@@ -8,7 +8,7 @@ import org.apache.pdfbox.rendering.ImageType;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.raddatz.familienarchiv.document.Document;
import org.raddatz.familienarchiv.document.ThumbnailAspect;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import software.amazon.awssdk.core.sync.RequestBody;

2
backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java
View File

@@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.document.annotation;
import jakarta.validation.Valid;
import jakarta.validation.constraints.DecimalMax;
import org.raddatz.familienarchiv.dto.UniquePoints;
import org.raddatz.familienarchiv.document.annotation.UniquePoints;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;

2
backend/src/main/java/org/raddatz/familienarchiv/model/PolygonConverter.java → backend/src/main/java/org/raddatz/familienarchiv/document/annotation/PolygonConverter.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.model;
package org.raddatz.familienarchiv.document.annotation;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;

2
backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePoints.java → backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePoints.java
View File

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

2
backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePointsValidator.java → backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidator.java
View File

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

2
backend/src/main/java/org/raddatz/familienarchiv/controller/GlobalExceptionHandler.java → backend/src/main/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandler.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.controller;
package org.raddatz.familienarchiv.exception;
import java.util.stream.Collectors;

2
backend/src/main/java/org/raddatz/familienarchiv/service/FileService.java → backend/src/main/java/org/raddatz/familienarchiv/filestorage/FileService.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.filestorage;
import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.core.sync.RequestBody;

2
backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java → backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.importing;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

5
backend/src/main/java/org/raddatz/familienarchiv/model/DocumentSort.java
View File

@@ -1,5 +0,0 @@
package org.raddatz.familienarchiv.model;
public enum DocumentSort {
DATE, TITLE, SENDER, RECEIVER, UPLOAD_DATE
}

2
backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java
View File

@@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.notification.NotificationType;
import org.raddatz.familienarchiv.security.Permission;
import org.raddatz.familienarchiv.security.RequirePermission;
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.data.domain.Page;
import org.springframework.data.domain.PageRequest;

2
backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java
View File

@@ -8,7 +8,7 @@ import org.raddatz.familienarchiv.exception.ErrorCode;
import org.raddatz.familienarchiv.user.AppUser;
import org.raddatz.familienarchiv.document.comment.DocumentComment;
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.raddatz.familienarchiv.notification.Notification;
import org.raddatz.familienarchiv.notification.NotificationType;

2
backend/src/main/java/org/raddatz/familienarchiv/service/SseEmitterRegistry.java → backend/src/main/java/org/raddatz/familienarchiv/notification/SseEmitterRegistry.java
View File

@@ -1,4 +1,4 @@
package org.raddatz.familienarchiv.service;
package org.raddatz.familienarchiv.notification;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java
View File

@@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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.document.Document;
@@ -12,7 +11,7 @@ import org.raddatz.familienarchiv.document.DocumentStatus;
import org.raddatz.familienarchiv.document.annotation.AnnotationService;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

1
backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java
View File

@@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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;
import org.springframework.stereotype.Service;

3
backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java
View File

@@ -5,13 +5,12 @@ import lombok.extern.slf4j.Slf4j;
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;
import org.raddatz.familienarchiv.ocr.OcrJobRepository;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.stereotype.Service;
import java.util.List;

2
backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java
View File

@@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
import org.raddatz.familienarchiv.document.annotation.AnnotationService;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

2
backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java
View File

@@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
import org.raddatz.familienarchiv.document.annotation.AnnotationService;
import org.raddatz.familienarchiv.document.DocumentService;
import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService;
import org.raddatz.familienarchiv.service.FileService;
import org.raddatz.familienarchiv.filestorage.FileService;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

2
backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java
View File

@@ -5,7 +5,7 @@ import org.raddatz.familienarchiv.security.Permission;
import org.raddatz.familienarchiv.security.RequirePermission;
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.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;