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

@@ -17,7 +17,6 @@ import java.util.UUID;
 import java.util.function.BiConsumer;
 
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.repr.TaggedNumber.cropTag;
 
 @RestController
 
@@ -38,11 +37,11 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
             final String currentSubject,
             final String assumedRoles,
             final UUID partnerUuid,
-            final String memberNumber) {
+            final Integer memberNumber) {
         context.define(currentSubject, assumedRoles);
 
         final var entities = ( memberNumber != null)
-                    ? ofNullable(membershipRepo.findMembershipByMemberNumber(cropTag("M-", memberNumber))).stream().toList()
+                    ? ofNullable(membershipRepo.findMembershipByMemberNumber(memberNumber)).stream().toList()
                     : membershipRepo.findMembershipsByOptionalPartnerUuid(partnerUuid);
 
         final var resources = mapper.mapList(entities, HsOfficeMembershipResource.class,
@@ -126,7 +125,7 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     }
 
     final BiConsumer<HsOfficeMembershipEntity, HsOfficeMembershipResource> SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
-        resource.setMemberNumber(entity.getTaggedMemberNumber());
+        // TODO.refa: this should be possible via ModelMapper config
         resource.setValidFrom(entity.getValidity().lower());
         if (entity.getValidity().hasUpperBound()) {
             resource.setValidTo(entity.getValidity().upper().minusDays(1));

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

@@ -130,7 +130,6 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
         }
         return validity;
     }
