diff --git a/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java b/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java index ef21ad6a..e4b6f12a 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java @@ -7,12 +7,12 @@ import org.raddatz.familienarchiv.model.AppUser; import org.springframework.context.annotation.DependsOn; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.model.UserGroup; import org.raddatz.familienarchiv.repository.AppUserRepository; import org.raddatz.familienarchiv.repository.DocumentRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.raddatz.familienarchiv.tag.TagRepository; import org.raddatz.familienarchiv.repository.UserGroupRepository; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java index 0e5203b2..eee963c4 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java @@ -9,7 +9,7 @@ import org.raddatz.familienarchiv.audit.AuditLogQueryService; import org.raddatz.familienarchiv.audit.PulseStatsRow; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.model.TranscriptionBlock; import org.raddatz.familienarchiv.service.CommentService; import org.raddatz.familienarchiv.service.DocumentService; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java index 5527d516..d763c120 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java @@ -8,7 +8,7 @@ import org.hibernate.annotations.UpdateTimestamp; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import java.time.LocalDateTime; import java.util.HashSet; import java.util.Set; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java index cde48a57..bacc7fc4 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java @@ -11,12 +11,12 @@ import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.geschichte.Geschichte; import org.raddatz.familienarchiv.geschichte.GeschichteStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.geschichte.GeschichteRepository; import org.raddatz.familienarchiv.geschichte.GeschichteSpecifications; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSpecifications.java b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSpecifications.java index 271c0811..65be0e33 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSpecifications.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSpecifications.java @@ -9,7 +9,7 @@ import jakarta.persistence.criteria.Subquery; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.geschichte.Geschichte; import org.raddatz.familienarchiv.geschichte.GeschichteStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.springframework.data.jpa.domain.Specification; import java.util.ArrayList; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java index 13b1b2f9..198b89b4 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java b/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java similarity index 95% rename from backend/src/main/java/org/raddatz/familienarchiv/model/Person.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/Person.java index 8115838a..4068d74d 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java @@ -1,10 +1,11 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.person; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import lombok.*; +import org.raddatz.familienarchiv.model.DisplayNameFormatter; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonController.java similarity index 90% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonController.java index 33be9f1b..dfa942d2 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonController.java @@ -1,20 +1,20 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.person; import java.util.List; import java.util.Map; import java.util.UUID; -import org.raddatz.familienarchiv.dto.PersonNameAliasDTO; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; -import org.raddatz.familienarchiv.dto.PersonUpdateDTO; +import org.raddatz.familienarchiv.person.PersonNameAliasDTO; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.PersonUpdateDTO; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonNameAlias; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameAlias; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -86,7 +86,7 @@ public class PersonController { if (dto.getLastName() == null || dto.getLastName().isBlank()) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Nachname ist Pflichtfeld"); } - if (dto.getPersonType() == org.raddatz.familienarchiv.model.PersonType.PERSON + if (dto.getPersonType() == PersonType.PERSON && (dto.getFirstName() == null || dto.getFirstName().isBlank())) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Vorname ist Pflichtfeld"); } diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAlias.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAlias.java similarity index 96% rename from backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAlias.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAlias.java index a894ff3b..6ad21a81 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAlias.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAlias.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.person; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonNameAliasDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasDTO.java similarity index 75% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/PersonNameAliasDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasDTO.java index a25ad2f0..beadc04c 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonNameAliasDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasDTO.java @@ -1,9 +1,9 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.person; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import org.raddatz.familienarchiv.model.PersonNameAliasType; +import org.raddatz.familienarchiv.person.PersonNameAliasType; public record PersonNameAliasDTO( @NotBlank @Size(max = 255) String lastName, diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/PersonNameAliasRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasRepository.java similarity index 82% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/PersonNameAliasRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasRepository.java index 1f97860b..4bba8282 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/PersonNameAliasRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasRepository.java @@ -1,6 +1,6 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.person; -import org.raddatz.familienarchiv.model.PersonNameAlias; +import org.raddatz.familienarchiv.person.PersonNameAlias; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAliasType.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasType.java similarity index 70% rename from backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAliasType.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasType.java index e4c089e6..8eceb8ca 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonNameAliasType.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameAliasType.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.person; public enum PersonNameAliasType { BIRTH, diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonNameParser.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameParser.java similarity index 99% rename from backend/src/main/java/org/raddatz/familienarchiv/service/PersonNameParser.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameParser.java index caa0cad9..659e2b32 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonNameParser.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonNameParser.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import java.util.ArrayList; import java.util.Arrays; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/PersonRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonRepository.java similarity index 97% rename from backend/src/main/java/org/raddatz/familienarchiv/repository/PersonRepository.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonRepository.java index 3a5eb3af..8b7b524d 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/repository/PersonRepository.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonRepository.java @@ -1,11 +1,11 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.person; import java.util.List; import java.util.Optional; import java.util.UUID; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonService.java similarity index 94% rename from backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonService.java index ff16f63c..007008b1 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonService.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import java.util.List; import java.util.Optional; @@ -6,17 +6,17 @@ import java.util.UUID; import org.springframework.lang.Nullable; -import org.raddatz.familienarchiv.dto.PersonNameAliasDTO; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; -import org.raddatz.familienarchiv.dto.PersonUpdateDTO; +import org.raddatz.familienarchiv.person.PersonNameAliasDTO; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.PersonUpdateDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonNameAlias; -import org.raddatz.familienarchiv.model.PersonNameAliasType; -import org.raddatz.familienarchiv.model.PersonType; -import org.raddatz.familienarchiv.repository.PersonNameAliasRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameAlias; +import org.raddatz.familienarchiv.person.PersonNameAliasType; +import org.raddatz.familienarchiv.person.PersonType; +import org.raddatz.familienarchiv.person.PersonNameAliasRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonSummaryDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java similarity index 94% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/PersonSummaryDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java index 882821c3..11f12b21 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonSummaryDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.person; import java.util.UUID; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonType.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonType.java similarity index 67% rename from backend/src/main/java/org/raddatz/familienarchiv/model/PersonType.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonType.java index db95b5bc..37c7c550 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/PersonType.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonType.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.person; public enum PersonType { PERSON, diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonTypeClassifier.java similarity index 95% rename from backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonTypeClassifier.java index 839560b1..e8d73cb8 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonTypeClassifier.java @@ -1,7 +1,7 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import java.util.List; -import org.raddatz.familienarchiv.model.PersonType; +import org.raddatz.familienarchiv.person.PersonType; public class PersonTypeClassifier { diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonUpdateDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonUpdateDTO.java similarity index 84% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/PersonUpdateDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/person/PersonUpdateDTO.java index b236811e..2cce1ea0 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/PersonUpdateDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonUpdateDTO.java @@ -1,9 +1,9 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.person; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; -import org.raddatz.familienarchiv.model.PersonType; +import org.raddatz.familienarchiv.person.PersonType; @Data public class PersonUpdateDTO { diff --git a/backend/src/main/java/org/raddatz/familienarchiv/relationship/PersonRelationship.java b/backend/src/main/java/org/raddatz/familienarchiv/relationship/PersonRelationship.java index 9e742402..2f0e5b06 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/relationship/PersonRelationship.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/relationship/PersonRelationship.java @@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.CreationTimestamp; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import java.time.Instant; import java.util.UUID; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipController.java b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipController.java index 80f2faaa..3921418e 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipController.java @@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.relationship; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.CreateRelationshipRequest; import org.raddatz.familienarchiv.relationship.dto.FamilyMemberPatchDTO; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipDTO; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceService.java b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceService.java index 7191c222..b12f7205 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceService.java @@ -1,11 +1,11 @@ package org.raddatz.familienarchiv.relationship; import lombok.RequiredArgsConstructor; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipDTO; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipWithPersonDTO; import org.raddatz.familienarchiv.relationship.dto.PersonNodeDTO; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipService.java b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipService.java index da4766d5..eae31916 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/relationship/RelationshipService.java @@ -3,14 +3,14 @@ package org.raddatz.familienarchiv.relationship; import lombok.RequiredArgsConstructor; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.CreateRelationshipRequest; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipDTO; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipWithPersonDTO; import org.raddatz.familienarchiv.relationship.dto.NetworkDTO; import org.raddatz.familienarchiv.relationship.dto.PersonNodeDTO; import org.raddatz.familienarchiv.relationship.dto.RelationshipDTO; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 d93ee189..65b1b9cb 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java @@ -22,7 +22,7 @@ import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.model.ScriptType; import org.raddatz.familienarchiv.model.TrainingLabel; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.repository.DocumentRepository; import org.springframework.context.annotation.Lazy; @@ -33,6 +33,7 @@ import org.springframework.data.domain.Sort; 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.tag.TagService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java index 8e20d615..65b2e53f 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java @@ -10,7 +10,7 @@ import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentVersion; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.repository.DocumentVersionRepository; import org.springframework.security.core.Authentication; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java index 5e336365..5538088e 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java @@ -8,8 +8,11 @@ import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameParser; +import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.tag.TagService; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java index 97625d29..bb5a7919 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java @@ -10,6 +10,7 @@ import org.raddatz.familienarchiv.model.OcrTrainingRun; import org.raddatz.familienarchiv.model.SenderModel; import org.raddatz.familienarchiv.model.TrainingStatus; import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository; +import org.raddatz.familienarchiv.person.PersonService; import org.slf4j.MDC; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java index 10be59c1..58a14bb6 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java @@ -9,6 +9,7 @@ import org.raddatz.familienarchiv.model.SenderModel; import org.raddatz.familienarchiv.model.TrainingStatus; import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository; import org.raddatz.familienarchiv.repository.SenderModelRepository; +import org.raddatz.familienarchiv.person.PersonService; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java index 64979473..2cf016b7 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java @@ -1,6 +1,7 @@ package org.raddatz.familienarchiv.service; import lombok.RequiredArgsConstructor; +import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.dto.StatsDTO; import org.springframework.stereotype.Service; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java index cbf2ece6..a5bc3c76 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java @@ -10,7 +10,7 @@ import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.model.DocumentVersion; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.service.CustomUserDetailsService; import org.raddatz.familienarchiv.service.DocumentService; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java index 183d024f..87593460 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/TranscriptionQueueControllerTest.java @@ -5,7 +5,7 @@ import org.raddatz.familienarchiv.config.SecurityConfig; import org.raddatz.familienarchiv.dto.TranscriptionQueueItemDTO; import org.raddatz.familienarchiv.dto.TranscriptionWeeklyStatsDTO; import org.raddatz.familienarchiv.repository.DocumentRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.service.CustomUserDetailsService; import org.raddatz.familienarchiv.service.TranscriptionQueueService; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java index e6fcc228..f27e8bb0 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java @@ -8,10 +8,10 @@ import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.geschichte.Geschichte; import org.raddatz.familienarchiv.geschichte.GeschichteStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.repository.AppUserRepository; import org.raddatz.familienarchiv.geschichte.GeschichteRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.raddatz.familienarchiv.security.Permission; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java index 57c24283..454e8d8c 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java @@ -14,11 +14,11 @@ import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.geschichte.Geschichte; import org.raddatz.familienarchiv.geschichte.GeschichteStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.geschichte.GeschichteRepository; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.raddatz.familienarchiv.service.UserService; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/PersonControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java similarity index 97% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/PersonControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java index 9de8a3a1..ebae6a57 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/PersonControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java @@ -1,17 +1,17 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.model.Document; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonNameAlias; -import org.raddatz.familienarchiv.model.PersonNameAliasType; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameAlias; +import org.raddatz.familienarchiv.person.PersonNameAliasType; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.service.CustomUserDetailsService; import org.raddatz.familienarchiv.service.DocumentService; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; import org.raddatz.familienarchiv.config.SecurityConfig; @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -240,7 +240,7 @@ class PersonControllerTest { @WithMockUser(authorities = "WRITE_ALL") void createPerson_returns200_whenValid() throws Exception { Person saved = Person.builder().id(UUID.randomUUID()).firstName("Hans").lastName("Müller").build(); - when(personService.createPerson(any(org.raddatz.familienarchiv.dto.PersonUpdateDTO.class))).thenReturn(saved); + when(personService.createPerson(any(org.raddatz.familienarchiv.person.PersonUpdateDTO.class))).thenReturn(saved); mockMvc.perform(post("/api/persons") .contentType(MediaType.APPLICATION_JSON) @@ -253,7 +253,7 @@ class PersonControllerTest { @WithMockUser(authorities = "WRITE_ALL") void createPerson_returns200_forInstitution_withoutFirstName() throws Exception { Person saved = Person.builder().id(UUID.randomUUID()).lastName("Verlag GmbH").build(); - when(personService.createPerson(any(org.raddatz.familienarchiv.dto.PersonUpdateDTO.class))).thenReturn(saved); + when(personService.createPerson(any(org.raddatz.familienarchiv.person.PersonUpdateDTO.class))).thenReturn(saved); mockMvc.perform(post("/api/persons") .contentType(MediaType.APPLICATION_JSON) @@ -265,8 +265,8 @@ class PersonControllerTest { @Test @WithMockUser(authorities = "WRITE_ALL") void createPerson_trimsTitle_beforePersisting() throws Exception { - ArgumentCaptor captor = - ArgumentCaptor.forClass(org.raddatz.familienarchiv.dto.PersonUpdateDTO.class); + ArgumentCaptor captor = + ArgumentCaptor.forClass(org.raddatz.familienarchiv.person.PersonUpdateDTO.class); Person saved = Person.builder().id(UUID.randomUUID()).firstName("Hans").lastName("Müller").build(); when(personService.createPerson(captor.capture())).thenReturn(saved); @@ -393,7 +393,7 @@ class PersonControllerTest { UUID id = UUID.randomUUID(); Person saved = Person.builder().id(id).firstName("Maria").lastName("Raddatz") .alias("Oma Maria").birthYear(1901).deathYear(1975).notes("Some notes").build(); - when(personService.createPerson(any(org.raddatz.familienarchiv.dto.PersonUpdateDTO.class))).thenReturn(saved); + when(personService.createPerson(any(org.raddatz.familienarchiv.person.PersonUpdateDTO.class))).thenReturn(saved); mockMvc.perform(post("/api/persons") .contentType(MediaType.APPLICATION_JSON) diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonNameParserTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonNameParserTest.java similarity index 99% rename from backend/src/test/java/org/raddatz/familienarchiv/service/PersonNameParserTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonNameParserTest.java index 1ea4a22e..97c96d16 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonNameParserTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonNameParserTest.java @@ -1,8 +1,8 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; -import org.raddatz.familienarchiv.model.PersonNameAliasType; -import org.raddatz.familienarchiv.model.PersonType; +import org.raddatz.familienarchiv.person.PersonNameAliasType; +import org.raddatz.familienarchiv.person.PersonType; import java.util.List; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/PersonRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonRepositoryTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/repository/PersonRepositoryTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonRepositoryTest.java index 26eccf6a..0e0766fa 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/PersonRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonRepositoryTest.java @@ -1,19 +1,20 @@ -package org.raddatz.familienarchiv.repository; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonNameAlias; -import org.raddatz.familienarchiv.model.PersonNameAliasType; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameAlias; +import org.raddatz.familienarchiv.person.PersonNameAliasType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.context.annotation.Import; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; +import org.raddatz.familienarchiv.repository.DocumentRepository; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceIntegrationTest.java similarity index 92% rename from backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceIntegrationTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceIntegrationTest.java index a13c7017..02cc7aa4 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceIntegrationTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceIntegrationTest.java @@ -1,10 +1,10 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonType; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonType; +import org.raddatz.familienarchiv.person.PersonRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceTest.java index 24827177..1ad9ce27 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceTest.java @@ -1,20 +1,20 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.raddatz.familienarchiv.dto.PersonNameAliasDTO; -import org.raddatz.familienarchiv.dto.PersonSummaryDTO; -import org.raddatz.familienarchiv.dto.PersonUpdateDTO; +import org.raddatz.familienarchiv.person.PersonNameAliasDTO; +import org.raddatz.familienarchiv.person.PersonSummaryDTO; +import org.raddatz.familienarchiv.person.PersonUpdateDTO; import org.raddatz.familienarchiv.exception.DomainException; -import org.raddatz.familienarchiv.model.Person; -import org.raddatz.familienarchiv.model.PersonNameAlias; -import org.raddatz.familienarchiv.model.PersonNameAliasType; -import org.raddatz.familienarchiv.model.PersonType; -import org.raddatz.familienarchiv.repository.PersonNameAliasRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; +import org.raddatz.familienarchiv.person.Person; +import org.raddatz.familienarchiv.person.PersonNameAlias; +import org.raddatz.familienarchiv.person.PersonNameAliasType; +import org.raddatz.familienarchiv.person.PersonType; +import org.raddatz.familienarchiv.person.PersonNameAliasRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.springframework.web.server.ResponseStatusException; import java.util.List; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/model/PersonTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonTest.java similarity index 97% rename from backend/src/test/java/org/raddatz/familienarchiv/model/PersonTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonTest.java index 72674925..9223c0bf 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/model/PersonTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonTypeClassifierTest.java similarity index 97% rename from backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/person/PersonTypeClassifierTest.java index 1dcaec73..f3942863 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonTypeClassifierTest.java @@ -1,9 +1,9 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.person; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.raddatz.familienarchiv.model.PersonType; +import org.raddatz.familienarchiv.person.PersonType; import static org.assertj.core.api.Assertions.assertThat; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceServiceTest.java index a146b564..964c378f 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipInferenceServiceTest.java @@ -5,10 +5,10 @@ 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.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipDTO; import org.raddatz.familienarchiv.relationship.dto.InferredRelationshipWithPersonDTO; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import java.time.Instant; import java.util.List; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceIntegrationTest.java index 4cfd0960..fa5283a0 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceIntegrationTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceIntegrationTest.java @@ -6,13 +6,13 @@ import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.CreateRelationshipRequest; import org.raddatz.familienarchiv.relationship.dto.NetworkDTO; import org.raddatz.familienarchiv.relationship.dto.RelationshipDTO; -import org.raddatz.familienarchiv.repository.PersonNameAliasRepository; -import org.raddatz.familienarchiv.repository.PersonRepository; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonNameAliasRepository; +import org.raddatz.familienarchiv.person.PersonRepository; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceTest.java index 6e378459..b476e156 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/relationship/RelationshipServiceTest.java @@ -8,9 +8,9 @@ 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.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.relationship.dto.CreateRelationshipRequest; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.dao.DataIntegrityViolationException; import org.raddatz.familienarchiv.relationship.dto.NetworkDTO; 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 a4d09749..221c4660 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentFtsTest.java @@ -8,11 +8,12 @@ import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.model.TranscriptionBlock; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; 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 e50a6133..ec00b824 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentRepositoryTest.java @@ -6,12 +6,13 @@ import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +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.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; +import org.raddatz.familienarchiv.person.PersonRepository; 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/DocumentSearchEnrichmentTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java index 7dffdc4a..e1987092 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSearchEnrichmentTest.java @@ -9,11 +9,12 @@ import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentAnnotation; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.model.TranscriptionBlock; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; +import org.raddatz.familienarchiv.person.PersonRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSpecificationsTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSpecificationsTest.java index 4a7cee7a..df6bea1c 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSpecificationsTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/DocumentSpecificationsTest.java @@ -6,10 +6,11 @@ import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagRepository; +import org.raddatz.familienarchiv.person.PersonRepository; 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/TrainingBlockQueryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java index e0086037..eba832dd 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java @@ -5,6 +5,8 @@ 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.person.Person; +import org.raddatz.familienarchiv.person.PersonRepository; 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/service/DocumentServiceSortTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java index 0493164a..ec1df6b4 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java @@ -12,6 +12,7 @@ import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; import org.raddatz.familienarchiv.repository.DocumentRepository; import org.raddatz.familienarchiv.tag.TagService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; 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 630b2b92..fa63c5e4 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java @@ -20,10 +20,11 @@ import org.raddatz.familienarchiv.tag.TagOperator; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.repository.DocumentRepository; import org.raddatz.familienarchiv.tag.TagService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java index ba38d7b9..5f4ca092 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java @@ -12,7 +12,7 @@ import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.AppUser; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentVersion; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.repository.DocumentVersionRepository; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java index 3cf356ee..9a9e2254 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java @@ -9,9 +9,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.Document; import org.raddatz.familienarchiv.model.DocumentStatus; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.tag.TagService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.test.util.ReflectionTestUtils; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.services.s3.S3Client; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java index 3fd42d63..c892fe68 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java @@ -6,12 +6,12 @@ import org.raddatz.familienarchiv.dto.TrainingHistoryResponse; import org.raddatz.familienarchiv.dto.TrainingInfoResponse; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.model.OcrTrainingRun; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.model.SenderModel; import org.raddatz.familienarchiv.model.TrainingStatus; import org.raddatz.familienarchiv.model.TranscriptionBlock; import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository; -import org.raddatz.familienarchiv.service.PersonService; +import org.raddatz.familienarchiv.person.PersonService; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java index 675236f3..1c74e84a 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java @@ -9,9 +9,10 @@ import org.raddatz.familienarchiv.model.SenderModel; import org.raddatz.familienarchiv.model.TrainingStatus; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository; import org.raddatz.familienarchiv.repository.SenderModelRepository; +import org.raddatz.familienarchiv.person.PersonService; 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/service/StatsServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java index 4a001a78..25cb4e67 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java @@ -6,6 +6,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.dto.StatsDTO; +import org.raddatz.familienarchiv.person.PersonService; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java index f2b44ae4..4de8613b 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java @@ -16,7 +16,7 @@ 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.model.Person; +import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.model.PersonMention; import org.raddatz.familienarchiv.model.ScriptType; import org.raddatz.familienarchiv.model.TranscriptionBlock;