From 71bd2b5ad33bf6c0f066e45d9691e34b25ffb297 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 23 May 2013 15:30:26 +0200
Subject: [PATCH] found one more mapping error with migrated database

---
 hsarback/src/de/hsadmin/mods/pac/Pac.java      |  6 +++---
 .../src/de/hsadmin/mods/pac/PacComponent.java  | 18 +++++++-----------
 .../src/de/hsadmin/mods/pac/PacModuleImpl.java |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/pac/Pac.java b/hsarback/src/de/hsadmin/mods/pac/Pac.java
index d9f4def..0c2750b 100644
--- a/hsarback/src/de/hsadmin/mods/pac/Pac.java
+++ b/hsarback/src/de/hsadmin/mods/pac/Pac.java
@@ -49,7 +49,7 @@ public class Pac extends AbstractEntity implements Serializable {
 	private String name;
 
 	@JoinColumn(name = "bp_id")
-	@ManyToOne(fetch = EAGER)
+	@ManyToOne(fetch = LAZY)
 	private Customer customer;
 
 	@JoinColumn(name = "basepacket_id")
@@ -79,7 +79,7 @@ public class Pac extends AbstractEntity implements Serializable {
 	@ManyToOne(fetch = EAGER)
 	private INetAddress oldINetAddr;
 
-	@OneToMany(fetch = EAGER, cascade = ALL, mappedBy="pac")
+	@OneToMany(fetch = EAGER, cascade = ALL, mappedBy="pac", orphanRemoval=true)
 	private Set<PacComponent> pacComponents;
 
 	@OneToMany(fetch = LAZY, cascade = ALL, mappedBy="pac")
@@ -95,7 +95,7 @@ public class Pac extends AbstractEntity implements Serializable {
 		for (Component comp : basePac.getComponents()) {
 			PacComponent pacComp = new PacComponent();
 			pacComp.setCreated(today);
-			pacComp.setComponent(comp);
+			pacComp.setBaseComponent(comp.getBaseComponent());
 			pacComp.setPac(this);
 			if (setDefaults) {
 				pacComp.setQuantity(comp.getDefaultQuantity());
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacComponent.java b/hsarback/src/de/hsadmin/mods/pac/PacComponent.java
index 486dc86..a39dd8c 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacComponent.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacComponent.java
@@ -34,7 +34,7 @@ public class PacComponent implements Serializable {
 	
 	@ManyToOne
 	@JoinColumn(name = "basecomponent_id")
-	private Component component;
+	private BaseComponent baseComponent;
 
 	@Column(name = "quantity", columnDefinition = "integer")
 	private int quantity;
@@ -52,7 +52,11 @@ public class PacComponent implements Serializable {
 	}
 
 	public BaseComponent getBaseComponent() {
-		return getComponent().getBaseComponent();
+		return baseComponent;
+	}
+
+	public void setBaseComponent(BaseComponent baseComponent) {
+		this.baseComponent = baseComponent;
 	}
 
 	public Pac getPac() {
@@ -87,17 +91,9 @@ public class PacComponent implements Serializable {
 		this.cancelled = cancelled;
 	}
 
-	public Component getComponent() {
-		return component;
-	}
-
-	public void setComponent(Component component) {
-		this.component = component;
-	}
-
 	@Override
 	public String toString() {
-		return "pac=" + pac.getName() + ";comp=" + component.getBaseComponent().getFeature() + ";quantity=" + getQuantity();
+		return "pac=" + pac.getName() + ";comp=" + getBaseComponent().getFeature() + ";quantity=" + getQuantity();
 	}
 
 }
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java b/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
index f4c580d..85ce549 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
@@ -80,7 +80,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
 			Component comp = (Component) cObj;
 			PacComponent pacComponent = new PacComponent();
 			BaseComponent baseComponent = comp.getBaseComponent();
-			pacComponent.setComponent(comp);
+			pacComponent.setBaseComponent(comp.getBaseComponent());
 			pacComponent.setCreated(now);
 			pacComponent.setPac(pac);
 			String feature = baseComponent.getFeature();