switch to HsOfficeContactRbacEntity + HsOfficeContactBaseEntity as subclasses of HsOfficeContact

.run/ImportHostingAssets.run.xml

@@ -0,0 +1,36 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ImportHostingAssets" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="HSADMINNG_MIGRATION_DATA_PATH" value="migration-prod" />
+          <entry key="HSADMINNG_POSTGRES_ADMIN_USERNAME" value="admin" />
+          <entry key="HSADMINNG_POSTGRES_RESTRICTED_USERNAME" value="restricted" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":importHostingAssets" />
+          <option value="--tests" />
+          <option value="&quot;net.hostsharing.hsadminng.hs.migration.ImportHostingAssets&quot;" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="coverage" sample_coverage="false" />
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/ImportOfficeData.run.xml

@@ -0,0 +1,36 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ImportOfficeData" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="HSADMINNG_MIGRATION_DATA_PATH" value="migration" />
+          <entry key="HSADMINNG_POSTGRES_ADMIN_USERNAME" value="admin" />
+          <entry key="HSADMINNG_POSTGRES_RESTRICTED_USERNAME" value="restricted" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":importOfficeData" />
+          <option value="--tests" />
+          <option value="&quot;net.hostsharing.hsadminng.hs.migration.ImportOfficeData&quot;" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="coverage" sample_coverage="false" />
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAsset.java

@@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.hs.hosting.asset;
 
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.stringify.Stringify;
@@ -36,7 +36,7 @@ public interface HsHostingAsset extends Stringifyable, RbacObject<HsHostingAsset
     String getIdentifier();
     HsBookingItemEntity getBookingItem();
     HsHostingAsset getAssignedToAsset();
-    HsOfficeContactRbacEntity getAlarmContact();
+    HsOfficeContactBareEntity getAlarmContact();
     List<? extends HsHostingAsset> getSubHostingAssets();
     String getCaption();
     Map<String, Object> getConfig();

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetEntity.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
@@ -90,7 +91,7 @@ public class HsHostingAssetEntity implements HsHostingAsset {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "alarmcontactuuid")
-    private HsOfficeContactRbacEntity alarmContact;
+    private HsOfficeContactBareEntity alarmContact;
 
     @OneToMany(cascade = CascadeType.REFRESH, orphanRemoval = true, fetch = FetchType.LAZY)
     @JoinColumn(name = "parentassetuuid", referencedColumnName = "uuid")

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetEntityPatcher.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;
 
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetPatchResource;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.mapper.EntityPatcher;
 import net.hostsharing.hsadminng.mapper.KeyValueMap;
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;
@@ -29,7 +29,7 @@ public class HsHostingAssetEntityPatcher implements EntityPatcher<HsHostingAsset
                 // HOWTO: patch nullable JSON resource uuid to an ntity reference
                 .ifPresent(newValue -> entity.setAlarmContact(
                             Optional.ofNullable(newValue)
-                                .map(uuid -> em.getReference(HsOfficeContactRbacEntity.class, newValue))
+                                .map(uuid -> em.getReference(HsOfficeContactBareEntity.class, newValue))
                                 .orElse(null)));
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidator.java

@@ -5,7 +5,7 @@ import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
 import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
 import net.hostsharing.hsadminng.hs.validation.ValidatableProperty;
 
@@ -213,7 +213,7 @@ public abstract class HostingAssetEntityValidator extends HsEntityValidator<HsHo
         }
     }
 
