From 7894bc88aafc300d6bc3d055f0028270719ce5de Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Sun, 16 Apr 2017 11:55:26 +0200
Subject: [PATCH] =?UTF-8?q?MemberAssetTest=20=C3=83+=20bugfix=20in=20Membe?=
 =?UTF-8?q?rAsset=20(database-mapping)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/hsadmin/bo/customer/MemberAsset.java   | 16 +++++---
 .../hsadmin/bo/customer/MemberAssetTest.java  | 38 +++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java

diff --git a/cust-services/src/main/java/de/hsadmin/bo/customer/MemberAsset.java b/cust-services/src/main/java/de/hsadmin/bo/customer/MemberAsset.java
index 036e85c..e5b12a1 100644
--- a/cust-services/src/main/java/de/hsadmin/bo/customer/MemberAsset.java
+++ b/cust-services/src/main/java/de/hsadmin/bo/customer/MemberAsset.java
@@ -24,7 +24,7 @@ public class MemberAsset implements Serializable {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "member_share_id", columnDefinition = "integer")
+	@Column(name = "member_asset_id", columnDefinition = "integer")
 	private long id;
 
 	@JoinColumn(name = "bp_id", columnDefinition = "integer", nullable = false)
@@ -36,7 +36,7 @@ public class MemberAsset implements Serializable {
 	private Date date;
 
 	@Column(name="action", nullable = false)
-	private ShareAction action;
+	private AssetAction action;
 	
 	@Column(name="amount", nullable = false)
 	private BigDecimal amount;
@@ -76,16 +76,14 @@ public class MemberAsset implements Serializable {
 		this.date = date;
 	}
 
-	public ShareAction getAction() {
+	public AssetAction getAction() {
 		return action;
 	}
 
-	public void setAction(ShareAction action) {
+	public void setAction(AssetAction action) {
 		this.action = action;
 	}
 
-
-
 	public String getComment() {
 		return comment;
 	}
@@ -94,4 +92,10 @@ public class MemberAsset implements Serializable {
 		this.comment = comment;
 	}
 
+
+	@Override
+	public String toString() {
+		return "MemberAsset [id=" + id + ", customer=" + (customer!=null ? customer.getName() : null) + ", date=" + date + ", action=" + action
+				+ ", amount=" + amount + ", comment=" + comment + "]";
+	}
 }
diff --git a/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java b/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java
new file mode 100644
index 0000000..74328ad
--- /dev/null
+++ b/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java
@@ -0,0 +1,38 @@
+package de.hsadmin.bo.customer;
+
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+
+import org.joda.time.LocalDate;
+import org.junit.Test;
+
+import de.hsadmin.dao.customer.CustomerDaoTest;
+import de.hsadmin.test.JpaBasedTest;
+
+public class MemberAssetTest extends JpaBasedTest {
+
+	@Test
+	public void testMemberAssetAgainstDatabase() {
+		// given
+		Customer customer = store(CustomerDaoTest.createNewCustomer(10001, "testCust"));
+		
+		// when
+		MemberAsset newEntity = store(createNewMemberAsset(customer));
+		MemberAsset foundEntity = getEM().find(MemberAsset.class, newEntity.getId());
+		
+		// then
+		assertEquals(newEntity.toString(), foundEntity.toString());
+	}
+	
+	public static MemberAsset createNewMemberAsset(final Customer customer) {
+		MemberAsset newEntity = new MemberAsset();
+		newEntity.setCustomer(customer);
+		newEntity.setAction(AssetAction.PAYMENT);
+		newEntity.setDate(new LocalDate(2017, 4, 13).toDate());
+		newEntity.setAmount(new BigDecimal("1234.56"));
+		newEntity.setComment("test comment");
+		return newEntity;
+	}
+}