9 changed files with 48 additions and 296 deletions
--- a/3
+++ b/3
@ -45,9 +45,6 @@ pipeline {
                sourcePattern: 'src/main/java'
            )

-            // archive scenario-test reports
-            archiveArtifacts artifacts: 'doc/scenarios/*.html', allowEmptyArchive: true
-
            // cleanup workspace
            cleanWs()
        }
--- a/doc/scenarios/template.html
+++ b/doc/scenarios/template.html
@ -1,124 +0,0 @@
-<!doctype html>
-<html $if(lang)$ lang="$lang$" $endif$>
-<head>
-    
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <!--[if lt IE 9]>
-                <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
-        <![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-
-    <!-- <link rel="stylesheet" type="text/css" href="template.css" /> -->
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/template.css" />
-
-    <link href="https://vjs.zencdn.net/5.4.4/video-js.css" rel="stylesheet" />
-
-    <script src="https://code.jquery.com/jquery-2.2.1.min.js"></script>
-    <!-- <script type='text/javascript' src='menu/js/jquery.cookie.js'></script> -->
-    <!-- <script type='text/javascript' src='menu/js/jquery.hoverIntent.minified.js'></script> -->
-    <!-- <script type='text/javascript' src='menu/js/jquery.dcjqaccordion.2.7.min.js'></script> -->
-
-    <!-- <link href="menu/css/skins/blue.css" rel="stylesheet" type="text/css" /> -->
-    <!-- <link href="menu/css/skins/graphite.css" rel="stylesheet" type="text/css" /> -->
-    <!-- <link href="menu/css/skins/grey.css" rel="stylesheet" type="text/css" /> -->
-  
-    <!-- <script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> -->
-        
-  
-    <!-- <script src="script.js"></script> -->
-  
-    <!-- <script src="jquery.sticky-kit.js "></script> -->
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.cookie.js'></script>
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.hoverIntent.minified.js'></script>
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.dcjqaccordion.2.7.min.js'></script>
-
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/blue.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/graphite.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/grey.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/ryangrose/easy-pandoc-templates@948e28e5/css/elegant_bootstrap.css" rel="stylesheet" type="text/css" />
-  
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-  
-    <script src="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/script.js"></script>
-  
-    <script src="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/jquery.sticky-kit.js"></script>
-    <meta name="generator" content="pandoc" />
-$for(author-meta)$
-  <meta name="author" content="$author-meta$" />
-$endfor$
-$if(date-meta)$
-  <meta name="date" content="$date-meta$" />
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
-$if(quotes)$
-  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
-$endfor$
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-
-    
-  $if(title)$
-  <div class="navbar navbar-static-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <span class="doc-title">$title$</span>
-        <ul class="nav pull-right doc-info">
-          $for(author)$
-          <li><p class="navbar-text">$author$</p></li>
-          $endfor$
-          $if(date)$
-          <li><p class="navbar-text">$date$</p></li>
-          $endif$
-        </ul>
-      </div>
-    </div>
-  </div>
-  $endif$
-  <div class="container">
-    <div class="row">
-      $if(toc)$
-      <div id="$idprefix$TOC" class="span3">
-        <div class="well toc">
-
-        $toc$
-
-        </div>
-      </div>
-      $endif$
-      <div class="span$if(toc)$9$else$12$endif$">
-
-      $if(abstract)$
-          <H1>$abstract-title$</H1>
-          $abstract$
-      $endif$
-
-      $for(include-before)$
-      $include-before$
-      $endfor$
-$body$
-      $for(include-after)$
-      $include-after$
-      $endfor$
-      </div>
-    </div>
-  </div>
-  <script src="https://vjs.zencdn.net/5.4.4/video.js"></script>
-
-</body>
-</html>
--- a/doc/scenarios/to-html
+++ b/doc/scenarios/to-html
@ -1,11 +0,0 @@
-#!/bin/bash
-# This script loops over all markdown (.md) files in the current directory
-# and converts each to an HTML file using pandoc using template.html.
-
-# Origin of the template (GPL v3.0):
-# https://github.com/ryangrose/easy-pandoc-templates/blob/master/html/easy_template.html
-
-for file in *.md; do
-  pandoc "$file" --template template.html -o "${file%.md}.html"
-done
-
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
@ -173,18 +173,10 @@ class HsOfficeScenarioTests extends ScenarioTest {
    @Produces("SEPA-Mandate: Test AG")
    void shouldCreateSepaMandateForDebitor() {
        new CreateSepaMandateForDebitor(this)
-                // existing debitor
-                .given("debitorNumber", "3101000")
-
-                // new sepa-mandate
-                .given("mandateReference", "Test AG - main debitor")
-                .given("mandateAgreement", "2022-10-12")
-                .given("mandateValidFrom", "2024-10-15")
-
-                // new bank-account
-                .given("bankAccountHolder", "Test AG - debit bank account")
-                .given("bankAccountIBAN", "DE02701500000000594937")
-                .given("bankAccountBIC", "SSKMDEMM")
+                .given("debitor", "Test AG")
+                .given("memberNumberSuffix", "00")
+                .given("validFrom", "2024-10-15")
+                .given("membershipFeeBillable", "true")
                .doRun()
                .keep();
    }
@ -194,9 +186,8 @@ class HsOfficeScenarioTests extends ScenarioTest {
    @Requires("SEPA-Mandate: Test AG")
    void shouldInvalidateSepaMandateForDebitor() {
        new InvalidateSepaMandateForDebitor(this)
-                .given("debitorNumberNumber", "31010")
-                .given("bankAccountIBAN", "DE02701500000000594937")
-                .given("mandateValidUntil", "2025-09-30")
+                .given("sepaMandateUuid", "%{SEPA-Mandate: Test AG}")
+                .given("validUntil", "2025-09-30")
                .doRun();
    }

--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java
@ -12,7 +12,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.testcontainers.shaded.org.apache.commons.lang3.ObjectUtils;

 import java.lang.reflect.Method;
 import java.util.HashMap;
@ -36,7 +35,7 @@ public abstract class ScenarioTest extends ContextBasedTest {

        @Override
        public String toString() {
-            return ObjectUtils.toString(uuid);
+            return uuid.toString();
        }
    }

--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java
@ -1,49 +1,9 @@
 package net.hostsharing.hsadminng.hs.office.scenarios;

-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Map;

 public class TemplateResolver {

-    enum PlaceholderPrefix {
-        RAW('%') {
-            @Override
-            String convert(final Object value) {
-                return value.toString();
-            }
-        },
-        JSON_QUOTED('$'){
-            @Override
-            String convert(final Object value) {
-                return jsonQuoted(value);
-            }
-        },
-        URI_ENCODED('&'){
-            @Override
-            String convert(final Object value) {
-                return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8);
-            }
-        };
-
-        private final char prefixChar;
-
-        PlaceholderPrefix(final char prefixChar) {
-            this.prefixChar = prefixChar;
-        }
-
-        static boolean contains(final char 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);
-    }
-
    private final String template;
    private final Map<String, Object> properties;
    private final StringBuilder resolved = new StringBuilder();
@ -61,7 +21,7 @@ public class TemplateResolver {

    private void copy() {
        while (hasMoreChars()) {
-            if (PlaceholderPrefix.contains(currentChar()) && nextChar() == '{') {
+            if ((currentChar() == '$' || currentChar() == '%') && nextChar() == '{') {
                startPlaceholder(currentChar());
            } else {
                resolved.append(fetchChar());
@ -81,7 +41,7 @@ public class TemplateResolver {
            if (currentChar() == '}') {
                --nested;
                placeholder.append(fetchChar());
-            } else if (PlaceholderPrefix.contains (currentChar()) && nextChar() == '{') {
+            } else if ((currentChar() == '$' || currentChar() == '%') && nextChar() == '{') {
                ++nested;
                placeholder.append(fetchChar());
            } else {
@ -90,9 +50,11 @@ public class TemplateResolver {
        }
        final var name = new TemplateResolver(placeholder.toString(), properties).resolve();
        final var value = propVal(name);
-        resolved.append(
-                PlaceholderPrefix.ofPrefixChar(intro).convert(value)
-        );
+        if ( intro == '%') {
+            resolved.append(value);
+        } else {
+            resolved.append(optionallyQuoted(value));
+        }
        skipChar('}');
    }

@ -142,7 +104,7 @@ public class TemplateResolver {
        return template.charAt(position+1);
    }

-    private static String jsonQuoted(final Object value) {
+    private static String optionallyQuoted(final Object value) {
        return switch (value) {
            case Boolean bool -> bool.toString();
            case Number number -> number.toString();
@ -150,4 +112,27 @@ public class TemplateResolver {
            default -> "\"" + value + "\"";
        };
    }
+
+    public static void main(String[] args) {
+        System.out.println(
+                new TemplateResolver("""
+                        etwas davor,
+                        
+                        ${einfacher Platzhalter},
+                        ${verschachtelter %{Name}},
+                        
+                        und nochmal ohne Quotes:
+                        
+                        %{einfacher Platzhalter},
+                        %{verschachtelter %{Name}},
+                        
+                        etwas danach.
+                        """,
+                        Map.ofEntries(
+                                Map.entry("Name", "placeholder"),
+                                Map.entry("einfacher Platzhalter", "simple placeholder"),
+                                Map.entry("verschachtelter placeholder", "nested placeholder")
+                        )).resolve());
+
+    }
 }
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java
@ -1,73 +0,0 @@
-package net.hostsharing.hsadminng.hs.office.scenarios;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TemplateResolverUnitTest {
-
-    @Test
-    void resolveTemplate() {
-        final var resolved = new TemplateResolver("""
-                    with optional JSON quotes:
-
-                    ${boolean},
-                    ${numeric},
-                    ${simple placeholder},
-                    ${nested %{name}},
-                    ${with-special-chars}
-
-                    and without quotes:
-
-                    %{boolean},
-                    %{numeric},
-                    %{simple placeholder},
-                    %{nested %{name}},
-                    %{with-special-chars}
-
-                    and uri-encoded:
-
-                    &{boolean},
-                    &{numeric},
-                    &{simple placeholder},
-                    &{nested %{name}},
-                    &{with-special-chars}
-                    """,
-                Map.ofEntries(
-                        Map.entry("name", "placeholder"),
-                        Map.entry("boolean", true),
-                        Map.entry("numeric", 42),
-                        Map.entry("simple placeholder", "einfach"),
-                        Map.entry("nested placeholder", "verschachtelt"),
-                        Map.entry("with-special-chars", "3&3 AG")
-                )).resolve();
-
-        assertThat(resolved).isEqualTo("""
-                with optional JSON quotes:
-
-                true,
-                42,
-                "einfach",
-                "verschachtelt",
-                "3&3 AG"
-
-                and without quotes:
-
-                true,
-                42,
-                einfach,
-                verschachtelt,
-                3&3 AG
-
-                and uri-encoded:
-
-                true,
-                42,
-                einfach,
-                verschachtelt,
-                3%263+AG
-                """);
-    }
-}
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java
@ -120,8 +120,7 @@ public abstract class UseCase<T extends UseCase<?>> {
    }

    @SneakyThrows
-    public final HttpResponse httpGet(final String uriPathWithPlaceholders) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
+    public final HttpResponse httpGet(final String uriPath) {
        final var request = HttpRequest.newBuilder()
                .GET()
                .uri(new URI("http://localhost:" + testSuite.port + uriPath))
@ -133,8 +132,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);
+    public final HttpResponse httpPost(final String uriPath, final JsonTemplate bodyJsonTemplate) {
        final var requestBody = bodyJsonTemplate.resolvePlaceholders();
        final var request = HttpRequest.newBuilder()
                .POST(BodyPublishers.ofString(requestBody))
@ -148,8 +146,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);
+    public final HttpResponse httpPatch(final String uriPath, final JsonTemplate bodyJsonTemplate) {
        final var requestBody = bodyJsonTemplate.resolvePlaceholders();
        final var request = HttpRequest.newBuilder()
                .method(HttpMethod.PATCH.toString(), BodyPublishers.ofString(requestBody))
@ -163,8 +160,7 @@ public abstract class UseCase<T extends UseCase<?>> {
    }

    @SneakyThrows
-    public final HttpResponse httpDelete(final String uriPathWithPlaceholders) {
-        final var uriPath = ScenarioTest.resolve(uriPathWithPlaceholders);
+    public final HttpResponse httpDelete(final String uriPath) {
        final var request = HttpRequest.newBuilder()
                .DELETE()
                .uri(new URI("http://localhost:" + testSuite.port + uriPath))
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
@ -5,7 +5,6 @@ import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest;

 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.OK;

 public class CreateSepaMandateForDebitor extends UseCase<CreateSepaMandateForDebitor> {

@ -15,19 +14,12 @@ public class CreateSepaMandateForDebitor extends UseCase<CreateSepaMandateForDeb

    @Override
    protected HttpResponse run() {
-
-        obtain("Debitor: Test AG - main debitor", () ->
-            httpGet("/api/hs/office/debitors?debitorNumber=&{debitorNumber}")
-                    .expecting(OK).expecting(JSON),
-            response -> response.expectArrayElements(1).getFromBody("[0].uuid")
-        );
-
        obtain("BankAccount: Test AG - debit bank account", () ->
            httpPost("/api/hs/office/bankaccounts", usingJsonBody("""
                     {
-                         "holder": ${bankAccountHolder},
-                         "iban": ${bankAccountIBAN},
-                         "bic": ${bankAccountBIC}
+                         "holder": "Test AG - debit bank account",
+                         "iban": "DE02701500000000594937",
+                         "bic": "SSKMDEMM"
                    }
                    """))
                    .expecting(CREATED).expecting(JSON)
@ -37,9 +29,9 @@ public class CreateSepaMandateForDebitor extends UseCase<CreateSepaMandateForDeb
                {
                   "debitorUuid": ${Debitor: Test AG - main debitor},
                   "bankAccountUuid": ${BankAccount: Test AG - debit bank account},
-                   "reference": ${mandateReference},
-                   "agreement": ${mandateAgreement},
-                   "validFrom": ${mandateValidFrom}
+                   "reference": "Test AG - main debitor",
+                   "agreement": "2022-10-12",
+                   "validFrom": "2022-10-13"
                }
                """))
                .expecting(CREATED).expecting(JSON);