From 7f358cc7fe21c1c428e47985faa02a83daac80a2 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Thu, 2 May 2019 10:48:32 +0200
Subject: [PATCH] membership sample data and some minor fixes

---
 .../changelog/sample-data-Customer.xml        |  5 ----
 .../changelog/sample-data-Membership.xml      | 15 ++++++++---
 .../resources/config/liquibase/master.xml     |  1 +
 .../liquibase/sample-data/memberships.csv     | 13 +++++-----
 .../liquibase/sample-data/memberships.xml     | 25 +++++++++++++++++++
 .../membership/membership.component.html      |  2 +-
 6 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 src/main/resources/config/liquibase/sample-data/memberships.xml

diff --git a/src/main/resources/config/liquibase/changelog/sample-data-Customer.xml b/src/main/resources/config/liquibase/changelog/sample-data-Customer.xml
index c89e5ada..b5b09fb8 100644
--- a/src/main/resources/config/liquibase/changelog/sample-data-Customer.xml
+++ b/src/main/resources/config/liquibase/changelog/sample-data-Customer.xml
@@ -10,11 +10,6 @@
                   separator=";"
                   quotchar="'"
                   tableName="customer">
-            <column name="id" type="numeric"/>
-            <column name="jhi_number" type="numeric"/>
-            <column name="prefix" type="string"/>
-            <column name="name" type="string"/>
-            <column name="contractual_address" type="string"/>
         </loadData>
 
         <!-- Liquibase CSV files can contain linebreaks just as real linebreaks, but which
diff --git a/src/main/resources/config/liquibase/changelog/sample-data-Membership.xml b/src/main/resources/config/liquibase/changelog/sample-data-Membership.xml
index 72cbe9de..7ed7e3f6 100644
--- a/src/main/resources/config/liquibase/changelog/sample-data-Membership.xml
+++ b/src/main/resources/config/liquibase/changelog/sample-data-Membership.xml
@@ -9,11 +9,18 @@
                   file="config/liquibase/sample-data/memberships.csv"
                   separator=";"
                   tableName="membership">
-            <column name="id" type="numeric"/>
-            <column name="customer" type="numeric"/>
-            <column name="jhi_from" type="date"/>
-            <column name="jhi_to" type="date"/>
         </loadData>
+
+        <!-- Liquibase CSV files can contain linebreaks just as real linebreaks, but which
+             make the CSV files hard to read. Therefore I've encoded linebreaks as '|' and
+             replace these after import with '\n'. -->
+        <sql>
+            UPDATE membership SET remark = REPLACE(remark, '|', STRINGDECODE('\n'));
+        </sql>
+
+        <rollback>
+            DELETE FROM membership;
+        </rollback>
     </changeSet>
 
 </databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml
index b545c090..4be32e10 100644
--- a/src/main/resources/config/liquibase/master.xml
+++ b/src/main/resources/config/liquibase/master.xml
@@ -21,5 +21,6 @@
 
     <!-- sample data -->
     <include file="config/liquibase/sample-data/customers.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/sample-data/memberships.xml" relativeToChangelogFile="false"/>
 
 </databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/sample-data/memberships.csv b/src/main/resources/config/liquibase/sample-data/memberships.csv
index 0408664f..a5d16311 100644
--- a/src/main/resources/config/liquibase/sample-data/memberships.csv
+++ b/src/main/resources/config/liquibase/sample-data/memberships.csv
@@ -1,6 +1,7 @@
-id;customer_id;jhi_from;jhi_to
-1;1;2001-04-10;2007-12-31
-2;1;2017-01-15;null
-3;3;2003-05-15;2019-12-31
-4;4;2017-05-15;null
-5;5;2011-08-18;null
+id;customer_id;admission_document_date;cancellation_document_date;member_from_date;member_until_date;remark
+1;1;2001-04-10;2007-08-09;2001-04-11;2007-12-31;is now client of another member|see XYZ
+2;1;2017-01-15;null;2017-01-15;null;nothing to say here
+3;3;2003-05-11;2019-11-30;2003-05-15;2019-12-31;business discontinued
+4;4;2017-05-15;null;2017-05-15;null;whatever|is|to|say
+5;5;2011-08-18;null;2011-08-18;null;foo bar etc.
+
diff --git a/src/main/resources/config/liquibase/sample-data/memberships.xml b/src/main/resources/config/liquibase/sample-data/memberships.xml
new file mode 100644
index 00000000..f078ab38
--- /dev/null
+++ b/src/main/resources/config/liquibase/sample-data/memberships.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+    <property name="now" value="now()" dbms="h2"/>
+    <property name="now" value="current_timestamp" dbms="postgresql"/>
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
+
+    <changeSet id="20190502100700-1" author="mhoennig" context="sample-data">
+        <loadData encoding="UTF-8"
+                  file="config/liquibase/sample-data/memberships.csv"
+                  separator=";"
+                  tableName="membership">
+        </loadData>
+    </changeSet>
+
+    <changeSet id="20190502100700-2" author="mhoennig" context="sample-data">
+        <sql>UPDATE membership SET remark = replace(remark, '|', '\n')</sql>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/src/main/webapp/app/entities/membership/membership.component.html b/src/main/webapp/app/entities/membership/membership.component.html
index 8f141466..d71850b3 100644
--- a/src/main/webapp/app/entities/membership/membership.component.html
+++ b/src/main/webapp/app/entities/membership/membership.component.html
@@ -27,7 +27,7 @@
             <tr *ngFor="let membership of memberships ;trackBy: trackId">
                 <td><a [routerLink]="['/membership', membership.id, 'view' ]">{{membership.id}}</a></td>
                 <td>{{membership.admissionDocumentDate | date:'mediumDate'}}</td>
-                <td>{{membership.cancellationDocumentDate | date:'mediumDsate'}}</td>
+                <td>{{membership.cancellationDocumentDate | date:'mediumDate'}}</td>
                 <td>{{membership.memberFromDate | date:'mediumDate'}}</td>
                 <td>{{membership.memberUntilDate | date:'mediumDate'}}</td>
                 <td>