-    static class AlarmContact extends ReferenceValidator<HsOfficeContactRbacEntity, Enum<?>> {
+    static class AlarmContact extends ReferenceValidator<HsOfficeContactBareEntity, Enum<?>> {
 
         AlarmContact(final HsHostingAssetType.RelationPolicy policy) {
             super(policy, HsHostingAsset::getAlarmContact);

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java

@@ -0,0 +1,106 @@
+package net.hostsharing.hsadminng.hs.office.contact;
+
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+import net.hostsharing.hsadminng.errors.DisplayName;
+import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
+import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
+
+@MappedSuperclass
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
+@FieldNameConstants
+@DisplayName("Contact")
+public class HsOfficeContact implements Stringifyable, RbacObject<HsOfficeContact> {
+
+    private static Stringify<HsOfficeContact> toString = stringify(HsOfficeContact.class, "contact")
+            .withProp(Fields.caption, HsOfficeContact::getCaption)
+            .withProp(Fields.emailAddresses, HsOfficeContact::getEmailAddresses);
+
+    @Id
+    @GeneratedValue(generator = "UUID")
+    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
+    private UUID uuid;
+
+    @Version
+    private int version;
+
+    @Column(name = "caption")
+    private String caption;
+
+    @Column(name = "postaladdress")
+    private String postalAddress; // multiline free-format text
+
+    @Builder.Default
+    @Setter(AccessLevel.NONE)
+    @Type(JsonType.class)
+    @Column(name = "emailaddresses")
+    private Map<String, String> emailAddresses = new HashMap<>();
+
+    @Transient
+    private PatchableMapWrapper<String> emailAddressesWrapper;
+
+    @Builder.Default
+    @Setter(AccessLevel.NONE)
+    @Type(JsonType.class)
+    @Column(name = "phonenumbers")
+    private Map<String, String> phoneNumbers = new HashMap<>();
+
+    @Transient
+    private PatchableMapWrapper<String> phoneNumbersWrapper;
+
+    public PatchableMapWrapper<String> getEmailAddresses() {
+        return PatchableMapWrapper.of(
+                emailAddressesWrapper,
+                (newWrapper) -> {emailAddressesWrapper = newWrapper;},
+                emailAddresses);
+    }
+
+    public void putEmailAddresses(Map<String, String> newEmailAddresses) {
+        getEmailAddresses().assign(newEmailAddresses);
+    }
+
+    public PatchableMapWrapper<String> getPhoneNumbers() {
+        return PatchableMapWrapper.of(phoneNumbersWrapper, (newWrapper) -> {phoneNumbersWrapper = newWrapper;}, phoneNumbers);
+    }
+
+    public void putPhoneNumbers(Map<String, String> newPhoneNumbers) {
+        getPhoneNumbers().assign(newPhoneNumbers);
+    }
+
+    @Override
+    public String toString() {
+        return toString.apply(this);
+    }
+
+    @Override
+    public String toShortString() {
+        return caption;
+    }
+}

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactBareEntity.java

@@ -0,0 +1,23 @@
+package net.hostsharing.hsadminng.hs.office.contact;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+import net.hostsharing.hsadminng.errors.DisplayName;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "hs_office_contact")
+@Getter
+@Setter
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+@FieldNameConstants
+@DisplayName("BareContact")
+public class HsOfficeContactBareEntity extends HsOfficeContact {
+
+}

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactBareRepository.java

@@ -0,0 +1,26 @@
+package net.hostsharing.hsadminng.hs.office.contact;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public interface HsOfficeContactBareRepository extends Repository<HsOfficeContactBareEntity, UUID> {
+
+    Optional<HsOfficeContactBareEntity> findByUuid(UUID id);
+
+    @Query("""
+            SELECT c FROM HsOfficeContactBareEntity c
+                WHERE :caption is null
+                    OR c.caption like concat(cast(:caption as text), '%')
+               """)
+    List<HsOfficeContactBareEntity> findContactByOptionalCaptionLike(String caption);
+
+    HsOfficeContactBareEntity save(final HsOfficeContactBareEntity entity);
+
+    int deleteByUuid(final UUID uuid);
+
+    long count();
+}

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java

@@ -29,7 +29,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     private Mapper mapper;
 
     @Autowired
-    private HsOfficeContactRepository contactRepo;
+    private HsOfficeContactRbacRepository contactRepo;
 
     @Override
     @Transactional(readOnly = true)

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntity.java

@@ -1,148 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.contact;
-
-import io.hypersistence.utils.hibernate.type.json.JsonType;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.FieldNameConstants;
-import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.errors.DisplayName;
-import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
-import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
-import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
-import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.persistence.Version;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static jakarta.persistence.InheritanceType.TABLE_PER_CLASS;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.GUEST;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.REFERRER;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
-
-@Entity
-@Table(name = "hs_office_contact")
-@Inheritance(strategy = TABLE_PER_CLASS)
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldNameConstants
-@DisplayName("Contact")
-public class HsOfficeContactEntity implements Stringifyable, RbacObject<HsOfficeContactEntity> {
-
-    private static Stringify<HsOfficeContactEntity> toString = stringify(HsOfficeContactEntity.class, "contact")
-            .withProp(Fields.caption, HsOfficeContactEntity::getCaption)
-            .withProp(Fields.emailAddresses, HsOfficeContactEntity::getEmailAddresses);
-
-    @Id
-    @GeneratedValue(generator = "UUID")
-    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
-    private UUID uuid;
-
-    @Version
-    private int version;
-
-    @Column(name = "caption")
-    private String caption;
-
-    @Column(name = "postaladdress")
-    private String postalAddress; // multiline free-format text
-
-    @Builder.Default
-    @Setter(AccessLevel.NONE)
-    @Type(JsonType.class)
-    @Column(name = "emailaddresses")
-    private Map<String, String> emailAddresses = new HashMap<>();
-
-    @Transient
-    private PatchableMapWrapper<String> emailAddressesWrapper;
-
-    @Builder.Default
-    @Setter(AccessLevel.NONE)
-    @Type(JsonType.class)
-    @Column(name = "phonenumbers")
-    private Map<String, String> phoneNumbers = new HashMap<>();
-
-    @Transient
-    private PatchableMapWrapper<String> phoneNumbersWrapper;
-
-    public PatchableMapWrapper<String> getEmailAddresses() {
-        return PatchableMapWrapper.of(emailAddressesWrapper, (newWrapper) -> {emailAddressesWrapper = newWrapper; }, emailAddresses );
-    }
-
-    public void putEmailAddresses(Map<String, String> newEmailAddresses) {
-        getEmailAddresses().assign(newEmailAddresses);
-    }
-
-    public PatchableMapWrapper<String> getPhoneNumbers() {
-        return PatchableMapWrapper.of(phoneNumbersWrapper, (newWrapper) -> {phoneNumbersWrapper = newWrapper; }, phoneNumbers );
-    }
-
-    public void putPhoneNumbers(Map<String, String> newPhoneNumbers) {
-        getPhoneNumbers().assign(newPhoneNumbers);
-    }
-
-    @Override
-    public String toString() {
-        return toString.apply(this);
-    }
-
-    @Override
-    public String toShortString() {
-        return caption;
-    }
-
-    public HsOfficeRelationEntity.HsOfficeRelationEntityBuilder<?, ?> toBuilder() {
-        return null;
-    }
-    public static RbacView rbac() {
-        return rbacViewFor("contact", HsOfficeContactEntity.class)
-                .withIdentityView(SQL.projection("caption"))
-                .withUpdatableColumns("caption", "postalAddress", "emailAddresses", "phoneNumbers")
-                .createRole(OWNER, (with) -> {
-                    with.owningUser(CREATOR);
-                    with.incomingSuperRole(GLOBAL, ADMIN);
-                    with.permission(DELETE);
-                })
-                .createSubRole(ADMIN, (with) -> {
-                    with.permission(UPDATE);
-                })
-                .createSubRole(REFERRER, (with) -> {
-                    with.permission(SELECT);
-                })
-                .toRole(GLOBAL, GUEST).grantPermission(INSERT);
-    }
-
-    public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("5-hs-office/501-contact/5013-hs-office-contact-rbac");
-    }
-}

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacEntity.java

@@ -4,7 +4,6 @@ import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayName;
-import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
@@ -21,16 +20,12 @@ import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 @Table(name = "hs_office_contact_rv")
 @Getter
 @Setter
-@SuperBuilder
 @NoArgsConstructor
+@SuperBuilder(toBuilder = true)
 @FieldNameConstants
-@DisplayName("Contact")
+@DisplayName("RbacContact")
-public class HsOfficeContactRbacEntity extends HsOfficeContactEntity {
+public class HsOfficeContactRbacEntity extends HsOfficeContact {
 
-    @Override
-    public HsOfficeRelationEntity.HsOfficeRelationEntityBuilder<?, ?> toBuilder() {
-        return null;
-    }
 
     public static RbacView rbac() {
         return rbacViewFor("contact", HsOfficeContactRbacEntity.class)

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-public interface HsOfficeContactRepository extends Repository<HsOfficeContactRbacEntity, UUID> {
+public interface HsOfficeContactRbacRepository extends Repository<HsOfficeContactRbacEntity, UUID> {
 
     Optional<HsOfficeContactRbacEntity> findByUuid(UUID id);
 

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java

@@ -33,7 +33,7 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
                 JOIN HsOfficePersonEntity person
                     ON person.uuid = partner.partnerRel.holder.uuid
                         OR person.uuid = debitor.debitorRel.holder.uuid
-                JOIN HsOfficeContactEntity contact
+                JOIN HsOfficeContactBareEntity contact
                     ON contact.uuid = debitor.debitorRel.contact.uuid 
                         OR contact.uuid = partner.partnerRel.contact.uuid
                 WHERE :name is null

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java

@@ -2,8 +2,7 @@ package net.hostsharing.hsadminng.hs.office.partner;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.errors.ReferenceNotFoundException;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficePartnersApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource;
@@ -162,7 +161,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
         entity.setType(HsOfficeRelationType.PARTNER);
         entity.setAnchor(ref(HsOfficePersonEntity.class, resource.getAnchorUuid()));
         entity.setHolder(ref(HsOfficePersonEntity.class, resource.getHolderUuid()));
-        entity.setContact(ref(HsOfficeContactEntity.class, resource.getContactUuid()));
+        entity.setContact(ref(HsOfficeContactBareEntity.class, resource.getContactUuid()));
         em.persist(entity);
         return entity;
     }

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java

@@ -6,8 +6,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayName;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContact;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
@@ -53,7 +52,7 @@ public class HsOfficePartnerEntity implements Stringifyable, RbacObject<HsOffice
                     .orElse(null))
             .withProp(p -> ofNullable(p.getPartnerRel())
                     .map(HsOfficeRelationEntity::getContact)
-                    .map(HsOfficeContactEntity::toShortString)
+                    .map(HsOfficeContact::toShortString)
                     .orElse(null))
             .quotedValues(false);
 

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java

@@ -16,7 +16,7 @@ public interface HsOfficePartnerRepository extends Repository<HsOfficePartnerEnt
     @Query("""
             SELECT partner FROM HsOfficePartnerEntity partner
                 JOIN HsOfficeRelationEntity rel ON rel.uuid = partner.partnerRel.uuid
-                JOIN HsOfficeContactEntity contact ON contact.uuid = rel.contact.uuid
+                JOIN HsOfficeContactBareEntity contact ON contact.uuid = rel.contact.uuid
                 JOIN HsOfficePersonEntity person ON person.uuid = rel.holder.uuid
                 WHERE :name is null
                     OR partner.details.birthName like concat(cast(:name as text), '%')

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.relation;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeRelationsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.*;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
@@ -37,7 +37,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     private HsOfficePersonRepository holderRepo;
 
     @Autowired
-    private HsOfficeContactRepository contactRepo;
+    private HsOfficeContactBareRepository contactBareRepo;
 
     @PersistenceContext
     private EntityManager em;
@@ -77,7 +77,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
         entityToSave.setHolder(holderRepo.findByUuid(body.getHolderUuid()).orElseThrow(
                 () -> new NoSuchElementException("cannot find holderUuid " + body.getHolderUuid())
         ));
-        entityToSave.setContact(contactRepo.findByUuid(body.getContactUuid()).orElseThrow(
+        entityToSave.setContact(contactBareRepo.findByUuid(body.getContactUuid()).orElseThrow(
                 () -> new NoSuchElementException("cannot find contactUuid " + body.getContactUuid())
         ));
 

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntity.java

@@ -3,8 +3,7 @@ package net.hostsharing.hsadminng.hs.office.relation;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.rbac.rbacobject.RbacObject;
@@ -70,7 +69,7 @@ public abstract class HsOfficeRelationEntity implements RbacObject<HsOfficeRelat
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "contactuuid")
-    private HsOfficeContactEntity contact;
+    private HsOfficeContactBareEntity contact;
 
     @Column(name = "type")
     @Enumerated(EnumType.STRING)

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcher.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.relation;
 
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationPatchResource;
 import net.hostsharing.hsadminng.mapper.EntityPatcher;
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;
@@ -22,7 +22,7 @@ class HsOfficeRelationEntityPatcher implements EntityPatcher<HsOfficeRelationPat
     public void apply(final HsOfficeRelationPatchResource resource) {
         OptionalFromJson.of(resource.getContactUuid()).ifPresent(newValue -> {
             verifyNotNull(newValue, "contact");
-            entity.setContact(em.getReference(HsOfficeContactRbacEntity.class, newValue));
+            entity.setContact(em.getReference(HsOfficeContactBareEntity.class, newValue));
         });
     }
 

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java

@@ -9,7 +9,7 @@ import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRepository;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRepository;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacRepository;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
@@ -62,7 +62,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
     HsOfficeDebitorRepository debitorRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactRbacRepository contactRepo;
 
     @Autowired
     JpaAttempt jpaAttempt;

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java

@@ -32,7 +32,7 @@ import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_C
 import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_SERVER_BOOKING_ITEM;
 import static net.hostsharing.hsadminng.hs.hosting.asset.TestHsHostingAssetEntities.TEST_MANAGED_SERVER_HOSTING_ASSET;
 import static net.hostsharing.hsadminng.hs.hosting.asset.TestHsHostingAssetEntities.TEST_MANAGED_WEBSPACE_HOSTING_ASSET;
-import static net.hostsharing.hsadminng.hs.office.contact.TestHsOfficeContact.TEST_CONTACT;
+import static net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareTestEntity.TEST_BARE_CONTACT;
 import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -75,7 +75,7 @@ public class HsHostingAssetControllerRestTest {
                                 .bookingItem(TEST_CLOUD_SERVER_BOOKING_ITEM)
                                 .identifier("vm1234")
                                 .caption("some fake cloud-server")
-                                .alarmContact(TEST_CONTACT)
+                                .alarmContact(TEST_BARE_CONTACT)
                                 .build()),
                 """
                     [
@@ -101,7 +101,7 @@ public class HsHostingAssetControllerRestTest {
                                 .bookingItem(TEST_MANAGED_SERVER_BOOKING_ITEM)
                                 .identifier("vm1234")
                                 .caption("some fake managed-server")
-                                .alarmContact(TEST_CONTACT)
+                                .alarmContact(TEST_BARE_CONTACT)
                                 .config(Map.ofEntries(
                                         entry("monit_max_ssd_usage", 70),
                                         entry("monit_max_cpu_usage", 80),

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetEntityPatcherUnitTest.java

@@ -1,6 +1,7 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;
 
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetPatchResource;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.mapper.KeyValueMap;
 import net.hostsharing.hsadminng.rbac.test.PatchUnitTestBase;
@@ -48,7 +49,7 @@ class HsHostingAssetEntityPatcherUnitTest extends PatchUnitTestBase<
             entry("SSD", 256),
             entry("MEM", 64)
     );
-    final HsOfficeContactRbacEntity givenInitialContact = HsOfficeContactRbacEntity.builder()
+    final HsOfficeContactBareEntity givenInitialContact = HsOfficeContactBareEntity.builder()
             .uuid(UUID.randomUUID())
             .build();
 
@@ -111,7 +112,7 @@ class HsHostingAssetEntityPatcherUnitTest extends PatchUnitTestBase<
         );
     }
 
-    static HsOfficeContactRbacEntity newContact(final UUID uuid) {
+    static HsOfficeContactBareEntity newContact(final UUID uuid) {
-        return HsOfficeContactRbacEntity.builder().uuid(uuid).build();
+        return HsOfficeContactBareEntity.builder().uuid(uuid).build();
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/migration/HsHostingAssetBareEntity.java

@@ -10,7 +10,7 @@ import lombok.Setter;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
 import org.hibernate.annotations.Type;
 
@@ -69,7 +69,7 @@ public class HsHostingAssetBareEntity implements HsHostingAsset {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "alarmcontactuuid")
-    private HsOfficeContactRbacEntity alarmContact;
+    private HsOfficeContactBareEntity alarmContact;
 
     @OneToMany(cascade = CascadeType.REFRESH, orphanRemoval = true, fetch = FetchType.LAZY)
     @JoinColumn(name = "parentassetuuid", referencedColumnName = "uuid")

src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java

@@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.hs.migration;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionEntity;
 import net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType;
 import net.hostsharing.hsadminng.hs.office.coopshares.HsOfficeCoopSharesTransactionEntity;
@@ -121,7 +121,7 @@ public class ImportOfficeData extends CsvDataImport {
         -1
     );
 
-    static Map<Integer, HsOfficeContactRbacEntity> contacts = new WriteOnceMap<>();
+    static Map<Integer, HsOfficeContactBareEntity> contacts = new WriteOnceMap<>();
     static Map<Integer, HsOfficePersonEntity> persons = new WriteOnceMap<>();
     static Map<Integer, HsOfficePartnerEntity> partners = new WriteOnceMap<>();
     static Map<Integer, HsOfficeDebitorEntity> debitors = new WriteOnceMap<>();
@@ -979,7 +979,7 @@ public class ImportOfficeData extends CsvDataImport {
                         contactPerson = addPerson(HsOfficePersonEntity.builder().build(), rec);
                     }
 
-                    final var contact = HsOfficeContactRbacEntity.builder().build();
+                    final var contact = HsOfficeContactBareEntity.builder().build();
                     initContact(contact, rec);
 
                     if (containsPartnerRel(rec)) {
@@ -1057,7 +1057,7 @@ public class ImportOfficeData extends CsvDataImport {
             final HsOfficeRelationType type,
             final HsOfficePersonEntity anchor,
             final HsOfficePersonEntity holder,
-            final HsOfficeContactRbacEntity contact) {
+            final HsOfficeContactBareEntity contact) {
         final var rel = HsOfficeRelationBareEntity.builder()
                 .anchor(anchor)
                 .holder(holder)
@@ -1118,7 +1118,7 @@ public class ImportOfficeData extends CsvDataImport {
         assertThat(unexpectedRolesSet).isEmpty();
     }
 
-    private HsOfficeContactRbacEntity initContact(final HsOfficeContactRbacEntity contact, final Record contactRecord) {
+    private HsOfficeContactBareEntity initContact(final HsOfficeContactBareEntity contact, final Record contactRecord) {
 
         contact.setCaption(toCaption(
                 contactRecord.getString("salut"),

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactBareTestEntity.java

@@ -0,0 +1,16 @@
+package net.hostsharing.hsadminng.hs.office.contact;
+
+import java.util.Map;
+
+public class HsOfficeContactBareTestEntity {
+
+    public static final HsOfficeContactBareEntity TEST_BARE_CONTACT = hsOfficeContact("some contact", "some-contact@example.com");
+
+    static public HsOfficeContactBareEntity hsOfficeContact(final String caption, final String emailAddr) {
+        return HsOfficeContactBareEntity.builder()
+                .caption(caption)
+                .postalAddress("address of " + caption)
+                .emailAddresses(Map.of("main", emailAddr))
+                .build();
+    }
+}

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactControllerAcceptanceTest.java

@@ -45,7 +45,7 @@ class HsOfficeContactControllerAcceptanceTest extends ContextBasedTestWithCleanu
     Context contextMock;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactRbacRepository contactRepo;
 
     @Autowired
     JpaAttempt jpaAttempt;

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactPatcherUnitTest.java

@@ -13,7 +13,7 @@ import static net.hostsharing.hsadminng.mapper.PatchMap.patchMap;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
 @TestInstance(PER_CLASS)
-class HsOfficeContactEntityPatcherUnitTest extends PatchUnitTestBase<
+class HsOfficeContactPatcherUnitTest extends PatchUnitTestBase<
         HsOfficeContactPatchResource,
         HsOfficeContactRbacEntity
         > {

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepositoryIntegrationTest.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
 
-import static net.hostsharing.hsadminng.hs.office.contact.TestHsOfficeContact.hsOfficeContact;
+import static net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacTestEntity.hsOfficeContact;
 import static net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantEntity.distinctGrantDisplaysOf;
 import static net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleEntity.distinctRoleNamesOf;
 import static net.hostsharing.hsadminng.rbac.test.JpaAttempt.attempt;
@@ -29,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @DataJpaTest
 @Import( { Context.class, JpaAttempt.class })
-class HsOfficeContactRepositoryIntegrationTest extends ContextBasedTestWithCleanup {
+class HsOfficeContactRbacRepositoryIntegrationTest extends ContextBasedTestWithCleanup {
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactRbacRepository contactRepo;
 
     @Autowired
     RawRbacRoleRepository rawRoleRepo;

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacTestEntity.java

@@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.hs.office.contact;
 
 import java.util.Map;
 
-public class TestHsOfficeContact {
+public class HsOfficeContactRbacTestEntity {
 
-    public static final HsOfficeContactRbacEntity TEST_CONTACT = hsOfficeContact("some contact", "some-contact@example.com");
+    public static final HsOfficeContactRbacEntity TEST_RBAC_CONTACT = hsOfficeContact("some contact", "some-contact@example.com");
 
     static public HsOfficeContactRbacEntity hsOfficeContact(final String caption, final String emailAddr) {
         return HsOfficeContactRbacEntity.builder()

src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactUnitTest.java

@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class HsOfficeContactEntityUnitTest {
+class HsOfficeContactUnitTest {
 
     @Test
     void toStringReturnsNullForNullContact() {

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java

@@ -5,7 +5,7 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountRepository;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
@@ -55,7 +55,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
     HsOfficePartnerRepository partnerRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     HsOfficeBankAccountRepository bankAccountRepo;
@@ -268,7 +268,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
 
             context.define("superuser-alex@hostsharing.net");
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("Third").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
             final var givenBankAccount = bankAccountRepo.findByOptionalHolderLike("Fourth").get(0);
             final var givenBillingPerson = personRepo.findPersonByOptionalNameLike("Fourth").get(0);
 
@@ -325,7 +325,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
 
             context.define("superuser-alex@hostsharing.net");
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("Third").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -414,7 +414,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
 
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitorRelUuid = UUID.fromString("00000000-0000-0000-0000-000000000000");
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -551,7 +551,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
 
             context.define("superuser-alex@hostsharing.net");
             final var givenDebitor = givenSomeTemporaryDebitor();
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -721,7 +721,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         return jpaAttempt.transacted(() -> {
             context.define("superuser-alex@hostsharing.net");
             final var givenPartner = partnerRepo.findPartnerByOptionalNameLike("Fourth").get(0).load();
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth contact").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth contact").get(0);
             final var newDebitor = HsOfficeDebitorEntity.builder()
                     .debitorNumberSuffix(nextDebitorSuffix())
                     .billable(true)

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntityUnitTest.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.debitor;
 
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType;
@@ -21,7 +21,7 @@ class HsOfficeDebitorEntityUnitTest {
                     .personType(HsOfficePersonType.LEGAL_PERSON)
                     .tradeName("some billing trade name")
                     .build())
-            .contact(HsOfficeContactRbacEntity.builder().caption("some caption").build())
+            .contact(HsOfficeContactBareEntity.builder().caption("some caption").build())
             .build();
 
     @Test

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java

@@ -2,7 +2,7 @@ package net.hostsharing.hsadminng.hs.office.debitor;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountRepository;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
@@ -50,7 +50,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
     HsOfficePartnerRepository partnerRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     HsOfficePersonRepository personRepo;
@@ -85,7 +85,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
             final var count = debitorRepo.count();
             final var givenPartner = partnerRepo.findPartnerByPartnerNumber(10001);
             final var givenPartnerPerson = one(personRepo.findPersonByOptionalNameLike("First GmbH"));
-            final var givenContact = one(contactRepo.findContactByOptionalCaptionLike("first contact"));
+            final var givenContact = one(contactBareRepo.findContactByOptionalCaptionLike("first contact"));
 
             // when
             final var result = attempt(em, () -> {
@@ -119,7 +119,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
             // given
             context("superuser-alex@hostsharing.net");
             final var givenPartnerPerson = one(personRepo.findPersonByOptionalNameLike("First GmbH"));
-            final var givenContact = one(contactRepo.findContactByOptionalCaptionLike("first contact"));
+            final var givenContact = one(contactBareRepo.findContactByOptionalCaptionLike("first contact"));
 
             // when
             final var result = attempt(em, () -> {
@@ -157,7 +157,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
             attempt(em, () -> {
                 final var givenPartnerPerson = one(personRepo.findPersonByOptionalNameLike("First GmbH"));
                 final var givenDebitorPerson = one(personRepo.findPersonByOptionalNameLike("Fourth eG"));
-                final var givenContact = one(contactRepo.findContactByOptionalCaptionLike("fourth contact"));
+                final var givenContact = one(contactBareRepo.findContactByOptionalCaptionLike("fourth contact"));
                 final var newDebitor = HsOfficeDebitorEntity.builder()
                         .debitorNumberSuffix("22")
                         .debitorRel(HsOfficeRelationRbacEntity.builder()
@@ -323,7 +323,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
                     "hs_office_relation#FourtheG-with-DEBITOR-FourtheG:ADMIN", true);
             final var givenNewPartnerPerson = one(personRepo.findPersonByOptionalNameLike("First"));
             final var givenNewBillingPerson = one(personRepo.findPersonByOptionalNameLike("Firby"));
-            final var givenNewContact = one(contactRepo.findContactByOptionalCaptionLike("sixth contact"));
+            final var givenNewContact = one(contactBareRepo.findContactByOptionalCaptionLike("sixth contact"));
             final var givenNewBankAccount = one(bankAccountRepo.findByOptionalHolderLike("first"));
             final String givenNewVatId = "NEW-VAT-ID";
             final String givenNewVatCountryCode = "NC";
@@ -611,7 +611,7 @@ class HsOfficeDebitorRepositoryIntegrationTest extends ContextBasedTestWithClean
             context("superuser-alex@hostsharing.net");
             final var givenPartner = one(partnerRepo.findPartnerByOptionalNameLike(partnerName));
             final var givenPartnerPerson = givenPartner.getPartnerRel().getHolder();
-            final var givenContact = one(contactRepo.findContactByOptionalCaptionLike(contactCaption));
+            final var givenContact = one(contactBareRepo.findContactByOptionalCaptionLike(contactCaption));
             final var givenBankAccount =
                     bankAccountHolder != null ? one(bankAccountRepo.findByOptionalHolderLike(bankAccountHolder)) : null;
             final var newDebitor = HsOfficeDebitorEntity.builder()

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/TestHsOfficeDebitor.java

@@ -4,7 +4,7 @@ import lombok.experimental.UtilityClass;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
 
-import static net.hostsharing.hsadminng.hs.office.contact.TestHsOfficeContact.TEST_CONTACT;
+import static net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareTestEntity.TEST_BARE_CONTACT;
 import static net.hostsharing.hsadminng.hs.office.partner.TestHsOfficePartner.TEST_PARTNER;
 
 @UtilityClass
@@ -17,7 +17,7 @@ public class TestHsOfficeDebitor {
             .debitorRel(HsOfficeRelationRbacEntity.builder()
                     .holder(HsOfficePersonEntity.builder().build())
                     .anchor(HsOfficePersonEntity.builder().build())
-                    .contact(TEST_CONTACT)
+                    .contact(TEST_BARE_CONTACT)
                     .build())
             .partner(TEST_PARTNER)
             .defaultPrefix("abc")

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java

@@ -3,8 +3,8 @@ package net.hostsharing.hsadminng.hs.office.partner;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
@@ -48,7 +48,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
     HsOfficePersonRepository personRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     JpaAttempt jpaAttempt;
@@ -92,7 +92,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
             context.define("superuser-alex@hostsharing.net");
             final var givenMandantPerson = personRepo.findPersonByOptionalNameLike("Hostsharing eG").stream().findFirst().orElseThrow();
             final var givenPerson = personRepo.findPersonByOptionalNameLike("Third").stream().findFirst().orElseThrow();
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").stream().findFirst().orElseThrow();
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").stream().findFirst().orElseThrow();
 
             final var location = RestAssured // @formatter:off
                     .given()
@@ -189,7 +189,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
 
             context.define("superuser-alex@hostsharing.net");
             final var mandantPerson = personRepo.findPersonByOptionalNameLike("Hostsharing eG").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -524,7 +524,7 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu
             context.define("superuser-alex@hostsharing.net");
             final var givenMandantPerson = personRepo.findPersonByOptionalNameLike("Hostsharing eG").stream().findFirst().orElseThrow();
             final var givenPerson = personRepo.findPersonByOptionalNameLike(partnerHolderName).stream().findFirst().orElseThrow();
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike(contactName).stream().findFirst().orElseThrow();
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike(contactName).stream().findFirst().orElseThrow();
 
             final var partnerRel = new HsOfficeRelationRbacEntity();
             partnerRel.setType(HsOfficeRelationType.PARTNER);

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityPatcherUnitTest.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.partner;
 
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficePartnerPatchResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
@@ -37,7 +37,7 @@ class HsOfficePartnerEntityPatcherUnitTest extends PatchUnitTestBase<
     private final HsOfficePersonEntity givenInitialPerson = HsOfficePersonEntity.builder()
             .uuid(INITIAL_PERSON_UUID)
             .build();
-    private final HsOfficeContactRbacEntity givenInitialContact = HsOfficeContactRbacEntity.builder()
+    private final HsOfficeContactBareEntity givenInitialContact = HsOfficeContactBareEntity.builder()
             .uuid(INITIAL_CONTACT_UUID)
             .build();
 

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntityUnitTest.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.partner;
 
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonType;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
@@ -23,7 +23,7 @@ class HsOfficePartnerEntityUnitTest {
                             .personType(HsOfficePersonType.LEGAL_PERSON)
                             .tradeName("some trade name")
                             .build())
-                    .contact(HsOfficeContactRbacEntity.builder().caption("some caption").build())
+                    .contact(HsOfficeContactBareEntity.builder().caption("some caption").build())
                     .build())
             .build();
 

src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.partner;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
@@ -49,7 +49,7 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTestWithClean
     HsOfficePersonRepository personRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     RawRbacObjectRepository rawObjectRepo;
@@ -110,7 +110,7 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTestWithClean
             // when
             attempt(em, () -> {
                 final var givenPartnerPerson = personRepo.findPersonByOptionalNameLike("Erben Bessler").get(0);
-                final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth contact").get(0);
+                final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth contact").get(0);
                 final var givenMandantPerson = personRepo.findPersonByOptionalNameLike("Hostsharing eG").get(0);
 
                 final var newRelation = HsOfficeRelationRbacEntity.builder()
@@ -466,7 +466,7 @@ class HsOfficePartnerRepositoryIntegrationTest extends ContextBasedTestWithClean
     private HsOfficeRelationEntity givenSomeTemporaryHostsharingPartnerRel(final String person, final String contact) {
         final var givenMandantorPerson = personRepo.findPersonByOptionalNameLike("Hostsharing eG").get(0);
         final var givenPartnerPerson = personRepo.findPersonByOptionalNameLike(person).get(0);
-        final var givenContact = contactRepo.findContactByOptionalCaptionLike(contact).get(0);
+        final var givenContact = contactBareRepo.findContactByOptionalCaptionLike(contact).get(0);
 
         final var partnerRel = HsOfficeRelationRbacEntity.builder()
                 .holder(givenPartnerPerson)

src/test/java/net/hostsharing/hsadminng/hs/office/partner/TestHsOfficePartner.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.partner;
 
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
@@ -25,7 +25,7 @@ public class TestHsOfficePartner {
                                         .personType(LEGAL_PERSON)
                                         .tradeName(tradeName)
                                         .build())
-                                .contact(HsOfficeContactRbacEntity.builder()
+                                .contact(HsOfficeContactBareEntity.builder()
                                         .caption(tradeName)
                                         .build())
                                 .build()

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationControllerAcceptanceTest.java

@@ -2,10 +2,10 @@ package net.hostsharing.hsadminng.hs.office.relation;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationTypeResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
@@ -49,7 +49,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
     HsOfficePersonRepository personRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     JpaAttempt jpaAttempt;
@@ -125,7 +125,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
             context.define("superuser-alex@hostsharing.net");
             final var givenAnchorPerson = personRepo.findPersonByOptionalNameLike("Third").get(0);
             final var givenHolderPerson = personRepo.findPersonByOptionalNameLike("Paul").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("second").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("second").get(0);
 
             final var location = RestAssured // @formatter:off
                     .given()
@@ -172,7 +172,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
             context.define("superuser-alex@hostsharing.net");
             final var givenAnchorPersonUuid = GIVEN_NON_EXISTING_HOLDER_PERSON_UUID;
             final var givenHolderPerson = personRepo.findPersonByOptionalNameLike("Smith").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -204,7 +204,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
 
             context.define("superuser-alex@hostsharing.net");
             final var givenAnchorPerson = personRepo.findPersonByOptionalNameLike("Third").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             final var location = RestAssured // @formatter:off
                 .given()
@@ -353,7 +353,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
             context.define("superuser-alex@hostsharing.net");
             final var givenRelation = givenSomeTemporaryRelationBessler();
             assertThat(givenRelation.getContact().getCaption()).isEqualTo("seventh contact");
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth").get(0);
 
             RestAssured // @formatter:off
                 .given()
@@ -455,7 +455,7 @@ class HsOfficeRelationControllerAcceptanceTest extends ContextBasedTestWithClean
             context.define("superuser-alex@hostsharing.net");
             final var givenAnchorPerson = personRepo.findPersonByOptionalNameLike("Erben Bessler").get(0);
             final var givenHolderPerson = personRepo.findPersonByOptionalNameLike("Winkler").get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("seventh contact").get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("seventh contact").get(0);
             final var newRelation = HsOfficeRelationRbacEntity.builder()
                     .type(HsOfficeRelationType.REPRESENTATIVE)
                     .anchor(givenAnchorPerson)

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java

@@ -1,5 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.relation;
 
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareEntity;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeRelationPatchResource;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
@@ -44,7 +45,7 @@ class HsOfficeRelationEntityPatcherUnitTest extends PatchUnitTestBase<
     final HsOfficePersonEntity givenInitialHolderPerson = HsOfficePersonEntity.builder()
             .uuid(UUID.randomUUID())
             .build();
-    final HsOfficeContactRbacEntity givenInitialContact = HsOfficeContactRbacEntity.builder()
+    final HsOfficeContactBareEntity givenInitialContact = HsOfficeContactBareEntity.builder()
             .uuid(UUID.randomUUID())
             .build();
 
@@ -82,9 +83,7 @@ class HsOfficeRelationEntityPatcherUnitTest extends PatchUnitTestBase<
         );
     }
 
-    static HsOfficeContactRbacEntity newContact(final UUID uuid) {
+    static HsOfficeContactBareEntity newContact(final UUID uuid) {
-        final var newContact = new HsOfficeContactRbacEntity();
+        return HsOfficeContactBareEntity.builder().uuid(uuid).build();
-        newContact.setUuid(uuid);
-        return newContact;
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRepositoryIntegrationTest.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.relation;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRepository;
+import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactBareRepository;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
@@ -40,7 +40,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
     HsOfficePersonRepository personRepo;
 
     @Autowired
-    HsOfficeContactRepository contactRepo;
+    HsOfficeContactBareRepository contactBareRepo;
 
     @Autowired
     RawRbacRoleRepository rawRoleRepo;
@@ -71,7 +71,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
             final var givenHolderPerson = personRepo.findPersonByOptionalNameLike("Paul").stream()
                     .filter(p -> p.getPersonType() == NATURAL_PERSON)
                     .findFirst().orElseThrow();
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth contact").stream()
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth contact").stream()
                     .findFirst().orElseThrow();
 
             // when
@@ -111,7 +111,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
                 final var givenHolderPerson = personRepo.findPersonByOptionalNameLike("Bert").stream()
                         .filter(p -> p.getPersonType() == NATURAL_PERSON)
                         .findFirst().orElseThrow();
-                final var givenContact = contactRepo.findContactByOptionalCaptionLike("fourth contact").stream()
+                final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("fourth contact").stream()
                         .findFirst().orElseThrow();
                 final var newRelation = HsOfficeRelationRbacEntity.builder()
                         .anchor(givenAnchorPerson)
@@ -219,7 +219,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
                     givenRelation,
                     "hs_office_person#ErbenBesslerMelBessler:ADMIN");
             context("superuser-alex@hostsharing.net");
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike("sixth contact").stream().findFirst().orElseThrow();
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike("sixth contact").stream().findFirst().orElseThrow();
 
             // when
             final var result = jpaAttempt.transacted(() -> {
@@ -413,7 +413,7 @@ class HsOfficeRelationRepositoryIntegrationTest extends ContextBasedTestWithClea
             context("superuser-alex@hostsharing.net");
             final var givenAnchorPerson = personRepo.findPersonByOptionalNameLike("Erben Bessler").get(0);
             final var givenHolderPerson = personRepo.findPersonByOptionalNameLike(holderPerson).get(0);
-            final var givenContact = contactRepo.findContactByOptionalCaptionLike(contact).get(0);
+            final var givenContact = contactBareRepo.findContactByOptionalCaptionLike(contact).get(0);
             final var newRelation = HsOfficeRelationRbacEntity.builder()
                     .type(HsOfficeRelationType.REPRESENTATIVE)
                     .anchor(givenAnchorPerson)