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

@@ -65,10 +65,6 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
         validate(requestBody);
 
         final var entityToSave = mapper.map(requestBody, HsOfficeCoopAssetsTransactionEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
-
-        if (entityToSave.getReverseEntry() != null) {
-            entityToSave.getReverseEntry().setReverseEntry(entityToSave);
-        }
         final var saved = coopAssetsTransactionRepo.save(entityToSave);
 
         final var uri =
@@ -137,7 +133,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     final BiConsumer<HsOfficeCoopAssetsTransactionInsertResource, HsOfficeCoopAssetsTransactionEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
         if ( resource.getReverseEntryUuid() != null ) {
-            entity.setReverseEntry(coopAssetsTransactionRepo.findByUuid(resource.getReverseEntryUuid())
+            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,7 +50,7 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, RbacO
             .withProp(HsOfficeCoopAssetsTransactionEntity::getAssetValue)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getReference)
             .withProp(HsOfficeCoopAssetsTransactionEntity::getComment)
-            .withProp(at -> ofNullable(at.getReverseEntry()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustedAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
             .quotedValues(false);
 
     @Id
@@ -95,12 +95,11 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, RbacO
     private String comment;
 
     /**
-     * Optionally, the UUID of the corresponding transaction for an adjustment transaction,
-     * linked in both directions.
+     * Optionally, the UUID of the corresponding transaction for an adjustment transaction.
      */
     @OneToOne
-    @JoinColumn(name = "reverseentryuuid")
-    private HsOfficeCoopAssetsTransactionEntity reverseEntry;
+    @JoinColumn(name = "adjustedassettxuuid")
+    private HsOfficeCoopAssetsTransactionEntity adjustedAssetTx;
 
     public String getTaggedMemberNumber() {
         return ofNullable(membership).map(HsOfficeMembershipEntity::toShortString).orElse("M-?????");

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

@@ -32,10 +32,10 @@ components:
                     type: string
                 comment:
                     type: string
-                reverseEntry:
-                    $ref: '#/components/schemas/HsOfficeCoopAssetsTransactionReverse'
+                adjustedAssetTx:
+                    $ref: '#/components/schemas/HsOfficeAdjustedCoopAssetsTransaction'
 
-        HsOfficeCoopAssetsTransactionReverse:
+        HsOfficeAdjustedCoopAssetsTransaction:
             description:
                 Similar to `HsOfficeCoopAssetsTransaction` but without the `reverseEntry`,
                 otherwise the JSON would be recursive.

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

@@ -24,34 +24,20 @@ create table if not exists hs_office_coopassetstransaction
     valueDate           date not null,
     assetValue          money not null,
     reference           varchar(48) not null,
-    reverseEntryUuid    uuid references hs_office_coopassetstransaction (uuid) deferrable ,
+    adjustedAssetTxUuid uuid unique REFERENCES hs_office_coopassetstransaction(uuid) DEFERRABLE INITIALLY DEFERRED,
     comment             varchar(512)
 );
+--//
+
+
+-- ============================================================================
+--changeset hs-office-coopassets-BUSINESS-RULES:1 endDelimiter:--//
+-- ----------------------------------------------------------------------------
 
 alter table hs_office_coopassetstransaction
     add constraint hs_office_coopassetstransaction_reverse_entry_missing
-        check ( transactionType != 'ADJUSTMENT' or reverseEntryUuid is not null);
-
-CREATE OR REPLACE FUNCTION hs_office_coopassetstransaction_reverse_entry_is_reciprocal_tf()
-    RETURNS TRIGGER
-    LANGUAGE plpgsql AS $$
-BEGIN
-    IF NEW.reverseEntryUuid IS NULL
-        OR NEW.uuid IN (SELECT other.reverseEntryUuid
-                      FROM hs_office_coopassetstransaction other
-                      WHERE other.uuid = NEW.reverseEntryUuid
-                        AND NEW.membershipUuid = other.membershipUuid)
-    THEN
-        RETURN NEW;
-    END IF;
-
-    RAISE EXCEPTION 'reverseEntryUuid must refer to a row that has a reference back to this row and belongs to the same membership';
-END; $$;
-
--- FIXME: why does this not work?
--- CREATE TRIGGER hs_office_coopassetstransaction_reverse_entry_is_reciprocal_tg
---     AFTER INSERT OR UPDATE ON hs_office_coopassetstransaction
---     FOR EACH ROW EXECUTE FUNCTION hs_office_coopassetstransaction_reverse_entry_is_reciprocal_tf();
+        check ( transactionType = 'ADJUSTMENT' and adjustedAssetTxUuid is not null
+             or transactionType <> 'ADJUSTMENT' and adjustedAssetTxUuid is null);
 --//
 
 -- ============================================================================
@@ -66,9 +52,9 @@ declare
     totalAssetValue money;
 begin
     select sum(cat.assetValue)
-    from hs_office_coopassetstransaction cat
-    where cat.membershipUuid = forMembershipUuid
-    into currentAssetValue;
+        from hs_office_coopassetstransaction cat
+        where cat.membershipUuid = forMembershipUuid
+        into currentAssetValue;
     totalAssetValue := currentAssetValue + newAssetValue;
     if totalAssetValue::numeric < 0 then
         raise exception '[400] coop assets transaction would result in a negative balance of assets';
@@ -79,9 +65,9 @@ end; $$;
 alter table hs_office_coopassetstransaction
     add constraint hs_office_coopassets_positive
         check ( checkAssetsByMembershipUuid(membershipUuid, assetValue) );
-
 --//
 
+
 -- ============================================================================
 --changeset hs-office-coopassets-MAIN-TABLE-JOURNAL:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------

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

@@ -17,7 +17,6 @@ declare
     currentTask             varchar;
     membership              hs_office_membership;
     lossEntryUuid           uuid;
-    adjustmentEntryUuid     uuid;
 begin
     currentTask = 'creating coopAssetsTransaction test-data ' || givenPartnerNumber || givenMemberNumberSuffix;
     execute format('set local hsadminng.currentTask to %L', currentTask);
@@ -33,14 +32,13 @@ begin
 
     raise notice 'creating test coopAssetsTransaction: %', givenPartnerNumber || givenMemberNumberSuffix;
     lossEntryUuid := uuid_generate_v4();
-    adjustmentEntryUuid := uuid_generate_v4();
     insert
-        into hs_office_coopassetstransaction(uuid, membershipuuid, transactiontype, valuedate, assetvalue, reference, comment, reverseEntryUuid)
+        into hs_office_coopassetstransaction(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, 'LOSS',       '2022-10-20', -128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some loss', adjustmentEntryUuid),
-            (adjustmentEntryUuid, membership.uuid, 'ADJUSTMENT', '2022-10-21',  128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some adjustment', lossEntryUuid);
+            (lossEntryUuid,       membership.uuid, 'DEPOSIT',    '2022-10-20',  128.00, 'ref '||givenPartnerNumber || givenMemberNumberSuffix||'-3', 'some loss', null),
+            (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/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java

@@ -19,10 +19,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType.LOSS;
+import static net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType.DEPOSIT;
 import static net.hostsharing.test.IsValidUuidMatcher.isUuidValid;
 import static net.hostsharing.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -105,15 +106,15 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                                 "comment": "partial disbursal"
                             },
                             {
-                                "transactionType": "LOSS",
-                                "assetValue": -128.00,
+                                "transactionType": "DEPOSIT",
+                                "assetValue": 128.00,
                                 "valueDate": "2022-10-20",
                                 "reference": "ref 1000202-3",
                                 "comment": "some loss"
                             },
                             {
                                 "transactionType": "ADJUSTMENT",
-                                "assetValue": 128.00,
+                                "assetValue": -128.00,
                                 "valueDate": "2022-10-21",
                                 "reference": "ref 1000202-3",
                                 "comment": "some adjustment"
@@ -196,9 +197,9 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                     .extract().header("Location");  // @formatter:on
 
             // finally, the new coopAssetsTransaction can be accessed under the generated UUID
-            final var newUserUuid = UUID.fromString(
+            final var newAssetTxUuid = UUID.fromString(
                     location.substring(location.lastIndexOf('/') + 1));
-            assertThat(newUserUuid).isNotNull();
+            assertThat(newAssetTxUuid).isNotNull();
         }
 
         @Test
@@ -206,10 +207,18 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
 
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = membershipRepo.findMembershipByMemberNumber(1000101);
-            final var givenTransaction = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(givenMembership.getUuid(), null, null)
-                    .stream().filter(at -> at.getTransactionType() == LOSS)
-                    .findFirst()
-                    .orElseThrow();
+            final var givenTransaction = jpaAttempt.transacted(() -> {
+                // TODO.impl: introduce something like transactedAsSuperuser / transactedAs("...", ...)
+                context.define("superuser-alex@hostsharing.net");
+                return coopAssetsTransactionRepo.save(HsOfficeCoopAssetsTransactionEntity.builder()
+                                .transactionType(DEPOSIT)
+                                .valueDate(LocalDate.of(2022, 10, 20))
+                                .membership(givenMembership)
+                                .assetValue(new BigDecimal("256.00"))
+                                .reference("test ref")
+                        .build());
+                    }).assertSuccessful().assertNotNull().returnedValue();
+            toCleanup(HsOfficeCoopAssetsTransactionRawEntity.class, givenTransaction.getUuid());
 
             final var location = RestAssured // @formatter:off
                     .given()
@@ -221,7 +230,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                                        "transactionType": "ADJUSTMENT",
                                        "assetValue": %s,
                                        "valueDate": "2022-10-30",
-                                       "reference": "temp ref A",
+                                       "reference": "test ref adjustment",
                                        "comment": "some coop assets adjustment transaction",
                                        "reverseEntryUuid": "%s"
                                      }
@@ -239,16 +248,15 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                         .body("", lenientlyEquals("""
                             {
                                 "transactionType": "ADJUSTMENT",
-                                "assetValue": 128.00,
+                                "assetValue": -256.00,
                                 "valueDate": "2022-10-30",
-                                "reference": "temp ref A",
+                                "reference": "test ref adjustment",
                                 "comment": "some coop assets adjustment transaction",
-                                "reverseEntry": {
-                                    "transactionType": "LOSS",
-                                    "assetValue": -128.00,
+                                "adjustedAssetTx": {
+                                    "transactionType": "DEPOSIT",
+                                    "assetValue": 256.00,
                                     "valueDate": "2022-10-20",
-                                    "reference": "ref 1000101-3",
-                                    "comment": "some loss"
+                                    "reference": "test ref"
                                 }
                             }
                             """.formatted(givenTransaction.getUuid())))
@@ -256,9 +264,10 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
                     .extract().header("Location");  // @formatter:on
 
             // finally, the new coopAssetsTransaction can be accessed under the generated UUID
-            final var newUserUuid = UUID.fromString(
+            final var newAssetTxUuid = UUID.fromString(
                     location.substring(location.lastIndexOf('/') + 1));
-            assertThat(newUserUuid).isNotNull();
+            assertThat(newAssetTxUuid).isNotNull();
+            toCleanup(HsOfficeCoopAssetsTransactionRawEntity.class, newAssetTxUuid);
         }
 
         @Test
@@ -267,7 +276,7 @@ class HsOfficeCoopAssetsTransactionControllerAcceptanceTest extends ContextBased
             context.define("superuser-alex@hostsharing.net");
             final var givenMembership = membershipRepo.findMembershipByMemberNumber(1000101);
 
-            final var location = RestAssured // @formatter:off
+            RestAssured // @formatter:off
                 .given()
                     .header("current-user", "superuser-alex@hostsharing.net")
                     .contentType(ContentType.JSON)

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

@@ -27,7 +27,7 @@ class HsOfficeCoopAssetsTransactionEntityUnitTest {
             .transactionType(HsOfficeCoopAssetsTransactionType.ADJUSTMENT)
             .assetValue(new BigDecimal("-128.00"))
             .comment("some comment")
-            .reverseEntry(givenCoopAssetTransaction)
+            .adjustedAssetTx(givenCoopAssetTransaction)
             .build();
 
     final HsOfficeCoopAssetsTransactionEntity givenEmptyCoopAssetsTransaction = HsOfficeCoopAssetsTransactionEntity.builder().build();
@@ -41,7 +41,7 @@ class HsOfficeCoopAssetsTransactionEntityUnitTest {
 
     @Test
     void toStringWithReverseEntryContainsReverseEntry() {
-        givenCoopAssetTransaction.setReverseEntry(givenCoopAssetAdjustmentTransaction);
+        givenCoopAssetTransaction.setAdjustedAssetTx(givenCoopAssetAdjustmentTransaction);
 
         final var result = givenCoopAssetTransaction.toString();
 

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

@@ -0,0 +1,18 @@
+
+package net.hostsharing.hsadminng.hs.office.coopassets;
+
+import lombok.NoArgsConstructor;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.util.UUID;
+
+@Entity
+@Table(name = "hs_office_coopassetstransaction")
+@NoArgsConstructor
+public class HsOfficeCoopAssetsTransactionRawEntity {
+
+    @Id
+    private UUID uuid;
+}

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

@@ -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, LOSS, -128.00, ref 1000101-3, some loss, M-1000101:+128.00)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, 128.00, ref 1000101-3, some adjustment, M-1000101:-128.00)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -128.00, ref 1000101-3, some adjustment, M-1000101:+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, LOSS, -128.00, ref 1000202-3, some loss, M-1000202:+128.00)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, 128.00, ref 1000202-3, some adjustment, M-1000202:-128.00)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -128.00, ref 1000202-3, some adjustment, M-1000202:+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, LOSS, -128.00, ref 1000303-3, some loss, M-1000303:+128.00)",
-                    "CoopAssetsTransaction(M-1000303: 2022-10-21, ADJUSTMENT, 128.00, ref 1000303-3, some adjustment, M-1000303:-128.00)");
+                    "CoopAssetsTransaction(M-1000303: 2022-10-20, DEPOSIT, 128.00, ref 1000303-3, some loss)",
+                    "CoopAssetsTransaction(M-1000303: 2022-10-21, ADJUSTMENT, -128.00, ref 1000303-3, some adjustment, M-1000303:+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, LOSS, -128.00, ref 1000202-3, some loss, M-1000202:+128.00)",
-                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, 128.00, ref 1000202-3, some adjustment, M-1000202:-128.00)");
+                    "CoopAssetsTransaction(M-1000202: 2022-10-20, DEPOSIT, 128.00, ref 1000202-3, some loss)",
+                    "CoopAssetsTransaction(M-1000202: 2022-10-21, ADJUSTMENT, -128.00, ref 1000202-3, some adjustment, M-1000202:+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, LOSS, -128.00, ref 1000101-3, some loss, M-1000101:+128.00)",
-                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, 128.00, ref 1000101-3, some adjustment, M-1000101:-128.00)");
+                    "CoopAssetsTransaction(M-1000101: 2022-10-20, DEPOSIT, 128.00, ref 1000101-3, some loss)",
+                    "CoopAssetsTransaction(M-1000101: 2022-10-21, ADJUSTMENT, -128.00, ref 1000101-3, some adjustment, M-1000101:+128.00)");
         }
     }
 

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