-
     public Integer getMemberNumber() {
         if (partner == null || partner.getPartnerNumber() == null || memberNumberSuffix == null ) {
             return null;
@@ -139,10 +138,6 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
         return getPartner().getPartnerNumber() * 100 + Integer.parseInt(memberNumberSuffix, 10);
     }
 
-    public String getTaggedMemberNumber() {
-        return MEMBER_NUMBER_TAG + getMemberNumber();
-    }
-
     @Override
     public String toString() {
         return stringify.apply(this);

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

@@ -26,10 +26,9 @@ components:
                 mainDebitor:
                     $ref: 'hs-office-debitor-schemas.yaml#/components/schemas/HsOfficeDebitor'
                 memberNumber:
-                    type: string
+                    type: integer
-                    minLength: 9
+                    minimum: 1000000
-                    maxLength: 9
+                    maximum: 9999999
-                    pattern: 'M-[0-9]{7}'
                 memberNumberSuffix:
                     type: string
                     minLength: 2

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

@@ -19,10 +19,7 @@ get:
           in: query
           required: false
           schema:
-              type: string
+              type: integer
-              minLength: 9
-              maxLength: 9
-              pattern: 'M-[0-9]{7}'
           description: Member number, exclusive to `partnerUuid`.
     responses:
         "200":

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

@@ -78,7 +78,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                       [
                           {
                               "partner": { "partnerNumber": "P-10001" },
-                              "memberNumber": "M-1000101",
+                              "memberNumber": 1000101,
                               "memberNumberSuffix": "01",
                               "validFrom": "2022-10-01",
                               "validTo": null,
@@ -86,7 +86,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                           },
                           {
                               "partner": { "partnerNumber": "P-10002" },
-                              "memberNumber": "M-1000202",
+                              "memberNumber": 1000202,
                               "memberNumberSuffix": "02",
                               "validFrom": "2022-10-01",
                               "validTo": null,
@@ -94,7 +94,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                           },
                           {
                               "partner": { "partnerNumber": "P-10003" },
-                              "memberNumber": "M-1000303",
+                              "memberNumber": 1000303,
                               "memberNumberSuffix": "03",
                               "validFrom": "2022-10-01",
                               "validTo": null,
@@ -125,7 +125,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                       [
                           {
                               "partner": { "partnerNumber": "P-10001" },
-                              "memberNumber": "M-1000101",
+                              "memberNumber": 1000101,
                               "memberNumberSuffix": "01",
                               "validFrom": "2022-10-01",
                               "validTo": null,
@@ -153,7 +153,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                       [
                           {
                               "partner": { "partnerNumber": "P-10002" },
-                              "memberNumber": "M-1000202",
+                              "memberNumber": 1000202,
                               "memberNumberSuffix": "02",
                               "validFrom": "2022-10-01",
                               "validTo": null,
@@ -196,7 +196,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                         .contentType(ContentType.JSON)
                         .body("uuid", isUuidValid())
                         .body("partner.partnerNumber", is("P-10003"))
-                        .body("memberNumber", is("M-" + expectedMemberNumber))
+                        .body("memberNumber", is(expectedMemberNumber))
                         .body("memberNumberSuffix", is(givenMemberSuffix))
                         .body("validFrom", is("2022-10-13"))
                         .body("validTo", equalTo(null))
@@ -231,7 +231,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .body("", lenientlyEquals("""
                     {
                          "partner": { "partnerNumber": "P-10001" },
-                         "memberNumber": "M-1000101",
+                         "memberNumber": 1000101,
                          "memberNumberSuffix": "01",
                          "validFrom": "2022-10-01",
                          "validTo": null,
@@ -256,7 +256,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
         }
 
         @Test
-        void partnerRelAgent_canGetRelatedMembership() {
+        void parnerRelAgent_canGetRelatedMembership() {
             context.define("superuser-alex@hostsharing.net");
             final var givenMembershipUuid = membershipRepo.findMembershipByMemberNumber(1000303).getUuid();
 
@@ -273,7 +273,7 @@ class HsOfficeMembershipControllerAcceptanceTest extends ContextBasedTestWithCle
                     .body("", lenientlyEquals("""
                     {
                          "partner": { "partnerNumber": "P-10003" },
-                         "memberNumber": "M-1000303",
+                         "memberNumber": 1000303,
                          "memberNumberSuffix": "03",
                          "validFrom": "2022-10-01",
                          "validTo": null,

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

@@ -260,7 +260,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Requires("Person: Test AG")
     void shouldDeleteDebitor() {
         new DeleteDebitor(this)
-                .given("partnerNumber", "P-31020")
+                .given("partnerNumber", 31020)
                 .given("debitorSuffix", "02")
                 .doRun();
     }
@@ -271,7 +271,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Disabled("see TODO.spec in DontDeleteDefaultDebitor")
     void shouldNotDeleteDefaultDebitor() {
         new DontDeleteDefaultDebitor(this)
-                .given("partnerNumber", "P-31010")
+                .given("partnerNumber", 31010)
                 .given("debitorSuffix", "00")
                 .doRun();
     }
@@ -337,7 +337,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces("Coop-Shares SUBSCRIPTION Transaction")
     void shouldSubscribeCoopShares() {
         new CreateCoopSharesSubscriptionTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("reference", "sign 2024-01-15")
                 .given("shareCount", 100)
                 .given("comment", "Signing the Membership")
@@ -350,7 +350,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Requires("Membership: M-3101000 - Test AG")
     void shouldRevertCoopSharesSubscription() {
         new CreateCoopSharesRevertTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("comment", "reverting some incorrect transaction")
                 .given("dateOfIncorrectTransaction", "2024-02-15")
                 .doRun();
@@ -362,7 +362,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces("Coop-Shares CANCELLATION Transaction")
     void shouldCancelCoopSharesSubscription() {
         new CreateCoopSharesCancellationTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("reference", "cancel 2024-01-15")
                 .given("sharesToCancel", 8)
                 .given("comment", "Cancelling 8 Shares")
@@ -376,7 +376,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces("Coop-Assets DEPOSIT Transaction")
     void shouldSubscribeCoopAssets() {
         new CreateCoopAssetsDepositTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("reference", "sign 2024-01-15")
                 .given("assetValue", 100*64)
                 .given("comment", "disposal for initial shares")
@@ -386,10 +386,10 @@ class HsOfficeScenarioTests extends ScenarioTest {
 
     @Test
     @Order(4302)
-    @Requires("Coop-Assets DEPOSIT Transaction")
+    @Requires("Membership: M-3101000 - Test AG")
     void shouldRevertCoopAssetsSubscription() {
         new CreateCoopAssetsRevertTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("comment", "reverting some incorrect transaction")
                 .given("dateOfIncorrectTransaction", "2024-02-15")
                 .doRun();
@@ -401,7 +401,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Produces("Coop-Assets DISBURSAL Transaction")
     void shouldDisburseCoopAssets() {
         new CreateCoopAssetsDisbursalTransaction(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("reference", "cancel 2024-01-15")
                 .given("valueToDisburse", 8*64)
                 .given("comment", "disbursal according to shares cancellation")
@@ -414,7 +414,7 @@ class HsOfficeScenarioTests extends ScenarioTest {
     @Requires("Membership: M-3101000 - Test AG")
     void shouldCancelMembershipOfPartner() {
         new CancelMembership(this)
-                .given("memberNumber", "M-3101000")
+                .given("memberNumber", "3101000")
                 .given("validTo", "2025-12-30")
                 .given("newStatus", "CANCELLED")
                 .doRun();

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

@@ -9,7 +9,7 @@ public class CreateCoopAssetsRevertTransaction extends CreateCoopAssetsTransacti
 
         requires("CoopAssets-Transaction with incorrect assetValue", alias ->
                 new CreateCoopAssetsDepositTransaction(testSuite)
-                        .given("memberNumber", "%{memberNumber}")
+                        .given("memberNumber", "3101000")
                         .given("reference", "sign %{dateOfIncorrectTransaction}") // same as revertedAssetTx
                         .given("assetValue", 10)
                         .given("comment", "coop-assets deposit transaction with wrong asset value")

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

@@ -9,7 +9,7 @@ public class CreateCoopSharesRevertTransaction extends CreateCoopSharesTransacti
 
         requires("CoopShares-Transaction with incorrect shareCount", alias ->
                 new CreateCoopSharesSubscriptionTransaction(testSuite)
-                        .given("memberNumber", "%{memberNumber}")
+                        .given("memberNumber", "3101000")
                         .given("reference", "sign %{dateOfIncorrectTransaction}") // same as revertedShareTx
                         .given("shareCount", 100)
                         .given("comment", "coop-shares subscription transaction with wrong share count")