From 0342ec0f50cba8dd37e4db43032bf558c9b30afc Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 15 Nov 2024 10:37:06 +0100 Subject: [PATCH] amendments according to code-review --- .../coopassets/HsOfficeCoopAssetsTransactionController.java | 2 +- .../coopshares/HsOfficeCoopSharesTransactionController.java | 2 +- .../hs-office/hs-office-coopassets-with-uuid.yaml | 2 +- .../hs-office/hs-office-coopshares-with-uuid.yaml | 2 +- .../hsadminng/hs/office/scenarios/TemplateResolver.java | 2 +- src/test/resources/migration/office/asset_transactions.csv | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java index 3fec8397..06bec54e 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java @@ -77,7 +77,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse @Override @Transactional(readOnly = true) - public ResponseEntity geSingleCoopAssetTransactionByUuid( + public ResponseEntity getSingleCoopAssetTransactionByUuid( final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) { context.define(currentSubject, assumedRoles); diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java index 8cd3d9a9..ebd47800 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java @@ -80,7 +80,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar @Override @Transactional(readOnly = true) - public ResponseEntity geSingleCoopShareTransactionByUuid( + public ResponseEntity getSingleCoopShareTransactionByUuid( final String currentSubject, final String assumedRoles, final UUID shareTransactionUuid) { context.define(currentSubject, assumedRoles); diff --git a/src/main/resources/api-definition/hs-office/hs-office-coopassets-with-uuid.yaml b/src/main/resources/api-definition/hs-office/hs-office-coopassets-with-uuid.yaml index 7d1fb349..4361e54f 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-coopassets-with-uuid.yaml +++ b/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: geSingleCoopAssetTransactionByUuid + operationId: getSingleCoopAssetTransactionByUuid parameters: - $ref: 'auth.yaml#/components/parameters/currentSubject' - $ref: 'auth.yaml#/components/parameters/assumedRoles' diff --git a/src/main/resources/api-definition/hs-office/hs-office-coopshares-with-uuid.yaml b/src/main/resources/api-definition/hs-office/hs-office-coopshares-with-uuid.yaml index 4265f3ca..b8d6177e 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-coopshares-with-uuid.yaml +++ b/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: geSingleCoopShareTransactionByUuid + operationId: getSingleCoopShareTransactionByUuid parameters: - $ref: 'auth.yaml#/components/parameters/currentSubject' - $ref: 'auth.yaml#/components/parameters/assumedRoles' diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java index 977c2f13..14fdcbc8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java @@ -16,7 +16,7 @@ public class TemplateResolver { public enum Resolver { DROP_COMMENTS, // deletes comments ('#{whatever}' -> '') - KEEP_COMMENTS // deletes comments ('#{whatever}' -> '') + KEEP_COMMENTS // keep comments ('#{whatever}' -> 'whatever') } enum PlaceholderPrefix { diff --git a/src/test/resources/migration/office/asset_transactions.csv b/src/test/resources/migration/office/asset_transactions.csv index d4f69478..a0a83e02 100644 --- a/src/test/resources/migration/office/asset_transactions.csv +++ b/src/test/resources/migration/office/asset_transactions.csv @@ -16,4 +16,4 @@ member_asset_id; bp_id; date; action; amount; comment 34002; 120; 2016-12-31; PAYBACK; -100.00; for cancellation D 34003; 120; 2016-12-31; LOSS; -20.00; for cancellation D 35001; 190; 2024-01-15; PAYMENT; 128.00; for subscription E -35002; 190; 2024-01-20; REVERSAL;-128.00; chargeback for subscription E +35002; 190; 2024-01-20; ADJUSTMENT;-128.00; chargeback for subscription E