.aliases

@@ -95,6 +95,3 @@ if [ ! -f .environment ]; then
     cp .tc-environment .environment
 fi
 source .environment
-
-alias scenario-reports-upload='./gradlew scenarioTests convertMarkdownToHtml && ssh hsh03-hsngdev@h50.hostsharing.net "rm -f doms/hsngdev.hs-example.de/htdocs-ssl/scenarios/office/*.html" && scp build/doc/scenarios/*.html hsh03-hsngdev@h50.hostsharing.net:doms/hsngdev.hs-example.de/htdocs-ssl/scenarios/office'
-alias scenario-reports-open='open https://hsngdev.hs-example.de/scenarios/office'

build.gradle

@@ -410,7 +410,7 @@ tasks.register('convertMarkdownToHtml') {
     group = 'Conversion'
 
     // Define the template file and input directory
-    def templateFile = file('doc/scenarios/.template.html')
+    def templateFile = file('doc/scenarios/template.html')
 
     // Task configuration and execution
     doFirst {
@@ -425,13 +425,13 @@ tasks.register('convertMarkdownToHtml') {
 
         // Check if the template file exists
         if (!templateFile.exists()) {
-            throw new GradleException("Template file 'doc/scenarios/.template.html' not found.")
+            throw new GradleException("Template file 'doc/scenarios/template.html' not found.")
         }
     }
 
     doLast {
         // Gather all Markdown files in the current directory
-        fileTree(dir: '.', include: 'build/doc/scenarios/*.md').each { file ->
+        fileTree(dir: '.', include: 'doc/scenarios/*.md').each { file ->
             // Corrected way to create the output file path
             def outputFile = new File(file.parent, file.name.replaceAll(/\.md$/, '.html'))
 
@@ -444,4 +444,3 @@ tasks.register('convertMarkdownToHtml') {
         }
     }
 }
-convertMarkdownToHtml.dependsOn scenarioTests

doc/business-glossary-de.md

@@ -1,124 +0,0 @@
-### hsadminNg fachliches Glossar
-
-<!--
-Currently, this business glossary is only available in German because in many cases, 
-the German terms are important for comprehensibility for those using this software.
--->
-
-Dieses ist eine Sammlung von Fachbegriffen, die in diesem Projekt benutzt werden.
-Ebenfalls aufgenommen sind technische Begriffe, die für Benutzer für das Verständnis der Schnittstellen nötig sind.
-
-Falls etwas fehlt, bitte Bescheid geben.
-
-
-#### Partner
-
-In diesem System ist ein _Partner_ grundsätzlich jeglicher Geschäftspartner der _Hostsharing eG_.
-Dies können grundsätzlich Kunden, siehe [Debitor](#Debitor), wie Lieferanten sein.
-Derzeit sind aber nur Debitoren implementiert.
-
-Des Weiteren gibt es für jeden _Partner_ eine fünfstellige Partnernummer mit dem Prefix 'P-' (z.B. `P-123454`)
-sowie Zusatzinformationen (z.B. Registergerichtnummer oder Geburtsdatum), die zur genauen Identifikation benötigt werden.
-
-Für einen _Partner_ kann es gleichzeitig mehrere [Debitoren](#Debitor) 
-und zeitlich nacheinander mehrere [Mitgliedschaften](#Mitgliedschaft) geben.
-
-Partner sind grundsätzlich als ist [Relation](#Relation) der Vertragsperson mit der Person _Hostsharing eG_ implementiert.
-
-
-### Debitor
-
-Ein `Debitor` ist quasi ein Rechnungsempfänger für einen [Partner](#Partner).
-
-Für einen _Partner_ kann es gleichzeitig mehrere [Debitoren](#Debitor) geben, 
-z.B. für spezielle Projekte des Kunden oder verbundene Organisationen.
-
-Des Weiteren gibt es für jeden _Partner_ eine fünfstellige Partnernummer mit dem Prefix 'P-' (z.B. `P-123454`)
-sowie Zusatzinformationen (z.B. Registergerichtsnummer oder Geburtsdatum), die zur genauen Identifikation benötigt werden.
-
-Debitoren sind grundsätzlich als ist [Relation](#Relation) der Vertragsperson mit der Person des Vertragspartners implementiert.
-
-
-#### Relation
-
-Eine _Relation_ ist eine typisierte und mit Kontaktdaten versehene Beziehung einer (_Holder_)-Person zu einer _Anchor_-Person.
-
-Eine Relation ist eine Art Geschäftsrolle, wir haben hier aber keinen Begriff mit 'Rolle' verwendet,
-weil 'Role' (engl.) zu leicht mit der [RBAC-Rolle](#RBAC-Role) verwechselt werden könnte.
-
-Die _Relation_ ist auch ein technisches Konzept und gehört nicht zur Domänensprache.
-Dieses Konzept ist jedoch für das Verständnis der ([API](#API)) notwendig.
-
-
-#### Ex-Partner
-
-Ex-Partner bilden [Personen](#Person) ab, die vormals [Partner](#Partner) waren.
-Diese bleiben dadurch informationshalber im System verfügbar.
-
-Implementiert ist der _Ex-Partner_ als eine besondere Form der [Relation](#Relation)
-der Person des Ex-Partner (_Holder_) zum neuen Partner (_Anchor_) dargestellt.
-Dieses kann zu einer Kettenbildung führen.
-
-
-#### Representative-Contact (ehemals _contractual_)
-
-Ein _Representative_ ist eine natürliche Person, die für eine nicht-natürliche Person vertretungsberechtigt ist.
-
-Implementiert ist der _Representative_ als eine besondere Form der [Relation](#Relation) 
-der Person des Repräsentanten (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### VIP-Contact
-
-Ein _VIP-Contact_ ist eine natürliche Person, die für einen Geschäftspartner eine wichtige Funktion übernimmt, 
-nicht aber deren offizieller Repräsentant ist. 
-
-Implementiert ist der _VIP-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des VIP-Contact (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### Operations-Contact
-
-Ein _Operations-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner technischer Ansprechpartner ist.
-
-Ein Seiteneffekt ist, dass diese Person im Ticketsystem Znuny direkt dem Geschäftspartner zugeordnet werden kann.
-
-Im Legacy System waren das die Kontakte mit der Rolle `operation` und `silent`.
-
-Implementiert ist der _Operations-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _Operations-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### OperationsAlert-Contact
-
-Ein _OperationsAlert-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner bei technischen Probleme kontaktiert werden soll.
-
-Im Legacy System waren das die Kontakte mit der Rolle `operation`.
-
-Implementiert ist der _OperationsAlert-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _OperationsAlert-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### Subscriber-Contact
-
-Ein _Subscriber-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner eine bestimmte Mailingliste abonniert.
-
-Implementiert ist der _Subscriber-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _Subscriber-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-Zusätzlich wird diese Relation mit dem Kurznamen der abonnierten Mailingliste markiert.  
-
-
-#### Anchor / Relation-Anchor
-
-siehe [Relation](#Relation)
-
-
-#### Holder / Relation-Holder
-
-siehe [Relation](#Relation)
-
-
-#### API
-
-Und API (Application-Programming-Interface) verstehen wir eine über HTTPS angesprochene programmatisch bedienbare Schnittstell 
-zur Funktionalität des hsAdmin-NG-Systems.

doc/scenarios/README.txt

@@ -1 +0,0 @@
-find the generated ScenarioReports in build/doc/scenarios

src/main/java/net/hostsharing/hsadminng/config/JsonObjectMapperConfiguration.java

@@ -1,7 +1,6 @@
 package net.hostsharing.hsadminng.config;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.openapitools.jackson.nullable.JsonNullableModule;
@@ -10,20 +9,15 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
-
 @Configuration
 public class JsonObjectMapperConfiguration {
 
     @Bean
     @Primary
     public Jackson2ObjectMapperBuilder customObjectMapper() {
-        // HOWTO: add JSON converters and specify other JSON mapping configurations
         return new Jackson2ObjectMapperBuilder()
                 .modules(new JsonNullableModule(), new JavaTimeModule())
-                .featuresToEnable(
-                        JsonParser.Feature.ALLOW_COMMENTS,
-                        DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS
-                )
+                .featuresToEnable(JsonParser.Feature.ALLOW_COMMENTS, JsonParser.Feature.ALLOW_COMMENTS)
                 .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
     }
 }

src/main/java/net/hostsharing/hsadminng/errors/CustomErrorResponse.java

@@ -46,7 +46,6 @@ public class CustomErrorResponse {
         this.path = path;
         this.statusCode = status.value();
         this.statusPhrase = status.getReasonPhrase();
-        // HOWTO: debug serverside error response - set a breakpoint here
         this.message = message.startsWith("ERROR: [") ? message : "ERROR: [" + statusCode + "] " + message;
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java

@@ -36,7 +36,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> getListOfCoopAssets(
+    public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> listCoopAssets(
             final String currentSubject,
             final String assumedRoles,
             final UUID membershipUuid,
@@ -55,7 +55,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional
-    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> postNewCoopAssetTransaction(
+    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> addCoopAssetsTransaction(
             final String currentSubject,
             final String assumedRoles,
             final HsOfficeCoopAssetsTransactionInsertResource requestBody) {
@@ -77,7 +77,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getSingleCoopAssetTransactionByUuid(
+    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getCoopAssetTransactionByUuid(
         final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) {
 
         context.define(currentSubject, assumedRoles);
@@ -128,9 +128,9 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
     }
 
     final BiConsumer<HsOfficeCoopAssetsTransactionInsertResource, HsOfficeCoopAssetsTransactionEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        if ( resource.getRevertedAssetTxUuid() != null ) {
-            entity.setRevertedAssetTx(coopAssetsTransactionRepo.findByUuid(resource.getRevertedAssetTxUuid())
-                    .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] reverseEntityUuid %s not found".formatted(resource.getRevertedAssetTxUuid()))));
+        if ( resource.getReverseEntryUuid() != null ) {
+            entity.setAdjustedAssetTx(coopAssetsTransactionRepo.findByUuid(resource.getReverseEntryUuid())
+                    .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] reverseEntityUuid %s not found".formatted(resource.getReverseEntryUuid()))));
         }
     };
 };

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java

@@ -50,8 +50,8 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
             .withProp(HsOfficeCoopAssetsTransactionEntity::getAssetValue)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getReference)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getComment)
-            .withProp(at -> ofNullable(at.getRevertedAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
-            .withProp(at -> ofNullable(at.getReversalAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustedAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustmentAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
             .quotedValues(false);
 
     @Id
@@ -77,7 +77,7 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
      * The signed value which directly affects the booking balance.
      *
      * <p>This means, that a DEPOSIT is always positive, a DISBURSAL is always negative,
-     * but an REVERSAL can bei either positive or negative.
+     * but an ADJUSTMENT can bei either positive or negative.
      * See {@link HsOfficeCoopAssetsTransactionType} for</p> more information.
      */
     @Column(name = "assetvalue")
@@ -96,14 +96,14 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
     private String comment;
 
     /**
-     * Optionally, the UUID of the corresponding transaction for an reversal transaction.
+     * Optionally, the UUID of the corresponding transaction for an adjustment transaction.
      */
     @OneToOne
-    @JoinColumn(name = "revertedassettxuuid")
-    private HsOfficeCoopAssetsTransactionEntity revertedAssetTx;
+    @JoinColumn(name = "adjustedassettxuuid")
+    private HsOfficeCoopAssetsTransactionEntity adjustedAssetTx;
 
-    @OneToOne(mappedBy = "revertedAssetTx")
-    private HsOfficeCoopAssetsTransactionEntity reversalAssetTx;
+    @OneToOne(mappedBy = "adjustedAssetTx")
+    private HsOfficeCoopAssetsTransactionEntity adjustmentAssetTx;
 
     @Override
     public HsOfficeCoopAssetsTransactionEntity load() {

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionType.java

@@ -4,7 +4,7 @@ public enum HsOfficeCoopAssetsTransactionType {
     /**
      * correction of wrong bookings, value can be positive or negative
      */
-    REVERSAL,
+    ADJUSTMENT,
 
     /**
      * payment received from member after signing shares, value >0

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java

@@ -38,7 +38,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> getListOfCoopShares(
+    public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> listCoopShares(
             final String currentSubject,
             final String assumedRoles,
             final UUID membershipUuid,
@@ -57,7 +57,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
 
     @Override
     @Transactional
-    public ResponseEntity<HsOfficeCoopSharesTransactionResource> postNewCoopSharesTransaction(
+    public ResponseEntity<HsOfficeCoopSharesTransactionResource> addCoopSharesTransaction(
             final String currentSubject,
             final String assumedRoles,
             final HsOfficeCoopSharesTransactionInsertResource requestBody) {
@@ -80,7 +80,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<HsOfficeCoopSharesTransactionResource> getSingleCoopShareTransactionByUuid(
+    public ResponseEntity<HsOfficeCoopSharesTransactionResource> getCoopShareTransactionByUuid(
         final String currentSubject, final String assumedRoles, final UUID shareTransactionUuid) {
 
             context.define(currentSubject, assumedRoles);
@@ -131,9 +131,9 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
     }
 
     final BiConsumer<HsOfficeCoopSharesTransactionInsertResource, HsOfficeCoopSharesTransactionEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        if ( resource.getRevertedShareTxUuid() != null ) {
-            entity.setRevertedShareTx(coopSharesTransactionRepo.findByUuid(resource.getRevertedShareTxUuid())
-                .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] revertedShareTxUuid %s not found".formatted(resource.getRevertedShareTxUuid()))));
+        if ( resource.getAdjustedShareTxUuid() != null ) {
+            entity.setAdjustedShareTx(coopSharesTransactionRepo.findByUuid(resource.getAdjustedShareTxUuid())
+                .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] adjustedShareTxUuid %s not found".formatted(resource.getAdjustedShareTxUuid()))));
         }
     };
 }

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java

@@ -48,8 +48,8 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
             .withProp(HsOfficeCoopSharesTransactionEntity::getShareCount)
             .withProp(HsOfficeCoopSharesTransactionEntity::getReference)
             .withProp(HsOfficeCoopSharesTransactionEntity::getComment)
-            .withProp(at -> ofNullable(at.getRevertedShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
-            .withProp(at -> ofNullable(at.getReversalShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustedShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustmentShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
         .quotedValues(false);
 
     @Id
@@ -71,7 +71,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
      * The signed value which directly affects the booking balance.
      *
      * <p>This means, that a SUBSCRIPTION is always positive, a CANCELLATION is always negative,
-     * but an REVERSAL can bei either positive or negative.
+     * but an ADJUSTMENT can bei either positive or negative.
      * See {@link HsOfficeCoopSharesTransactionType} for</p> more information.
      */
     @Column(name = "valuedate")
@@ -93,14 +93,14 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
     private String comment;
 
     /**
-     * Optionally, the UUID of the corresponding transaction for a REVERSAL transaction.
+     * Optionally, the UUID of the corresponding transaction for an adjustment transaction.
      */
     @OneToOne
-    @JoinColumn(name = "revertedsharetxuuid")
-    private HsOfficeCoopSharesTransactionEntity revertedShareTx;
+    @JoinColumn(name = "adjustedsharetxuuid")
+    private HsOfficeCoopSharesTransactionEntity adjustedShareTx;
 
-    @OneToOne(mappedBy = "revertedShareTx")
-    private HsOfficeCoopSharesTransactionEntity reversalShareTx;
+    @OneToOne(mappedBy = "adjustedShareTx")
+    private HsOfficeCoopSharesTransactionEntity adjustmentShareTx;
 
     @Override
     public HsOfficeCoopSharesTransactionEntity load() {

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionType.java

@@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.hs.office.coopshares;
 
 public enum HsOfficeCoopSharesTransactionType {
     /**
-     * reversal of wrong bookings, with either positive or negative value identical to reversed transaction
+     * correction of wrong bookings, with either positive or negative value
      */
-    REVERSAL,
+    ADJUSTMENT,
 
     /**
      * shares signed, e.g. with the declaration of accession, value >0

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java

@@ -16,8 +16,6 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
-import static java.util.Optional.ofNullable;
-
 @RestController
 
 public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
@@ -41,7 +39,7 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
         context.define(currentSubject, assumedRoles);
 
         final var entities = ( memberNumber != null)
-                    ? ofNullable(membershipRepo.findMembershipByMemberNumber(memberNumber)).stream().toList()
+                    ? List.of(membershipRepo.findMembershipByMemberNumber(memberNumber))
                     : membershipRepo.findMembershipsByOptionalPartnerUuid(partnerUuid);
 
         final var resources = mapper.mapList(entities, HsOfficeMembershipResource.class,

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepository.java

@@ -14,16 +14,14 @@ public interface HsOfficeMembershipRepository extends Repository<HsOfficeMembers
 
     HsOfficeMembershipEntity save(final HsOfficeMembershipEntity entity);
 
-    List<HsOfficeMembershipEntity> findAll();
 
     @Query("""
             SELECT membership FROM HsOfficeMembershipEntity membership
                 WHERE ( CAST(:partnerUuid as org.hibernate.type.UUIDCharType) IS NULL
                         OR membership.partner.uuid = :partnerUuid )
                 ORDER BY membership.partner.partnerNumber, membership.memberNumberSuffix
-            """)
+               """)
     List<HsOfficeMembershipEntity> findMembershipsByOptionalPartnerUuid(UUID partnerUuid);
-
     @Query("""
             SELECT membership FROM HsOfficeMembershipEntity membership
                 WHERE (:partnerNumber = membership.partner.partnerNumber) 
@@ -33,12 +31,10 @@ public interface HsOfficeMembershipRepository extends Repository<HsOfficeMembers
     HsOfficeMembershipEntity findMembershipByPartnerNumberAndSuffix(
             @NotNull Integer partnerNumber,
             @NotNull String suffix);
-
     default HsOfficeMembershipEntity findMembershipByMemberNumber(Integer memberNumber) {
         final var partnerNumber = memberNumber / 100;
-        final String suffix = String.format("%02d", memberNumber % 100);
-        final var result = findMembershipByPartnerNumberAndSuffix(partnerNumber, suffix);
-        return result;
+        final var suffix = memberNumber % 100;
+        return findMembershipByPartnerNumberAndSuffix(partnerNumber, String.format("%02d", suffix));
     }
 
     long count();

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

@@ -143,7 +143,6 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     private void optionallyCreateExPartnerRelation(final HsOfficePartnerEntity saved, final HsOfficeRelationRealEntity previousPartnerRel) {
         if (!saved.getPartnerRel().getUuid().equals(previousPartnerRel.getUuid())) {
-            // TODO.impl: we also need to use the new partner-person as the anchor
             relationRepo.save(previousPartnerRel.toBuilder().uuid(null).type(EX_PARTNER).build());
         }
     }

src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonTypeConverter.java

@@ -4,7 +4,6 @@ import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 import java.util.stream.Stream;
 
-// HOWTO: convert data types for exchange between PostgreSQL and Java/Hibernate/JPA-Entities
 @Converter(autoApply = true)
 public class HsOfficePersonTypeConverter implements AttributeConverter<HsOfficePersonType, String> {
 

src/main/java/net/hostsharing/hsadminng/system/SystemProcess.java

@@ -14,7 +14,6 @@ public class SystemProcess {
 
     @Getter
     private String stdOut;
-
     @Getter
     private String stdErr;
 
@@ -22,6 +21,7 @@ public class SystemProcess {
         this.processBuilder = new ProcessBuilder(command);
     }
 
+
     public String getCommand() {
         return processBuilder.command().toString();
     }

src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml

@@ -6,7 +6,7 @@ components:
         HsOfficeCoopAssetsTransactionType:
             type: string
             enum:
-                - REVERSAL
+                - ADJUSTMENT
                 - DEPOSIT
                 - DISBURSAL
                 - TRANSFER
@@ -32,15 +32,15 @@ components:
                     type: string
                 comment:
                     type: string
-                revertedAssetTx:
+                adjustedAssetTx:
                     $ref: '#/components/schemas/HsOfficeReferencedCoopAssetsTransaction'
-                reversalAssetTx:
+                adjustmentAssetTx:
                     $ref: '#/components/schemas/HsOfficeReferencedCoopAssetsTransaction'
 
         HsOfficeReferencedCoopAssetsTransaction:
             description:
                 Similar to `HsOfficeCoopAssetsTransaction` but without the self-referencing properties 
-                (`revertedAssetTx` and `reversalAssetTx`), to avoid recursive JSON.
+                (`adjustedAssetTx` and `adjustmentAssetTx`), to avoid recursive JSON.
             type: object
             properties:
                 uuid:
@@ -80,7 +80,7 @@ components:
                     maxLength: 48
                 comment:
                     type: string
-                revertedAssetTx.uuid:
+                reverseEntry.uuid:
                     type: string
                     format: uuid
             required:

src/main/resources/api-definition/hs-office/hs-office-coopassets-with-uuid.yaml

@@ -2,7 +2,7 @@ get:
     tags:
         - hs-office-coopAssets
     description: 'Fetch a single asset transaction by its uuid, if visible for the current subject.'
-    operationId: getSingleCoopAssetTransactionByUuid
+    operationId: getCoopAssetTransactionByUuid
     parameters:
         - $ref: 'auth.yaml#/components/parameters/currentSubject'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'

src/main/resources/api-definition/hs-office/hs-office-coopassets.yaml

@@ -3,7 +3,7 @@ get:
   description: Returns the list of (optionally filtered) cooperative asset transactions which are visible to the current subject or any of it's assumed roles.
   tags:
     - hs-office-coopAssets
-  operationId: getListOfCoopAssets
+  operationId: listCoopAssets
   parameters:
     - $ref: 'auth.yaml#/components/parameters/currentSubject'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
@@ -46,7 +46,7 @@ post:
   summary: Adds a new cooperative asset transaction.
   tags:
     - hs-office-coopAssets
-  operationId: postNewCoopAssetTransaction
+  operationId: addCoopAssetsTransaction
   parameters:
     - $ref: 'auth.yaml#/components/parameters/currentSubject'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'

src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml

@@ -6,7 +6,7 @@ components:
         HsOfficeCoopSharesTransactionType:
             type: string
             enum:
-                - REVERSAL
+                - ADJUSTMENT
                 - SUBSCRIPTION
                 - CANCELLATION
 
@@ -27,15 +27,15 @@ components:
                     type: string
                 comment:
                     type: string
-                revertedShareTx:
+                adjustedShareTx:
                     $ref: '#/components/schemas/HsOfficeReferencedCoopSharesTransaction'
-                reversalShareTx:
+                adjustmentShareTx:
                     $ref: '#/components/schemas/HsOfficeReferencedCoopSharesTransaction'
 
         HsOfficeReferencedCoopSharesTransaction:
             description:
                 Similar to `HsOfficeCoopSharesTransaction` but without the self-referencing properties
-                (`revertedShareTx` and `reversalShareTx`), to avoid recursive JSON.
+                (`adjustedShareTx` and `adjustmentShareTx`), to avoid recursive JSON.
             type: object
             properties:
                 uuid:
@@ -73,7 +73,7 @@ components:
                     maxLength: 48
                 comment:
                     type: string
-                revertedShareTx.uuid:
+                adjustedShareTx.uuid:
                     type: string
                     format: uuid
             required:

src/main/resources/api-definition/hs-office/hs-office-coopshares-with-uuid.yaml

@@ -2,7 +2,7 @@ get:
     tags:
         - hs-office-coopShares
     description: 'Fetch a single share transaction by its uuid, if visible for the current subject.'
-    operationId: getSingleCoopShareTransactionByUuid
+    operationId: getCoopShareTransactionByUuid
     parameters:
         - $ref: 'auth.yaml#/components/parameters/currentSubject'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'

src/main/resources/api-definition/hs-office/hs-office-coopshares.yaml

@@ -3,7 +3,7 @@ get:
   description: Returns the list of (optionally filtered) cooperative share transactions which are visible to the current subject or any of it's assumed roles.
   tags:
     - hs-office-coopShares
-  operationId: getListOfCoopShares
+  operationId: listCoopShares
   parameters:
     - $ref: 'auth.yaml#/components/parameters/currentSubject'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
@@ -46,7 +46,7 @@ post:
   summary: Adds a new cooperative share transaction.
   tags:
     - hs-office-coopShares
-  operationId: postNewCoopSharesTransaction
+  operationId: addCoopSharesTransaction
   parameters:
     - $ref: 'auth.yaml#/components/parameters/currentSubject'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'

src/main/resources/db/changelog/5-hs-office/503-relation/5030-hs-office-relation.sql

@@ -29,9 +29,6 @@ create table if not exists hs_office.relation
 );
 --//
 
--- TODO.impl: unique constraint, to prevent using the same person multiple times as a partner, or better:
---          ( anchorUuid,  holderUuid, type)
-
 
 -- ============================================================================
 --changeset michael.hoennig:hs-office-relation-MAIN-TABLE-JOURNAL endDelimiter:--//

src/main/resources/db/changelog/5-hs-office/511-coopshares/5110-hs-office-coopshares.sql

@@ -4,7 +4,7 @@
 --changeset michael.hoennig:hs-office-coopshares-MAIN-TABLE endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
-CREATE TYPE hs_office.CoopSharesTransactionType AS ENUM ('REVERSAL', 'SUBSCRIPTION', 'CANCELLATION');
+CREATE TYPE hs_office.CoopSharesTransactionType AS ENUM ('ADJUSTMENT', 'SUBSCRIPTION', 'CANCELLATION');
 
 CREATE CAST (character varying as hs_office.CoopSharesTransactionType) WITH INOUT AS IMPLICIT;
 
@@ -17,7 +17,7 @@ create table if not exists hs_office.coopsharetx
     valueDate       date not null,
     shareCount      integer not null,
     reference       varchar(48) not null,
-    revertedShareTxUuid uuid unique REFERENCES hs_office.coopsharetx(uuid) DEFERRABLE INITIALLY DEFERRED,
+    adjustedShareTxUuid uuid unique REFERENCES hs_office.coopsharetx(uuid) DEFERRABLE INITIALLY DEFERRED,
     comment         varchar(512)
 );
 --//
@@ -28,8 +28,8 @@ create table if not exists hs_office.coopsharetx
 
 alter table hs_office.coopsharetx
     add constraint reverse_entry_missing
-        check ( transactionType = 'REVERSAL' and revertedShareTxUuid is not null
-             or transactionType <> 'REVERSAL' and revertedShareTxUuid is null);
+        check ( transactionType = 'ADJUSTMENT' and adjustedShareTxUuid is not null
+             or transactionType <> 'ADJUSTMENT' and adjustedShareTxUuid is null);
 --//
 
 -- ============================================================================

src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql

@@ -27,12 +27,12 @@ begin
     raise notice 'creating test coopSharesTransaction: %', givenPartnerNumber::text || givenMemberNumberSuffix;
     subscriptionEntryUuid := uuid_generate_v4();
     insert
-        into hs_office.coopsharetx(uuid, membershipuuid, transactiontype, valuedate, sharecount, reference, comment, revertedShareTxUuid)
+        into hs_office.coopsharetx(uuid, membershipuuid, transactiontype, valuedate, sharecount, reference, comment, adjustedShareTxUuid)
         values
             (uuid_generate_v4(), membership.uuid, 'SUBSCRIPTION', '2010-03-15', 4, 'ref '||givenPartnerNumber::text || givenMemberNumberSuffix||'-1', 'initial subscription', null),
             (uuid_generate_v4(), membership.uuid, 'CANCELLATION', '2021-09-01', -2, 'ref '||givenPartnerNumber::text || givenMemberNumberSuffix||'-2', 'cancelling some', null),
             (subscriptionEntryUuid,       membership.uuid, 'SUBSCRIPTION',    '2022-10-20',  2, 'ref '||givenPartnerNumber::text || givenMemberNumberSuffix||'-3', 'some subscription', null),
-            (uuid_generate_v4(), membership.uuid, 'REVERSAL', '2022-10-21', -2, 'ref '||givenPartnerNumber::text || givenMemberNumberSuffix||'-4', 'some reversal', subscriptionEntryUuid);
+            (uuid_generate_v4(), membership.uuid, 'ADJUSTMENT', '2022-10-21', -2, 'ref '||givenPartnerNumber::text || givenMemberNumberSuffix||'-4', 'some adjustment', subscriptionEntryUuid);
 end; $$;
 --//
 

src/main/resources/db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql

@@ -4,7 +4,7 @@
 --changeset michael.hoennig:hs-office-coopassets-MAIN-TABLE endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
-CREATE TYPE hs_office.CoopAssetsTransactionType AS ENUM ('REVERSAL',
+CREATE TYPE hs_office.CoopAssetsTransactionType AS ENUM ('ADJUSTMENT',
                                                        'DEPOSIT',
                                                        'DISBURSAL',
                                                        'TRANSFER',
@@ -22,9 +22,9 @@ create table if not exists hs_office.coopassettx
     membershipUuid      uuid not null references hs_office.membership(uuid),
     transactionType     hs_office.CoopAssetsTransactionType not null,
     valueDate           date not null,
-    assetValue          numeric(12,2) not null, -- https://wiki.postgresql.org/wiki/Don't_Do_This#Don.27t_use_money
+    assetValue          money not null,
     reference           varchar(48) not null,
-    revertedAssetTxUuid uuid unique REFERENCES hs_office.coopassettx(uuid) DEFERRABLE INITIALLY DEFERRED,
+    adjustedAssetTxUuid uuid unique REFERENCES hs_office.coopassettx(uuid) DEFERRABLE INITIALLY DEFERRED,
     comment             varchar(512)
 );
 --//
@@ -36,20 +36,20 @@ create table if not exists hs_office.coopassettx
 
 alter table hs_office.coopassettx
     add constraint reverse_entry_missing
-        check ( transactionType = 'REVERSAL' and revertedAssetTxUuid is not null
-             or transactionType <> 'REVERSAL' and revertedAssetTxUuid is null);
+        check ( transactionType = 'ADJUSTMENT' and adjustedAssetTxUuid is not null
+             or transactionType <> 'ADJUSTMENT' and adjustedAssetTxUuid is null);
 --//
 
 -- ============================================================================
 --changeset michael.hoennig:hs-office-coopassets-ASSET-VALUE-CONSTRAINT endDelimiter:--//
 -- ----------------------------------------------------------------------------
 
-create or replace function hs_office.coopassetstx_check_positive_total(forMembershipUuid UUID, newAssetValue numeric(12, 5))
+create or replace function hs_office.coopassetstx_check_positive_total(forMembershipUuid UUID, newAssetValue money)
 returns boolean
 language plpgsql as $$
 declare
-    currentAssetValue numeric(12,2);
-    totalAssetValue numeric(12,2);
+    currentAssetValue money;
+    totalAssetValue money;
 begin
     select sum(cat.assetValue)
         from hs_office.coopassettx cat

src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql

@@ -27,12 +27,12 @@ begin
     raise notice 'creating test coopAssetsTransaction: %', givenPartnerNumber || givenMemberNumberSuffix;
     lossEntryUuid := uuid_generate_v4();
     insert
-        into hs_office.coopassettx(uuid, membershipuuid, transactiontype, valuedate, assetvalue, reference, comment, revertedAssetTxUuid)
+        into hs_office.coopassettx(uuid, membershipuuid, transactiontype, valuedate, assetvalue, reference, comment, adjustedAssetTxUuid)
         values
             (uuid_generate_v4(),  membership.uuid, 'DEPOSIT',    '2010-03-15',  320.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-1', 'initial deposit', null),
             (uuid_generate_v4(),  membership.uuid, 'DISBURSAL',  '2021-09-01', -128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-2', 'partial disbursal', null),
             (lossEntryUuid,       membership.uuid, 'DEPOSIT',    '2022-10-20',  128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some loss', null),
-            (uuid_generate_v4(),  membership.uuid, 'REVERSAL', '2022-10-21', -128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some reversal', lossEntryUuid);
+            (uuid_generate_v4(),  membership.uuid, 'ADJUSTMENT', '2022-10-21', -128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some adjustment', lossEntryUuid);
 end; $$;
 --//
 

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

@@ -445,7 +445,7 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
                    34002=CoopAssetsTransaction(M-1002000: 2016-12-31, DISBURSAL, -100.00, 1002000, for cancellation D),
                    34003=CoopAssetsTransaction(M-1002000: 2016-12-31, LOSS, -20.00, 1002000, for cancellation D),
                    35001=CoopAssetsTransaction(M-1909000: 2024-01-15, DEPOSIT, 128.00, 1909000, for subscription E),
-                   35002=CoopAssetsTransaction(M-1909000: 2024-01-20, REVERSAL, -128.00, 1909000, chargeback for subscription E, M-1909000:DEP:+128.00),
+                   35002=CoopAssetsTransaction(M-1909000: 2024-01-20, ADJUSTMENT, -128.00, 1909000, chargeback for subscription E, M-1909000:DEP:+128.00),
                    358=CoopAssetsTransaction(M-1000300: 2000-12-06, DEPOSIT, 5120, 1000300, for subscription A),
                    442=CoopAssetsTransaction(M-1015200: 2003-07-07, DEPOSIT, 64, 1015200),
                    577=CoopAssetsTransaction(M-1000300: 2011-12-12, DEPOSIT, 1024, 1000300),
@@ -798,23 +798,23 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
                                             ? HsOfficeCoopSharesTransactionType.SUBSCRIPTION
                                             : "UNSUBSCRIPTION".equals(rec.getString("action"))
                                             ? HsOfficeCoopSharesTransactionType.CANCELLATION
-                                            : HsOfficeCoopSharesTransactionType.REVERSAL
+                                            : HsOfficeCoopSharesTransactionType.ADJUSTMENT
                             )
                             .shareCount(rec.getInteger("quantity"))
                             .comment(rec.getString("comment"))
                             .reference(member.getMemberNumber().toString())
                             .build();
 
-                    if (shareTransaction.getTransactionType() == HsOfficeCoopSharesTransactionType.REVERSAL) {
+                    if (shareTransaction.getTransactionType() == HsOfficeCoopSharesTransactionType.ADJUSTMENT) {
                         final var negativeValue = -shareTransaction.getShareCount();
-                        final var revertedShareTx = coopShares.values().stream().filter(a ->
-                                        a.getTransactionType() != HsOfficeCoopSharesTransactionType.REVERSAL &&
+                        final var adjustedShareTx = coopShares.values().stream().filter(a ->
+                                        a.getTransactionType() != HsOfficeCoopSharesTransactionType.ADJUSTMENT &&
                                                 a.getMembership() == shareTransaction.getMembership() &&
                                                 a.getShareCount() == negativeValue)
                                 .findAny()
                                 .orElseThrow(() -> new IllegalStateException(
-                                        "cannot determine share reverse entry for reversal " + shareTransaction));
-                        shareTransaction.setRevertedShareTx(revertedShareTx);
+                                        "cannot determine share reverse entry for adjustment " + shareTransaction));
+                        shareTransaction.setAdjustedShareTx(adjustedShareTx);
                     }
                     coopShares.put(rec.getInteger("member_share_id"), shareTransaction);
                 });
@@ -840,7 +840,7 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
                     final var assetTypeMapping = new HashMap<String, HsOfficeCoopAssetsTransactionType>() {
 
                         {
-                            put("ADJUSTMENT", HsOfficeCoopAssetsTransactionType.REVERSAL);
+                            put("ADJUSTMENT", HsOfficeCoopAssetsTransactionType.ADJUSTMENT);
                             put("HANDOVER", HsOfficeCoopAssetsTransactionType.TRANSFER);
                             put("ADOPTION", HsOfficeCoopAssetsTransactionType.ADOPTION);
                             put("LOSS", HsOfficeCoopAssetsTransactionType.LOSS);
@@ -868,16 +868,16 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
                             .reference(member.getMemberNumber().toString())
                             .build();
 
-                    if (assetTransaction.getTransactionType() == HsOfficeCoopAssetsTransactionType.REVERSAL) {
+                    if (assetTransaction.getTransactionType() == HsOfficeCoopAssetsTransactionType.ADJUSTMENT) {
                         final var negativeValue = assetTransaction.getAssetValue().negate();
-                        final var revertedAssetTx = coopAssets.values().stream().filter(a ->
-                                        a.getTransactionType() != HsOfficeCoopAssetsTransactionType.REVERSAL &&
+                        final var adjustedAssetTx = coopAssets.values().stream().filter(a ->
+                                        a.getTransactionType() != HsOfficeCoopAssetsTransactionType.ADJUSTMENT &&
                                                 a.getMembership() == assetTransaction.getMembership() &&
                                                 a.getAssetValue().equals(negativeValue))
                                 .findAny()
                                 .orElseThrow(() -> new IllegalStateException(
-                                        "cannot determine asset reverse entry for reversal " + assetTransaction));
-                        assetTransaction.setRevertedAssetTx(revertedAssetTx);
+                                        "cannot determine asset reverse entry for adjustment " + assetTransaction));
+                        assetTransaction.setAdjustedAssetTx(adjustedAssetTx);
                     }
 
                     coopAssets.put(rec.getInteger("member_asset_id"), assetTransaction);

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java

@@ -55,7 +55,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
     EntityManager em;
 
     @Nested
-    class GetListOfCoopAssetsTransactions {
+    class ListCoopAssetsTransactions {
 
         @Test
         void globalAdmin_canViewAllCoopAssetsTransactions() {
@@ -109,21 +109,21 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                                 "valueDate": "2022-10-20",
                                 "reference": "ref 1000202-3",
                                 "comment": "some loss",
-                                "reversalAssetTx": {
-                                    "transactionType": "REVERSAL",
+                                "adjustmentAssetTx": {
+                                    "transactionType": "ADJUSTMENT",
                                     "assetValue": -128.00,
                                     "valueDate": "2022-10-21",
                                     "reference": "ref 1000202-3",
-                                    "comment": "some reversal"
+                                    "comment": "some adjustment"
                                 }
                             },
                             {
-                                "transactionType": "REVERSAL",
+                                "transactionType": "ADJUSTMENT",
                                 "assetValue": -128.00,
                                 "valueDate": "2022-10-21",
                                 "reference": "ref 1000202-3",
-                                "comment": "some reversal",
-                                "revertedAssetTx": {
+                                "comment": "some adjustment",
+                                "adjustedAssetTx": {
                                     "transactionType": "DEPOSIT",
                                     "assetValue": 128.00,
                                     "valueDate": "2022-10-20",
@@ -166,10 +166,10 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
-    class PostNewCoopAssetTransaction {
+    class AddCoopAssetsTransaction {
 
         @Test
-        void globalAdmin_canPostNewCoopAssetTransaction() {
+        void globalAdmin_canAddCoopAssetsTransaction() {
 
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = membershipRepo.findMembershipByMemberNumber(1000101);
@@ -214,7 +214,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
-        void globalAdmin_canAddCoopAssetsReversalTransaction() {
+        void globalAdmin_canAddCoopAssetsAdjustmentTransaction() {
 
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = membershipRepo.findMembershipByMemberNumber(1000101);
@@ -238,12 +238,12 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                         .body("""
                                    {
                                        "membership.uuid": "%s",
-                                       "transactionType": "REVERSAL",
+                                       "transactionType": "ADJUSTMENT",
                                        "assetValue": %s,
                                        "valueDate": "2022-10-30",
-                                       "reference": "test ref reversal",
-                                       "comment": "some coop assets reversal transaction",
-                                       "revertedAssetTx.uuid": "%s"
+                                       "reference": "test ref adjustment",
+                                       "comment": "some coop assets adjustment transaction",
+                                       "reverseEntry.uuid": "%s"
                                      }
                                 """.formatted(
                                     givenMembership.getUuid(),
@@ -258,12 +258,12 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                         .body("uuid", isUuidValid())
                         .body("", lenientlyEquals("""
                             {
-                                "transactionType": "REVERSAL",
+                                "transactionType": "ADJUSTMENT",
                                 "assetValue": -256.00,
                                 "valueDate": "2022-10-30",
-                                "reference": "test ref reversal",
-                                "comment": "some coop assets reversal transaction",
-                                "revertedAssetTx": {
+                                "reference": "test ref adjustment",
+                                "comment": "some coop assets adjustment transaction",
+                                "adjustedAssetTx": {
                                     "transactionType": "DEPOSIT",
                                     "assetValue": 256.00,
                                     "valueDate": "2022-10-20",

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerRestTest.java

@@ -77,7 +77,7 @@ class HsOfficeCoopAssetsTransactionControllerRestTest {
 
         ASSETS_VALUE_MUST_NOT_BE_NULL(
                 requestBody -> requestBody
-                        .with("transactionType", "REVERSAL")
+                        .with("transactionType", "ADJUSTMENT")
                         .with("assetValue", 0.00),
                 "[assetValue must not be 0 but is \"0.00\"]"),
 

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntityUnitTest.java

@@ -21,14 +21,14 @@ class HsOfficeCoopAssetsTransactionEntityUnitTest {
             .build();
 
 
-    final HsOfficeCoopAssetsTransactionEntity givenCoopAssetReversalTransaction = HsOfficeCoopAssetsTransactionEntity.builder()
+    final HsOfficeCoopAssetsTransactionEntity givenCoopAssetAdjustmentTransaction = HsOfficeCoopAssetsTransactionEntity.builder()
             .membership(TEST_MEMBERSHIP)
             .reference("some-ref")
             .valueDate(LocalDate.parse("2020-01-15"))
-            .transactionType(HsOfficeCoopAssetsTransactionType.REVERSAL)
+            .transactionType(HsOfficeCoopAssetsTransactionType.ADJUSTMENT)
             .assetValue(new BigDecimal("-128.00"))
             .comment("some comment")
-            .revertedAssetTx(givenCoopAssetTransaction)
+            .adjustedAssetTx(givenCoopAssetTransaction)
             .build();
 
     final HsOfficeCoopAssetsTransactionEntity givenEmptyCoopAssetsTransaction = HsOfficeCoopAssetsTransactionEntity.builder().build();
@@ -41,12 +41,12 @@ class HsOfficeCoopAssetsTransactionEntityUnitTest {
     }
 
     @Test
-    void toStringWithRevertedAssetTxContainsRevertedAssetTx() {
-        givenCoopAssetTransaction.setRevertedAssetTx(givenCoopAssetReversalTransaction);
+    void toStringWithReverseEntryContainsReverseEntry() {
+        givenCoopAssetTransaction.setAdjustedAssetTx(givenCoopAssetAdjustmentTransaction);
 
         final var result = givenCoopAssetTransaction.toString();
 
-        assertThat(result).isEqualTo("CoopAssetsTransaction(M-1000101: 2020-01-01, DEPOSIT, 128.00, some-ref, some comment, M-1000101:REV:-128.00)");
+        assertThat(result).isEqualTo("CoopAssetsTransaction(M-1000101: 2020-01-01, DEPOSIT, 128.00, some-ref, some comment, M-1000101:ADJ:-128.00)");
     }
 
     @Test

src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java

@@ -69,7 +69,7 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase
                 final var newCoopAssetsTransaction = HsOfficeCoopAssetsTransactionEntity.builder()
                         .membership(givenMembership)
                         .transactionType(HsOfficeCoopAssetsTransactionType.DEPOSIT)
-                        .assetValue(new BigDecimal("6400.00"))
+                        .assetValue(new BigDecimal("128.00"))
                         .valueDate(LocalDate.parse("2022-10-18"))
                         .reference("temp ref A")
                         .build();
@@ -98,7 +98,7 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase
                 final var newCoopAssetsTransaction = HsOfficeCoopAssetsTransactionEntity.builder()
                         .membership(givenMembership)
                         .transactionType(HsOfficeCoopAssetsTransactionType.DEPOSIT)
-                        .assetValue(new BigDecimal("6400.00"))
+                        .assetValue(new BigDecimal("128.00"))
                         .valueDate(LocalDate.parse("2022-10-18"))
                         .reference("temp ref B")
                         .build();
@@ -142,18 +142,18 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopAssetsTransaction(M-1000101: 2010-03-15, DEPOSIT, 320.00, ref 1000101-1, initial deposit)",
                     "CoopAssetsTransaction(M-1000101: 2021-09-01, DISBURSAL, -128.00, ref 1000101-2, partial disbursal)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss, M-1000101:REV:-128.00)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-21, REVERSAL, -128.00, ref 1000101-3, some reversal, M-1000101:DEP:+128.00)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss, M-1000101:ADJ:-128.00)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -128.00, ref 1000101-3, some adjustment, M-1000101:DEP:+128.00)",
 
                     "CoopAssetsTransaction(M-1000202: 2010-03-15, DEPOSIT, 320.00, ref 1000202-1, initial deposit)",
                     "CoopAssetsTransaction(M-1000202: 2021-09-01, DISBURSAL, -128.00, ref 1000202-2, partial disbursal)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss, M-1000202:REV:-128.00)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-21, REVERSAL, -128.00, ref 1000202-3, some reversal, M-1000202:DEP:+128.00)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss, M-1000202:ADJ:-128.00)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -128.00, ref 1000202-3, some adjustment, M-1000202:DEP:+128.00)",
 
                     "CoopAssetsTransaction(M-1000303: 2010-03-15, DEPOSIT, 320.00, ref 1000303-1, initial deposit)",
                     "CoopAssetsTransaction(M-1000303: 2021-09-01, DISBURSAL, -128.00, ref 1000303-2, partial disbursal)",
-                    "CoopAssetsTransaction(M-1000303: 2022-10-20, DEPOSIT, 128.00, ref 1000303-3, some loss, M-1000303:REV:-128.00)",
-                    "CoopAssetsTransaction(M-1000303: 2022-10-21, REVERSAL, -128.00, ref 1000303-3, some reversal, M-1000303:DEP:+128.00)");
+                    "CoopAssetsTransaction(M-1000303: 2022-10-20, DEPOSIT, 128.00, ref 1000303-3, some loss, M-1000303:ADJ:-128.00)",
+                    "CoopAssetsTransaction(M-1000303: 2022-10-21, ADJUSTMENT, -128.00, ref 1000303-3, some adjustment, M-1000303:DEP:+128.00)");
         }
 
         @Test
@@ -173,8 +173,8 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopAssetsTransaction(M-1000202: 2010-03-15, DEPOSIT, 320.00, ref 1000202-1, initial deposit)",
                     "CoopAssetsTransaction(M-1000202: 2021-09-01, DISBURSAL, -128.00, ref 1000202-2, partial disbursal)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss, M-1000202:REV:-128.00)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-21, REVERSAL, -128.00, ref 1000202-3, some reversal, M-1000202:DEP:+128.00)");
+                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss, M-1000202:ADJ:-128.00)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -128.00, ref 1000202-3, some adjustment, M-1000202:DEP:+128.00)");
         }
 
         @Test
@@ -211,8 +211,8 @@ class HsOfficeCoopAssetsTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopAssetsTransaction(M-1000101: 2010-03-15, DEPOSIT, 320.00, ref 1000101-1, initial deposit)",
                     "CoopAssetsTransaction(M-1000101: 2021-09-01, DISBURSAL, -128.00, ref 1000101-2, partial disbursal)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss, M-1000101:REV:-128.00)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-21, REVERSAL, -128.00, ref 1000101-3, some reversal, M-1000101:DEP:+128.00)");
+                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss, M-1000101:ADJ:-128.00)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -128.00, ref 1000101-3, some adjustment, M-1000101:DEP:+128.00)");
         }
     }
 

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java

@@ -62,7 +62,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
     }
 
     @Nested
-    class getListOfCoopSharesTransactions {
+    class ListCoopSharesTransactions {
 
         @Test
         void globalAdmin_canViewAllCoopSharesTransactions() {
@@ -108,21 +108,21 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
                                 "valueDate": "2022-10-20",
                                 "reference": "ref 1000202-3",
                                 "comment": "some subscription",
-                                "reversalShareTx": {
-                                    "transactionType": "REVERSAL",
+                                "adjustmentShareTx": {
+                                    "transactionType": "ADJUSTMENT",
                                     "shareCount": -2,
                                     "valueDate": "2022-10-21",
                                     "reference": "ref 1000202-4",
-                                    "comment": "some reversal"
+                                    "comment": "some adjustment"
                                 }
                             },
                         {
-                            "transactionType": "REVERSAL",
+                            "transactionType": "ADJUSTMENT",
                             "shareCount": -2,
                             "valueDate": "2022-10-21",
                             "reference": "ref 1000202-4",
-                            "comment": "some reversal",
-                            "revertedShareTx": {
+                            "comment": "some adjustment",
+                            "adjustedShareTx": {
                                     "transactionType": "SUBSCRIPTION",
                                     "shareCount": 2,
                                     "valueDate": "2022-10-20",
@@ -191,7 +191,7 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
         }
 
         @Test
-        void globalAdmin_canAddCoopSharesReversalTransaction() {
+        void globalAdmin_canAddCoopSharesAdjustmentTransaction() {
 
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = membershipRepo.findMembershipByMemberNumber(1000101);
@@ -213,16 +213,16 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
                 .header("current-subject", "superuser-alex@hostsharing.net")
                 .contentType(ContentType.JSON)
                 .body("""
-                           {
-                               "membership.uuid": "%s",
-                               "transactionType": "REVERSAL",
-                               "shareCount": %s,
-                               "valueDate": "2022-10-30",
-                               "reference": "test reversal ref",
-                               "comment": "some coop shares reversal transaction",
-                               "revertedShareTx.uuid": "%s"
-                           }
-                           """.formatted(
+                                   {
+                                       "membership.uuid": "%s",
+                                       "transactionType": "ADJUSTMENT",
+                                       "shareCount": %s,
+                                       "valueDate": "2022-10-30",
+                                       "reference": "test ref adjustment",
+                                       "comment": "some coop shares adjustment transaction",
+                                       "adjustedShareTx.uuid": "%s"
+                                     }
+                                """.formatted(
                     givenMembership.getUuid(),
                     -givenTransaction.getShareCount(),
                     givenTransaction.getUuid()))
@@ -235,12 +235,12 @@ class HsOfficeCoopSharesTransactionControllerAcceptanceTest extends ContextBased
                 .body("uuid", isUuidValid())
                 .body("", lenientlyEquals("""
                             {
-                                "transactionType": "REVERSAL",
+                                "transactionType": "ADJUSTMENT",
                                 "shareCount": -13,
                                 "valueDate": "2022-10-30",
-                                "reference": "test reversal ref",
-                                "comment": "some coop shares reversal transaction",
-                                "revertedShareTx": {
+                                "reference": "test ref adjustment",
+                                "comment": "some coop shares adjustment transaction",
+                                "adjustedShareTx": {
                                     "transactionType": "SUBSCRIPTION",
                                     "shareCount": 13,
                                     "valueDate": "2022-10-20",

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerRestTest.java

@@ -73,7 +73,7 @@ class HsOfficeCoopSharesTransactionControllerRestTest {
 
         SHARES_COUNT_MUST_NOT_BE_NULL(
                 requestBody -> requestBody
-                        .with("transactionType", "REVERSAL")
+                        .with("transactionType", "ADJUSTMENT")
                         .with("shareCount", 0),
                 "[shareCount must not be 0 but is \"0\"]"),
 

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntityUnitTest.java

@@ -20,14 +20,14 @@ class HsOfficeCoopSharesTransactionEntityUnitTest {
             .build();
 
 
-    final HsOfficeCoopSharesTransactionEntity givenCoopShareReversalTransaction = HsOfficeCoopSharesTransactionEntity.builder()
+    final HsOfficeCoopSharesTransactionEntity givenCoopShareAdjustmentTransaction = HsOfficeCoopSharesTransactionEntity.builder()
         .membership(TEST_MEMBERSHIP)
         .reference("some-ref")
         .valueDate(LocalDate.parse("2020-01-15"))
-        .transactionType(HsOfficeCoopSharesTransactionType.REVERSAL)
+        .transactionType(HsOfficeCoopSharesTransactionType.ADJUSTMENT)
         .shareCount(-4)
         .comment("some comment")
-        .revertedShareTx(givenCoopSharesTransaction)
+        .adjustedShareTx(givenCoopSharesTransaction)
         .build();
 
     final HsOfficeCoopSharesTransactionEntity givenEmptyCoopSharesTransaction = HsOfficeCoopSharesTransactionEntity.builder().build();
@@ -40,12 +40,12 @@ class HsOfficeCoopSharesTransactionEntityUnitTest {
     }
 
     @Test
-    void toStringWithRevertedAssetTxContainsRevertedAssetTx() {
-        givenCoopSharesTransaction.setRevertedShareTx(givenCoopShareReversalTransaction);
+    void toStringWithReverseEntryContainsReverseEntry() {
+        givenCoopSharesTransaction.setAdjustedShareTx(givenCoopShareAdjustmentTransaction);
 
         final var result = givenCoopSharesTransaction.toString();
 
-        assertThat(result).isEqualTo("CoopShareTransaction(M-1000101: 2020-01-01, SUBSCRIPTION, 4, some-ref, some comment, M-1000101:REV:-4)");
+        assertThat(result).isEqualTo("CoopShareTransaction(M-1000101: 2020-01-01, SUBSCRIPTION, 4, some-ref, some comment, M-1000101:ADJ:-4)");
     }
 
     @Test

src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java

@@ -141,18 +141,18 @@ class HsOfficeCoopSharesTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopShareTransaction(M-1000101: 2010-03-15, SUBSCRIPTION, 4, ref 1000101-1, initial subscription)",
                     "CoopShareTransaction(M-1000101: 2021-09-01, CANCELLATION, -2, ref 1000101-2, cancelling some)",
-                    "CoopShareTransaction(M-1000101: 2022-10-20, SUBSCRIPTION, 2, ref 1000101-3, some subscription, M-1000101:REV:-2)",
-                    "CoopShareTransaction(M-1000101: 2022-10-21, REVERSAL, -2, ref 1000101-4, some reversal, M-1000101:SUB:+2)",
+                    "CoopShareTransaction(M-1000101: 2022-10-20, SUBSCRIPTION, 2, ref 1000101-3, some subscription, M-1000101:ADJ:-2)",
+                    "CoopShareTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -2, ref 1000101-4, some adjustment, M-1000101:SUB:+2)",
 
                     "CoopShareTransaction(M-1000202: 2010-03-15, SUBSCRIPTION, 4, ref 1000202-1, initial subscription)",
                     "CoopShareTransaction(M-1000202: 2021-09-01, CANCELLATION, -2, ref 1000202-2, cancelling some)",
-                    "CoopShareTransaction(M-1000202: 2022-10-20, SUBSCRIPTION, 2, ref 1000202-3, some subscription, M-1000202:REV:-2)",
-                    "CoopShareTransaction(M-1000202: 2022-10-21, REVERSAL, -2, ref 1000202-4, some reversal, M-1000202:SUB:+2)",
+                    "CoopShareTransaction(M-1000202: 2022-10-20, SUBSCRIPTION, 2, ref 1000202-3, some subscription, M-1000202:ADJ:-2)",
+                    "CoopShareTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -2, ref 1000202-4, some adjustment, M-1000202:SUB:+2)",
 
                     "CoopShareTransaction(M-1000303: 2010-03-15, SUBSCRIPTION, 4, ref 1000303-1, initial subscription)",
                     "CoopShareTransaction(M-1000303: 2021-09-01, CANCELLATION, -2, ref 1000303-2, cancelling some)",
-                    "CoopShareTransaction(M-1000303: 2022-10-20, SUBSCRIPTION, 2, ref 1000303-3, some subscription, M-1000303:REV:-2)",
-                    "CoopShareTransaction(M-1000303: 2022-10-21, REVERSAL, -2, ref 1000303-4, some reversal, M-1000303:SUB:+2)");
+                    "CoopShareTransaction(M-1000303: 2022-10-20, SUBSCRIPTION, 2, ref 1000303-3, some subscription, M-1000303:ADJ:-2)",
+                    "CoopShareTransaction(M-1000303: 2022-10-21, ADJUSTMENT, -2, ref 1000303-4, some adjustment, M-1000303:SUB:+2)");
         }
 
         @Test
@@ -172,8 +172,8 @@ class HsOfficeCoopSharesTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopShareTransaction(M-1000202: 2010-03-15, SUBSCRIPTION, 4, ref 1000202-1, initial subscription)",
                     "CoopShareTransaction(M-1000202: 2021-09-01, CANCELLATION, -2, ref 1000202-2, cancelling some)",
-                    "CoopShareTransaction(M-1000202: 2022-10-20, SUBSCRIPTION, 2, ref 1000202-3, some subscription, M-1000202:REV:-2)",
-                    "CoopShareTransaction(M-1000202: 2022-10-21, REVERSAL, -2, ref 1000202-4, some reversal, M-1000202:SUB:+2)");
+                    "CoopShareTransaction(M-1000202: 2022-10-20, SUBSCRIPTION, 2, ref 1000202-3, some subscription, M-1000202:ADJ:-2)",
+                    "CoopShareTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -2, ref 1000202-4, some adjustment, M-1000202:SUB:+2)");
         }
 
         @Test
@@ -210,8 +210,8 @@ class HsOfficeCoopSharesTransactionRepositoryIntegrationTest extends ContextBase
                     result,
                     "CoopShareTransaction(M-1000101: 2010-03-15, SUBSCRIPTION, 4, ref 1000101-1, initial subscription)",
                     "CoopShareTransaction(M-1000101: 2021-09-01, CANCELLATION, -2, ref 1000101-2, cancelling some)",
-                    "CoopShareTransaction(M-1000101: 2022-10-20, SUBSCRIPTION, 2, ref 1000101-3, some subscription, M-1000101:REV:-2)",
-                    "CoopShareTransaction(M-1000101: 2022-10-21, REVERSAL, -2, ref 1000101-4, some reversal, M-1000101:SUB:+2)");
+                    "CoopShareTransaction(M-1000101: 2022-10-20, SUBSCRIPTION, 2, ref 1000101-3, some subscription, M-1000101:ADJ:-2)",
+                    "CoopShareTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -2, ref 1000101-4, some adjustment, M-1000101:SUB:+2)");
         }
     }
 

src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerRestTest.java

@@ -20,7 +20,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import java.util.UUID;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -45,36 +44,8 @@ public class HsOfficeMembershipControllerRestTest {
     @MockBean
     EntityManagerWrapper em;
 
-    @Nested
-    class GetMemberships {
-
-        @Test
-        void findMembershipByNonExistingMemberNumberReturnsEmptyList() throws Exception {
-
-            // when
-            mockMvc.perform(MockMvcRequestBuilders
-                            .get("/api/hs/office/memberships?memberNumber=12345")
-                            .header("current-subject", "superuser-alex@hostsharing.net")
-                            .contentType(MediaType.APPLICATION_JSON)
-                            .content("""
-                                       {
-                                           "partner.uuid": null,
-                                           "memberNumberSuffix": "01",
-                                           "validFrom": "2022-10-13",
-                                           "membershipFeeBillable": "true"
-                                         }
-                                    """)
-                            .accept(MediaType.APPLICATION_JSON))
-
-                    // then
-                    .andExpect(status().is2xxSuccessful())
-                    .andExpect(jsonPath("$", hasSize(0)));
-        }
-    }
-
     @Nested
     class AddMembership {
-
         @Test
         void respondBadRequest_ifPartnerUuidIsMissing() throws Exception {
 
@@ -127,9 +98,7 @@ public class HsOfficeMembershipControllerRestTest {
                     .andExpect(status().is4xxClientError())
                     .andExpect(jsonPath("statusCode", is(400)))
                     .andExpect(jsonPath("statusPhrase", is("Bad Request")))
-                    .andExpect(jsonPath(
-                            "message",
-                            is("ERROR: [400] Unable to find Partner by partner.uuid: " + givenPartnerUuid)));
+                    .andExpect(jsonPath("message", is("ERROR: [400] Unable to find Partner by partner.uuid: " + givenPartnerUuid)));
         }
 
         @ParameterizedTest

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java

@@ -13,12 +13,6 @@ import net.hostsharing.hsadminng.hs.office.scenarios.debitor.DontDeleteDefaultDe
 import net.hostsharing.hsadminng.hs.office.scenarios.debitor.InvalidateSepaMandateForDebitor;
 import net.hostsharing.hsadminng.hs.office.scenarios.membership.CancelMembership;
 import net.hostsharing.hsadminng.hs.office.scenarios.membership.CreateMembership;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets.CreateCoopAssetsDepositTransaction;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets.CreateCoopAssetsDisbursalTransaction;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets.CreateCoopAssetsRevertTransaction;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares.CreateCoopSharesCancellationTransaction;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares.CreateCoopSharesRevertTransaction;
-import net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares.CreateCoopSharesSubscriptionTransaction;
 import net.hostsharing.hsadminng.hs.office.scenarios.partner.AddOperationsContactToPartner;
 import net.hostsharing.hsadminng.hs.office.scenarios.partner.CreatePartner;
 import net.hostsharing.hsadminng.hs.office.scenarios.debitor.DeleteDebitor;
@@ -55,7 +49,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1010)
-    @Produces(explicitly = "Partner: P-31010 - Test AG", implicitly = {"Person: Test AG", "Contact: Test AG - Hamburg"})
+    @Produces(explicitly = "Partner: Test AG", implicitly = {"Person: Test AG", "Contact: Test AG - Hamburg"})
     void shouldCreateLegalPersonAsPartner() {
         new CreatePartner(this)
                 .given("partnerNumber", 31010)
@@ -77,7 +71,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1011)
-    @Produces(explicitly = "Partner: P-31011 - Michelle Matthieu", implicitly = {"Person: Michelle Matthieu", "Contact: Michelle Matthieu"})
+    @Produces(explicitly = "Partner: Michelle Matthieu", implicitly = {"Person: Michelle Matthieu", "Contact: Michelle Matthieu"})
     void shouldCreateNaturalPersonAsPartner() {
         new CreatePartner(this)
                 .given("partnerNumber", 31011)
@@ -154,7 +148,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1100)
-    @Requires("Partner: P-31011 - Michelle Matthieu")
+    @Requires("Partner: Michelle Matthieu")
     void shouldAmendContactData() {
         new AmendContactData(this)
                 .given("partnerName", "Matthieu")
@@ -164,7 +158,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1101)
-    @Requires("Partner: P-31011 - Michelle Matthieu")
+    @Requires("Partner: Michelle Matthieu")
     void shouldAddPhoneNumberToContactData() {
         new AddPhoneNumberToContactData(this)
                 .given("partnerName", "Matthieu")
@@ -175,7 +169,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1102)
-    @Requires("Partner: P-31011 - Michelle Matthieu")
+    @Requires("Partner: Michelle Matthieu")
     void shouldRemovePhoneNumberFromContactData() {
         new RemovePhoneNumberFromContactData(this)
                 .given("partnerName", "Matthieu")
@@ -185,7 +179,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1103)
-    @Requires("Partner: P-31010 - Test AG")
+    @Requires("Partner: Test AG")
     void shouldReplaceContactData() {
         new ReplaceContactData(this)
                 .given("partnerName", "Test AG")
@@ -207,7 +201,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(1201)
-    @Requires("Partner: P-31011 - Michelle Matthieu")
+    @Requires("Partner: Michelle Matthieu")
     void shouldUpdatePersonData() {
         new ShouldUpdatePersonData(this)
                 .given("oldFamilyName", "Matthieu")
@@ -217,7 +211,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(2010)
-    @Requires("Partner: P-31010 - Test AG")
+    @Requires("Partner: Test AG")
     @Produces("Debitor: Test AG - main debitor")
     void shouldCreateSelfDebitorForPartner() {
         new CreateSelfDebitorForPartner(this, "Debitor: Test AG - main debitor")
@@ -267,18 +261,18 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(2020)
-    @Requires("Debitor: D-3101000 - Test AG - main debitor")
+    @Requires("Debitor: Test AG - main debitor")
     @Disabled("see TODO.spec in DontDeleteDefaultDebitor")
     void shouldNotDeleteDefaultDebitor() {
         new DontDeleteDefaultDebitor(this)
-                .given("partnerNumber", 31010)
+                .given("partnerNumber", 31020)
                 .given("debitorSuffix", "00")
                 .doRun();
     }
 
     @Test
     @Order(3100)
-    @Requires("Debitor: D-3101000 - Test AG - main debitor")
+    @Requires("Debitor: Test AG - main debitor")
     @Produces("SEPA-Mandate: Test AG")
     void shouldCreateSepaMandateForDebitor() {
         new CreateSepaMandateForDebitor(this)
@@ -319,11 +313,12 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(4000)
-    @Requires("Partner: P-31010 - Test AG")
-    @Produces("Membership: M-3101000 - Test AG")
+    @Requires("Partner: Test AG")
+    @Produces("Membership: Test AG 00")
     void shouldCreateMembershipForPartner() {
         new CreateMembership(this)
                 .given("partnerName", "Test AG")
+                .given("memberNumberSuffix", "00")
                 .given("validFrom", "2024-10-15")
                 .given("newStatus", "ACTIVE")
                 .given("membershipFeeBillable", "true")
@@ -331,87 +326,9 @@ class HsOfficeScenarioTests extends ScenarioTest {
                 .keep();
     }
 
-    @Test
-    @Order(4201)
-    @Requires("Membership: M-3101000 - Test AG")
-    @Produces("Coop-Shares SUBSCRIPTION Transaction")
-    void shouldSubscribeCoopShares() {
-        new CreateCoopSharesSubscriptionTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("reference", "sign 2024-01-15")
-                .given("shareCount", 100)
-                .given("comment", "Signing the Membership")
-                .given("transactionDate", "2024-01-15")
-                .doRun();
-    }
-
-    @Test
-    @Order(4202)
-    @Requires("Membership: M-3101000 - Test AG")
-    void shouldRevertCoopSharesSubscription() {
-        new CreateCoopSharesRevertTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("comment", "reverting some incorrect transaction")
-                .given("dateOfIncorrectTransaction", "2024-02-15")
-                .doRun();
-    }
-
-    @Test
-    @Order(4202)
-    @Requires("Coop-Shares SUBSCRIPTION Transaction")
-    @Produces("Coop-Shares CANCELLATION Transaction")
-    void shouldCancelCoopSharesSubscription() {
-        new CreateCoopSharesCancellationTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("reference", "cancel 2024-01-15")
-                .given("sharesToCancel", 8)
-                .given("comment", "Cancelling 8 Shares")
-                .given("transactionDate", "2024-02-15")
-                .doRun();
-    }
-
-    @Test
-    @Order(4301)
-    @Requires("Membership: M-3101000 - Test AG")
-    @Produces("Coop-Assets DEPOSIT Transaction")
-    void shouldSubscribeCoopAssets() {
-        new CreateCoopAssetsDepositTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("reference", "sign 2024-01-15")
-                .given("assetValue", 100*64)
-                .given("comment", "disposal for initial shares")
-                .given("transactionDate", "2024-01-15")
-                .doRun();
-    }
-
-    @Test
-    @Order(4302)
-    @Requires("Membership: M-3101000 - Test AG")
-    void shouldRevertCoopAssetsSubscription() {
-        new CreateCoopAssetsRevertTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("comment", "reverting some incorrect transaction")
-                .given("dateOfIncorrectTransaction", "2024-02-15")
-                .doRun();
-    }
-
-    @Test
-    @Order(4302)
-    @Requires("Coop-Assets DEPOSIT Transaction")
-    @Produces("Coop-Assets DISBURSAL Transaction")
-    void shouldDisburseCoopAssets() {
-        new CreateCoopAssetsDisbursalTransaction(this)
-                .given("memberNumber", "3101000")
-                .given("reference", "cancel 2024-01-15")
-                .given("valueToDisburse", 8*64)
-                .given("comment", "disbursal according to shares cancellation")
-                .given("transactionDate", "2024-02-15")
-                .doRun();
-    }
-
     @Test
     @Order(4900)
-    @Requires("Membership: M-3101000 - Test AG")
+    @Requires("Membership: Test AG 00")
     void shouldCancelMembershipOfPartner() {
         new CancelMembership(this)
                 .given("memberNumber", "3101000")

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/PathAssertion.java

@@ -4,9 +4,6 @@ import net.hostsharing.hsadminng.hs.office.scenarios.UseCase.HttpResponse;
 
 import java.util.function.Consumer;
 
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
-import static org.junit.jupiter.api.Assertions.fail;
-
 public class PathAssertion {
 
     private final String path;
@@ -17,35 +14,10 @@ public class PathAssertion {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public Consumer<UseCase.HttpResponse> contains(final String resolvableValue) {
-        return response -> {
-            try {
-                response.path(path).map(this::asString).contains(ScenarioTest.resolve(resolvableValue, DROP_COMMENTS));
-            } catch (final AssertionError e) {
-                // without this, the error message is often lacking important context
-                fail(e.getMessage() + " in `path(\"" + path +  "\").contains(\"" + resolvableValue + "\")`" );
-            }
-        };
+        return response -> response.path(path).contains(ScenarioTest.resolve(resolvableValue));
     }
 
     public Consumer<HttpResponse> doesNotExist() {
-        return response -> {
-            try {
-                response.path(path).isNull(); // here, null Optional means key not found in JSON
-            } catch (final AssertionError e) {
-                // without this, the error message is often lacking important context
-                fail(e.getMessage() + " in `path(\"" + path +  "\").doesNotExist()`" );
-            }
-        };
-    }
-
-    private String asString(final Object value) {
-        if (value instanceof Double doubleValue) {
-            if (doubleValue % 1 == 0) {
-                return String.valueOf(doubleValue.intValue()); // avoid trailing ".0"
-            } else {
-                return doubleValue.toString();
-            }
-        }
-        return value.toString();
+        return response -> response.path(path).isNull(); // here, null Optional means key not found in JSON
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java

@@ -3,7 +3,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios;
 import lombok.SneakyThrows;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
-import net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver;
 import net.hostsharing.hsadminng.lambda.Reducer;
 import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
@@ -27,8 +26,6 @@ import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class ScenarioTest extends ContextBasedTest {
@@ -41,11 +38,11 @@ public abstract class ScenarioTest extends ContextBasedTest {
         public String toString() {
             return ObjectUtils.toString(uuid);
         }
-
     }
-    private final static Map<String, Alias<?>> aliases = new HashMap<>();
 
+    private final static Map<String, Alias<?>> aliases = new HashMap<>();
     private final static Map<String, Object> properties = new HashMap<>();
+
     public final TestReport testReport = new TestReport(aliases);
 
     @LocalServerPort
@@ -142,9 +139,9 @@ public abstract class ScenarioTest extends ContextBasedTest {
     }
 
     static UUID uuid(final String nameWithPlaceholders) {
-        final var resolvedName = resolve(nameWithPlaceholders, DROP_COMMENTS);
-        final UUID alias = ofNullable(knowVariables().get(resolvedName)).filter(v -> v instanceof UUID).map(UUID.class::cast).orElse(null);
-        assertThat(alias).as("alias '" + resolvedName + "' not found in aliases nor in properties [" +
+        final var resoledName = resolve(nameWithPlaceholders);
+        final UUID alias = ofNullable(knowVariables().get(resoledName)).filter(v -> v instanceof UUID).map(UUID.class::cast).orElse(null);
+        assertThat(alias).as("alias '" + resoledName + "' not found in aliases nor in properties [" +
                 knowVariables().keySet().stream().map(v -> "'" + v + "'").collect(Collectors.joining(", ")) + "]"
         ).isNotNull();
         return alias;
@@ -165,13 +162,13 @@ public abstract class ScenarioTest extends ContextBasedTest {
         return map;
     }
 
-    public static String resolve(final String text, final Resolver resolver) {
-        final var resolved = new TemplateResolver(text, ScenarioTest.knowVariables()).resolve(resolver);
+    public static String resolve(final String text) {
+        final var resolved = new TemplateResolver(text, ScenarioTest.knowVariables()).resolve();
         return resolved;
     }
 
     public static Object resolveTyped(final String text) {
-        final var resolved = resolve(text, DROP_COMMENTS);
+        final var resolved = resolve(text);
         try {
             return UUID.fromString(resolved);
         } catch (final IllegalArgumentException e) {

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java

@@ -10,39 +10,29 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
-
 public class TemplateResolver {
 
-    public enum Resolver {
-        DROP_COMMENTS,  // deletes comments ('#{whatever}' -> '')
-        KEEP_COMMENTS   // keep comments ('#{whatever}' -> 'whatever')
-    }
+    private final static Pattern pattern = Pattern.compile(",(\\s*})", Pattern.MULTILINE);
+    private static final String IF_NOT_FOUND_SYMBOL = "???";
 
     enum PlaceholderPrefix {
         RAW('%') {
             @Override
-            String convert(final Object value, final Resolver resolver) {
+            String convert(final Object value) {
                 return value != null ? value.toString() : "";
             }
         },
         JSON_QUOTED('$'){
             @Override
-            String convert(final Object value, final Resolver resolver) {
+            String convert(final Object value) {
                 return jsonQuoted(value);
             }
         },
         URI_ENCODED('&'){
             @Override
-            String convert(final Object value, final Resolver resolver) {
+            String convert(final Object value) {
                 return value != null ? URLEncoder.encode(value.toString(), StandardCharsets.UTF_8) : "";
             }
-        },
-        COMMENT('#'){
-            @Override
-            String convert(final Object value, final Resolver resolver) {
-                return resolver == DROP_COMMENTS ? "" : value.toString();
-            }
         };
 
         private final char prefixChar;
@@ -52,24 +42,19 @@ public class TemplateResolver {
         }
 
         static boolean contains(final char givenChar) {
-            return Arrays.stream(values()).anyMatch(p -> p.prefixChar == givenChar);
+           return Arrays.stream(values()).anyMatch(p -> p.prefixChar == givenChar);
         }
 
         static PlaceholderPrefix ofPrefixChar(final char givenChar) {
             return Arrays.stream(values()).filter(p -> p.prefixChar == givenChar).findFirst().orElseThrow();
         }
 
-        abstract String convert(final Object value, final Resolver resolver);
+        abstract String convert(final Object value);
     }
 
-    private static final Pattern COMMA_RIGHT_BEFORE_CLOSING_BRACE = Pattern.compile(",(\\s*})", Pattern.MULTILINE);
-    private static final String IF_NOT_FOUND_SYMBOL = "???";
-
     private final String template;
     private final Map<String, Object> properties;
     private final StringBuilder resolved = new StringBuilder();
-
-    private Resolver resolver;
     private int position = 0;
 
     public TemplateResolver(final String template, final Map<String, Object> properties) {
@@ -77,8 +62,7 @@ public class TemplateResolver {
         this.properties = properties;
     }
 
-    String resolve(final Resolver resolver) {
-        this.resolver = resolver;
+    String resolve() {
         final var resolved = copy();
         final var withoutDroppedLines = dropLinesWithNullProperties(resolved);
         final var result = removeDanglingCommas(withoutDroppedLines);
@@ -86,7 +70,7 @@ public class TemplateResolver {
     }
 
     private static String removeDanglingCommas(final String withoutDroppedLines) {
-        return COMMA_RIGHT_BEFORE_CLOSING_BRACE.matcher(withoutDroppedLines).replaceAll("$1");
+        return pattern.matcher(withoutDroppedLines).replaceAll("$1");
     }
 
     private String dropLinesWithNullProperties(final String text) {
@@ -135,10 +119,10 @@ public class TemplateResolver {
                 placeholder.append(fetchChar());
             }
         }
-        final var content = new TemplateResolver(placeholder.toString(), properties).resolve(resolver);
-        final var value = intro != '#' ? propVal(content) : content;
+        final var name = new TemplateResolver(placeholder.toString(), properties).resolve();
+        final var value = propVal(name);
         resolved.append(
-                PlaceholderPrefix.ofPrefixChar(intro).convert(value, resolver)
+                PlaceholderPrefix.ofPrefixChar(intro).convert(value)
         );
         skipChar('}');
     }
@@ -150,12 +134,12 @@ public class TemplateResolver {
         } else if (nameExpression.contains(IF_NOT_FOUND_SYMBOL)) {
             final var parts = StringUtils.split(nameExpression, IF_NOT_FOUND_SYMBOL);
             return Arrays.stream(parts).filter(Objects::nonNull).findFirst().orElseGet(() -> {
-                if ( parts[parts.length-1].isEmpty() ) {
-                    // => whole expression ends with IF_NOT_FOUND_SYMBOL, thus last null element was optional
-                    return null;
-                }
-                // => last alternative element in expression was null and not optional
-                throw new IllegalStateException("Missing required value in property-chain: " + nameExpression);
+                    if ( parts[parts.length-1].isEmpty() ) {
+                        // => whole expression ends with IF_NOT_FOUND_SYMBOL, thus last null element was optional
+                        return null;
+                    }
+                    // => last alternative element in expression was null and not optional
+                    throw new IllegalStateException("Missing required value in property-chain: " + nameExpression);
             });
         } else {
             final var val = properties.get(nameExpression);

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java

@@ -4,7 +4,6 @@ import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class TemplateResolverUnitTest {
@@ -43,7 +42,7 @@ class TemplateResolverUnitTest {
                         Map.entry("simple placeholder", "einfach"),
                         Map.entry("nested placeholder", "verschachtelt"),
                         Map.entry("with-special-chars", "3&3 AG")
-                )).resolve(DROP_COMMENTS);
+                )).resolve();
 
         assertThat(resolved).isEqualTo("""
                 with optional JSON quotes:

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TestReport.java

@@ -1,8 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios;
 
 import lombok.SneakyThrows;
-import net.hostsharing.hsadminng.system.SystemProcess;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.TestInfo;
 
@@ -11,41 +9,29 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestReport {
 
-    public static final File BUILD_DOC_SCENARIOS = new File("build/doc/scenarios");
-    private final static File markdownLogFile = new File(BUILD_DOC_SCENARIOS, ".last-debug-log.md");
-    public static final SimpleDateFormat MM_DD_YYYY_HH_MM_SS = new SimpleDateFormat("MM-dd-yyyy hh:mm:ss");
-
     private final Map<String, ?> aliases;
-    private final PrintWriter markdownLog; // records everything for debugging purposes
-    private File markdownReportFile;
-    private PrintWriter markdownReport; // records only the use-case under test, without its pre-requisites
+    private final StringBuilder markdownLog = new StringBuilder(); // records everything for debugging purposes
+
+    private PrintWriter markdownReport;
     private int silent; // do not print anything to test-report if >0
 
-    static {
-        assertThat(BUILD_DOC_SCENARIOS.isDirectory() || BUILD_DOC_SCENARIOS.mkdirs())
-                .as("mkdir " + BUILD_DOC_SCENARIOS).isTrue();
-    }
-
-    @SneakyThrows
     public TestReport(final Map<String, ?> aliases) {
         this.aliases = aliases;
-        this.markdownLog = new PrintWriter(new FileWriter(markdownLogFile));
     }
 
     public void createTestLogMarkdownFile(final TestInfo testInfo) throws IOException {
         final var testMethodName = testInfo.getTestMethod().map(Method::getName).orElseThrow();
         final var testMethodOrder = testInfo.getTestMethod().map(m -> m.getAnnotation(Order.class).value()).orElseThrow();
-        markdownReportFile = new File(BUILD_DOC_SCENARIOS, testMethodOrder + "-" + testMethodName + ".md");
-        markdownReport = new PrintWriter(new FileWriter(markdownReportFile));
-        print("## Scenario #" + determineScenarioTitle(testInfo));
+        assertThat(new File("doc/scenarios/").isDirectory() || new File("doc/scenarios/").mkdirs()).as("mkdir doc/scenarios/").isTrue();
+        markdownReport = new PrintWriter(new FileWriter("doc/scenarios/" + testMethodOrder + "-" + testMethodName + ".md"));
+        print("## Scenario #" + testInfo.getTestMethod().map(TestReport::orderNumber).orElseThrow() + ": " +
+                testMethodName.replaceAll("([a-z])([A-Z]+)", "$1 $2"));
     }
 
     @SneakyThrows
@@ -59,7 +45,7 @@ public class TestReport {
         }
 
         // but the debugLog should contain all output, even if silent
-        markdownLog.print(outputWithCommentsForUuids);
+        markdownLog.append(outputWithCommentsForUuids);
     }
 
     public void printLine(final String output) {
@@ -70,32 +56,10 @@ public class TestReport {
         printLine("\n" +output + "\n");
     }
 
-    void silent(final Runnable code) {
-        silent++;
-        code.run();
-        silent--;
-    }
-
     public void close() {
         if (markdownReport != null) {
-            printPara("---");
-            printPara("generated on " + MM_DD_YYYY_HH_MM_SS.format(new Date()) + " for branch " + currentGitBranch());
             markdownReport.close();
-            System.out.println("SCENARIO REPORT: " + asClickableLink(markdownReportFile));
         }
-        markdownLog.close();
-        System.out.println("DEBUG LOG: " + asClickableLink(markdownLogFile));
-    }
-
-    private static @NotNull String determineScenarioTitle(final TestInfo testInfo) {
-        final var convertedTestMethodName =
-                testInfo.getTestMethod().map(TestReport::orderNumber).orElseThrow() + ": " +
-                testInfo.getTestMethod().map(Method::getName).map(t -> t.replaceAll("([a-z])([A-Z]+)", "$1 $2")).orElseThrow();
-        return convertedTestMethodName.replaceAll(": should ", ": ");
-    }
-
-    private String asClickableLink(final File file) {
-        return file.toURI().toString().replace("file:/", "file:///");
     }
 
     private static Object orderNumber(final Method method) {
@@ -119,16 +83,10 @@ public class TestReport {
         return result.toString();
     }
 
-    @SneakyThrows
-    private String currentGitBranch() {
-        try {
-            final var gitRevParse = new SystemProcess("git", "rev-parse", "--abbrev-ref", "HEAD");
-            gitRevParse.execute();
-            return gitRevParse.getStdOut().split("\\R", 2)[0];
-        } catch (final IOException exc) {
-            // TODO.test: the git call does not work in Jenkins, we have to find out why
-            System.err.println(exc);
-            return "unknown";
-        }
+    void silent(final Runnable code) {
+        silent++;
+        code.run();
+        silent--;
     }
+
 }

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java

@@ -3,7 +3,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.PathNotFoundException;
 import io.restassured.http.ContentType;
 import lombok.Getter;
 import lombok.SneakyThrows;
@@ -34,8 +33,6 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static java.net.URLEncoder.encode;
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
-import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.KEEP_COMMENTS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.platform.commons.util.StringUtils.isBlank;
@@ -53,7 +50,6 @@ public abstract class UseCase<T extends UseCase<?>> {
     private final Map<String, Object> givenProperties = new LinkedHashMap<>();
 
     private String nextTitle; // just temporary to override resultAlias for sub-use-cases
-    private String introduction;
 
     public UseCase(final ScenarioTest testSuite) {
         this(testSuite, getResultAliasFromProducesAnnotationInCallStack());
@@ -75,9 +71,6 @@ public abstract class UseCase<T extends UseCase<?>> {
     }
 
     public final HttpResponse doRun() {
-        if (introduction != null) {
-            testReport.printPara(introduction);
-        }
         testReport.printPara("### Given Properties");
         testReport.printLine("""
                 | name | value |
@@ -88,7 +81,7 @@ public abstract class UseCase<T extends UseCase<?>> {
         testReport.silent(() ->
                 requirements.forEach((alias, factory) -> {
                     if (!ScenarioTest.containsAlias(alias)) {
-                        factory.apply(alias).run().keepAs(alias);
+                        factory.apply(alias).run().keep();
                     }
                 })
         );
@@ -102,11 +95,6 @@ public abstract class UseCase<T extends UseCase<?>> {
     protected void verify(final HttpResponse response) {
     }
 
-    public UseCase<T> introduction(final String introduction) {
-        this.introduction = introduction;
-        return this;
-    }
-
     public final UseCase<T> given(final String propName, final Object propValue) {
         givenProperties.put(propName, propValue);
         ScenarioTest.putProperty(propName, propValue);
@@ -118,11 +106,11 @@ public abstract class UseCase<T extends UseCase<?>> {
     }
 
     public final void obtain(
-            final String title,
+            final String alias,
             final Supplier<HttpResponse> http,
             final Function<HttpResponse, String> extractor,
             final String... extraInfo) {
-        withTitle(title, () -> {
+        withTitle(ScenarioTest.resolve(alias), () -> {
             final var response = http.get().keep(extractor);
             Arrays.stream(extraInfo).forEach(testReport::printPara);
             return response;
@@ -130,15 +118,15 @@ public abstract class UseCase<T extends UseCase<?>> {
     }
 
     public final void obtain(final String alias, final Supplier<HttpResponse> http, final String... extraInfo) {
-        withTitle(alias, () -> {
+        withTitle(ScenarioTest.resolve(alias), () -> {
             final var response = http.get().keep();
             Arrays.stream(extraInfo).forEach(testReport::printPara);
             return response;
         });
     }
 
-    public HttpResponse withTitle(final String resolvableTitle, final Supplier<HttpResponse> code) {
-        this.nextTitle = resolvableTitle;
+    public HttpResponse withTitle(final String title, final Supplier<HttpResponse> code) {
+        this.nextTitle = title;
         final var response = code.get();
         this.nextTitle = null;
         return response;
@@ -146,7 +134,7 @@ public abstract class UseCase<T extends UseCase<?>> {
 
     @SneakyThrows
     public final HttpResponse httpGet(final String uriPathWithPlaceholders) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders, DROP_COMMENTS);
+        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
         final var request = HttpRequest.newBuilder()
                 .GET()
                 .uri(new URI("http://localhost:" + testSuite.port + uriPath))
@@ -159,7 +147,7 @@ public abstract class UseCase<T extends UseCase<?>> {
 
     @SneakyThrows
     public final HttpResponse httpPost(final String uriPathWithPlaceholders, final JsonTemplate bodyJsonTemplate) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders, DROP_COMMENTS);
+        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
         final var requestBody = bodyJsonTemplate.resolvePlaceholders();
         final var request = HttpRequest.newBuilder()
                 .POST(BodyPublishers.ofString(requestBody))
@@ -174,7 +162,7 @@ public abstract class UseCase<T extends UseCase<?>> {
 
     @SneakyThrows
     public final HttpResponse httpPatch(final String uriPathWithPlaceholders, final JsonTemplate bodyJsonTemplate) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders, DROP_COMMENTS);
+        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
         final var requestBody = bodyJsonTemplate.resolvePlaceholders();
         final var request = HttpRequest.newBuilder()
                 .method(HttpMethod.PATCH.toString(), BodyPublishers.ofString(requestBody))
@@ -189,7 +177,7 @@ public abstract class UseCase<T extends UseCase<?>> {
 
     @SneakyThrows
     public final HttpResponse httpDelete(final String uriPathWithPlaceholders) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders, DROP_COMMENTS);
+        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
         final var request = HttpRequest.newBuilder()
                 .DELETE()
                 .uri(new URI("http://localhost:" + testSuite.port + uriPath))
@@ -209,7 +197,7 @@ public abstract class UseCase<T extends UseCase<?>> {
             final String title,
             final Supplier<UseCase.HttpResponse> http,
             final Consumer<UseCase.HttpResponse>... assertions) {
-        withTitle(title, () -> {
+        withTitle(ScenarioTest.resolve(title), () -> {
             final var response = http.get();
             Arrays.stream(assertions).forEach(assertion ->  assertion.accept(response));
             return response;
@@ -221,7 +209,7 @@ public abstract class UseCase<T extends UseCase<?>> {
     }
 
     public String uriEncoded(final String text) {
-        return encode(ScenarioTest.resolve(text, DROP_COMMENTS), StandardCharsets.UTF_8);
+        return encode(ScenarioTest.resolve(text), StandardCharsets.UTF_8);
     }
 
     public static class JsonTemplate {
@@ -233,7 +221,7 @@ public abstract class UseCase<T extends UseCase<?>> {
         }
 
         String resolvePlaceholders() {
-            return ScenarioTest.resolve(template, DROP_COMMENTS);
+            return ScenarioTest.resolve(template);
         }
     }
 
@@ -278,7 +266,7 @@ public abstract class UseCase<T extends UseCase<?>> {
         }
 
         public HttpResponse keep(final Function<HttpResponse, String> extractor) {
-            final var alias = nextTitle != null ? ScenarioTest.resolve(nextTitle, DROP_COMMENTS) : resultAlias;
+            final var alias = nextTitle != null ? nextTitle : resultAlias;
             assertThat(alias).as("cannot keep result, no alias found").isNotNull();
 
             final var value = extractor.apply(this);
@@ -288,20 +276,15 @@ public abstract class UseCase<T extends UseCase<?>> {
             return this;
         }
 
-        public HttpResponse keepAs(final String alias) {
+        public HttpResponse keep() {
+            final var alias = nextTitle != null ? nextTitle : resultAlias;
+            assertThat(alias).as("cannot keep result, no alias found").isNotNull();
             ScenarioTest.putAlias(
-                    nonNullAlias(alias),
+                    alias,
                     new ScenarioTest.Alias<>(UseCase.this.getClass(), locationUuid));
             return this;
         }
 
-        public HttpResponse keep() {
-            final var alias = nextTitle != null ? ScenarioTest.resolve(nextTitle, DROP_COMMENTS) : resultAlias;
-            assertThat(alias).as("cannot keep result, no title or alias found for locationUuid: " + locationUuid).isNotNull();
-
-            return keepAs(alias);
-        }
-
         @SneakyThrows
         public HttpResponse expectArrayElements(final int expectedElementCount) {
             final var rootNode = objectMapper.readTree(response.body());
@@ -315,20 +298,20 @@ public abstract class UseCase<T extends UseCase<?>> {
 
         @SneakyThrows
         public String getFromBody(final String path) {
-            return JsonPath.parse(response.body()).read(ScenarioTest.resolve(path, DROP_COMMENTS));
+            return JsonPath.parse(response.body()).read(ScenarioTest.resolve(path));
         }
 
         @SneakyThrows
-        public <T> Optional<T> getFromBodyAsOptional(final String path) {
+        public Optional<String> getFromBodyAsOptional(final String path) {
             try {
-                return Optional.ofNullable(JsonPath.parse(response.body()).read(ScenarioTest.resolve(path, DROP_COMMENTS)));
-            } catch (final PathNotFoundException e) {
+                return Optional.ofNullable(JsonPath.parse(response.body()).read(ScenarioTest.resolve(path)));
+            } catch (final Exception e) {
                 return null; // means the property did not exist at all, not that it was there with value null
             }
         }
 
         @SneakyThrows
-        public <T> OptionalAssert<T> path(final String path) {
+        public OptionalAssert<String> path(final String path) {
             return assertThat(getFromBodyAsOptional(path));
         }
 
@@ -337,9 +320,9 @@ public abstract class UseCase<T extends UseCase<?>> {
 
             // the title
             if (nextTitle != null) {
-                testReport.printLine("\n### " + ScenarioTest.resolve(nextTitle, KEEP_COMMENTS) + "\n");
+                testReport.printLine("\n### " + nextTitle + "\n");
             } else if (resultAlias != null) {
-                testReport.printLine("\n### Create " + resultAlias + "\n");
+                testReport.printLine("\n### " + resultAlias + "\n");
             } else {
                 fail("please wrap the http...-call in the UseCase using `withTitle(...)`");
             }
@@ -359,13 +342,6 @@ public abstract class UseCase<T extends UseCase<?>> {
             testReport.printLine("```");
             testReport.printLine("");
         }
-
-        private String nonNullAlias(final String alias) {
-            // This marker tag should not appear in the source-code, as here is nothing to fix.
-            // But if it appears in generated Markdown files, it should show up when that marker tag is searched.
-            final var onlyVisibleInGeneratedMarkdownNotInSource = new String(new char[]{'F', 'I', 'X', 'M', 'E'});
-            return alias == null ? "unknown alias -- " + onlyVisibleInGeneratedMarkdownNotInSource : alias;
-        }
     }
 
     protected T self() {

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java

@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
 import net.hostsharing.hsadminng.hs.office.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
@@ -16,18 +16,10 @@ public class CreateMembership extends UseCase<CreateMembership> {
 
     @Override
     protected HttpResponse run() {
-
-        obtain("Partner: %{partnerName}", () ->
-                httpGet("/api/hs/office/partners?name=&{partnerName}")
-                        .expecting(OK).expecting(JSON),
-                response -> response.expectArrayElements(1).getFromBody("[0].uuid"),
-                "In production, data this query could result in multiple outputs. In that case, you have to find out which is the right one."
-        );
-
         return httpPost("/api/hs/office/memberships", usingJsonBody("""
                 {
-                   "partner.uuid": ${Partner: %{partnerName}},
-                   "memberNumberSuffix": ${%{memberNumberSuffix???}???00},
+                   "partner.uuid": ${Partner: Test AG},
+                   "memberNumberSuffix": ${memberNumberSuffix},
                    "status": "ACTIVE",
                    "validFrom": ${validFrom},
                    "membershipFeeBillable": ${membershipFeeBillable}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java

@@ -1,12 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopAssetsDepositTransaction extends CreateCoopAssetsTransaction {
-
-    public CreateCoopAssetsDepositTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-
-        given("transactionType", "DEPOSIT");
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java

@@ -1,17 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopAssetsDisbursalTransaction extends CreateCoopAssetsTransaction {
-
-    public CreateCoopAssetsDisbursalTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-    }
-
-    @Override
-    protected HttpResponse run() {
-        given("transactionType", "DISBURSAL");
-        given("assetValue", "-%{valueToDisburse}");
-        return super.run();
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransaction.java

@@ -1,27 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopAssetsRevertTransaction extends CreateCoopAssetsTransaction {
-
-    public CreateCoopAssetsRevertTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-
-        requires("CoopAssets-Transaction with incorrect assetValue", alias ->
-                new CreateCoopAssetsDepositTransaction(testSuite)
-                        .given("memberNumber", "3101000")
-                        .given("reference", "sign %{dateOfIncorrectTransaction}") // same as revertedAssetTx
-                        .given("assetValue", 10)
-                        .given("comment", "coop-assets deposit transaction with wrong asset value")
-                        .given("transactionDate", "%{dateOfIncorrectTransaction}")
-        );
-    }
-
-    @Override
-    protected HttpResponse run() {
-        given("transactionType", "REVERSAL");
-        given("assetValue", -100);
-        given("revertedAssetTx", uuid("CoopAssets-Transaction with incorrect assetValue"));
-        return super.run();
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java

@@ -1,53 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
-
-import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.hs.office.scenarios.UseCase;
-import org.springframework.http.HttpStatus;
-
-import static io.restassured.http.ContentType.JSON;
-import static org.springframework.http.HttpStatus.OK;
-
-public abstract class CreateCoopAssetsTransaction extends UseCase<CreateCoopAssetsTransaction> {
-
-    public CreateCoopAssetsTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-    }
-
-    @Override
-    protected HttpResponse run() {
-
-        obtain("#{Find }membershipUuid", () ->
-            httpGet("/api/hs/office/memberships?memberNumber=&{memberNumber}")
-                    .expecting(OK).expecting(JSON).expectArrayElements(1),
-            response -> response.getFromBody("$[0].uuid")
-        );
-
-        return withTitle("Create the Coop-Assets-%{transactionType} Transaction", () ->
-                httpPost("/api/hs/office/coopassetstransactions", usingJsonBody("""
-                {
-                    "membership.uuid": ${membershipUuid},
-                    "transactionType": ${transactionType},
-                    "reference": ${reference},
-                    "assetValue": ${assetValue},
-                    "comment": ${comment},
-                    "valueDate": ${transactionDate},
-                    "revertedAssetTx.uuid": ${revertedAssetTx???}
-                }
-                """))
-                .expecting(HttpStatus.CREATED).expecting(ContentType.JSON)
-        );
-    }
-
-    @Override
-    protected void verify(final HttpResponse response) {
-        verify("Verify Coop-Assets %{transactionType}-Transaction",
-                () -> httpGet("/api/hs/office/coopassetstransactions/" + response.getLocationUuid())
-                        .expecting(HttpStatus.OK).expecting(ContentType.JSON),
-                path("transactionType").contains("%{transactionType}"),
-                path("assetValue").contains("%{assetValue}"),
-                path("comment").contains("%{comment}"),
-                path("valueDate").contains("%{transactionDate}")
-        );
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java

@@ -1,17 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopSharesCancellationTransaction extends CreateCoopSharesTransaction {
-
-    public CreateCoopSharesCancellationTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-    }
-
-    @Override
-    protected HttpResponse run() {
-        given("transactionType", "CANCELLATION");
-        given("shareCount", "-%{sharesToCancel}");
-        return super.run();
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java

@@ -1,27 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopSharesRevertTransaction extends CreateCoopSharesTransaction {
-
-    public CreateCoopSharesRevertTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-
-        requires("CoopShares-Transaction with incorrect shareCount", alias ->
-                new CreateCoopSharesSubscriptionTransaction(testSuite)
-                        .given("memberNumber", "3101000")
-                        .given("reference", "sign %{dateOfIncorrectTransaction}") // same as revertedShareTx
-                        .given("shareCount", 100)
-                        .given("comment", "coop-shares subscription transaction with wrong share count")
-                        .given("transactionDate", "%{dateOfIncorrectTransaction}")
-        );
-    }
-
-    @Override
-    protected HttpResponse run() {
-        given("transactionType", "REVERSAL");
-        given("shareCount", -100);
-        given("revertedShareTx", uuid("CoopShares-Transaction with incorrect shareCount"));
-        return super.run();
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java

@@ -1,12 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
-
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-
-public class CreateCoopSharesSubscriptionTransaction extends CreateCoopSharesTransaction {
-
-    public CreateCoopSharesSubscriptionTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-
-        given("transactionType", "SUBSCRIPTION");
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java

@@ -1,53 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
-
-import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.hs.office.scenarios.UseCase;
-import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;
-import org.springframework.http.HttpStatus;
-
-import static io.restassured.http.ContentType.JSON;
-import static org.springframework.http.HttpStatus.OK;
-
-public abstract class CreateCoopSharesTransaction extends UseCase<CreateCoopSharesTransaction> {
-
-    public CreateCoopSharesTransaction(final ScenarioTest testSuite) {
-        super(testSuite);
-    }
-
-    @Override
-    protected HttpResponse run() {
-
-        obtain("#{Find }membershipUuid", () ->
-            httpGet("/api/hs/office/memberships?memberNumber=&{memberNumber}")
-                    .expecting(OK).expecting(JSON).expectArrayElements(1),
-            response -> response.getFromBody("$[0].uuid")
-        );
-
-        return withTitle("Create the Coop-Shares-%{transactionType} Transaction", () ->
-                httpPost("/api/hs/office/coopsharestransactions", usingJsonBody("""
-                {
-                    "membership.uuid": ${membershipUuid},
-                    "transactionType": ${transactionType},
-                    "reference": ${reference},
-                    "shareCount": ${shareCount},
-                    "comment": ${comment},
-                    "valueDate": ${transactionDate},
-                    "revertedShareTx.uuid": ${revertedShareTx???}
-                }
-                """))
-                .expecting(HttpStatus.CREATED).expecting(ContentType.JSON)
-        );
-    }
-
-    @Override
-    protected void verify(final HttpResponse response) {
-        verify("Verify Coop-Shares %{transactionType}-Transaction",
-                () -> httpGet("/api/hs/office/coopsharestransactions/" + response.getLocationUuid())
-                        .expecting(HttpStatus.OK).expecting(ContentType.JSON),
-                path("transactionType").contains("%{transactionType}"),
-                path("shareCount").contains("%{shareCount}"),
-                path("comment").contains("%{comment}"),
-                path("valueDate").contains("%{transactionDate}")
-        );
-    }
-}

src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java

@@ -16,8 +16,6 @@ public class CreatePartner extends UseCase<CreatePartner> {
 
     public CreatePartner(final ScenarioTest testSuite) {
         super(testSuite);
-
-        introduction("A partner can be a client or a vendor, currently we only use them for clients.");
     }
 
     @Override