@@ -395,7 +395,7 @@ public class ImportOfficeData extends ContextBasedTest {
                     34001=CoopAssetsTransaction(M-1002000: 2016-12-31, CLEARING, -8.00, legacy data import, for cancellation D),
                     34002=CoopAssetsTransaction(M-1002000: 2016-12-31, DISBURSAL, -100.00, legacy data import, for cancellation D),
                     34003=CoopAssetsTransaction(M-1002000: 2016-12-31, LOSS, -20.00, legacy data import, for cancellation D),
-                    35001=CoopAssetsTransaction(M-1909000: 2024-01-15, DEPOSIT, 128.00, legacy data import, for subscription E, M-1909000:-128.00),
+                    35001=CoopAssetsTransaction(M-1909000: 2024-01-15, DEPOSIT, 128.00, legacy data import, for subscription E),
                     35002=CoopAssetsTransaction(M-1909000: 2024-01-20, ADJUSTMENT, -128.00, legacy data import, chargeback for subscription E, M-1909000:+128.00)
                 }
                 """);
@@ -854,14 +854,13 @@ public class ImportOfficeData extends ContextBasedTest {
 
                     if (assetTransaction.getTransactionType() == HsOfficeCoopAssetsTransactionType.ADJUSTMENT) {
                         final var negativeValue = assetTransaction.getAssetValue().negate();
-                        final var reverseEntry = coopAssets.values().stream().filter(a ->
+                        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 adjustment " + assetTransaction));
-                        reverseEntry.setReverseEntry(assetTransaction);
-                        assetTransaction.setReverseEntry(reverseEntry);
+                        assetTransaction.setAdjustedAssetTx(adjustedAssetTx);
                     }
 
                     coopAssets.put(rec.getInteger("member_asset_id"), assetTransaction);

src/test/java/net/hostsharing/hsadminng/hs/office/test/ContextBasedTestWithCleanup.java

@@ -64,8 +64,10 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
         return merged;
     }
 
-    public UUID toCleanup(final Class<? extends RbacObject> entityClass, final UUID uuidToCleanup) {
-        out.println("toCleanup(" + entityClass.getSimpleName() + ", " + uuidToCleanup);
+    // TODO.test: back to `Class<? extends RbacObject> entityClass` but delete on raw table
+    // remove HsOfficeCoopAssetsTransactionRawEntity, which is not needed anymore after this change
+    public UUID toCleanup(final Class entityClass, final UUID uuidToCleanup) {
+        out.println("toCleanup(" + entityClass.getSimpleName() + ", " + uuidToCleanup + ")");
         entitiesToCleanup.put(uuidToCleanup, entityClass);
         return uuidToCleanup;
     }
@@ -120,7 +122,7 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
         }
 
         if (initialRbacObjects != null){
-            assertNoNewRbackObjectsRolesAndGrantsLeaked();
+            assertNoNewRbacObjectsRolesAndGrantsLeaked();
         }
 
         initialTestDataValidated = false;
@@ -170,7 +172,7 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
         out.println(ContextBasedTestWithCleanup.class.getSimpleName() + ".cleanupAndCheckCleanup");
         cleanupTemporaryTestData();
         deleteLeakedRbacObjects();
-        long rbacObjectCount = assertNoNewRbackObjectsRolesAndGrantsLeaked();
+        long rbacObjectCount = assertNoNewRbacObjectsRolesAndGrantsLeaked();
 
         out.println("TOTAL OBJECT COUNT (after): " + rbacObjectCount);
     }
@@ -180,7 +182,7 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
             final var caughtException = jpaAttempt.transacted(() -> {
                 context.define("superuser-alex@hostsharing.net", null);
                 em.remove(em.getReference(entityClass, uuid));
-                out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " successful");
+                out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " generated");
             }).caughtException();
             if (caughtException != null) {
                 out.println("DELETING temporary " + entityClass.getSimpleName() + "#" + uuid + " failed: " + caughtException);
@@ -188,7 +190,7 @@ public abstract class ContextBasedTestWithCleanup extends ContextBasedTest {
         });
     }
 
-    private long assertNoNewRbackObjectsRolesAndGrantsLeaked() {
+    private long assertNoNewRbacObjectsRolesAndGrantsLeaked() {
         return jpaAttempt.transacted(() -> {
             context.define("superuser-alex@hostsharing.net");
             assertEqual(initialRbacObjects, allRbacObjects());

src/test/resources/application.yml

@@ -6,7 +6,7 @@ spring:
     datasource:
         url-tc: jdbc:tc:postgresql:15.5-bookworm:///spring_boot_testcontainers
         url-local: jdbc:postgresql://localhost:5432/postgres
-        url: ${spring.datasource.url-local}
+        url: ${spring.datasource.url-tc}
         username: postgres
         password: password