Remapped HandlingActivity to use its own table

dddsample/tracking/core/src/main/resources/hibernate.cfg.xml

@@ -18,6 +18,7 @@
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Location.hbm.xml" />
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/CarrierMovement.hbm.xml" />
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingActivity.hbm.xml" />
   </session-factory>
 
 </hibernate-configuration>

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Cargo.hbm.xml

@@ -15,27 +15,11 @@
       <property name="id" column="tracking_id"/>
     </component>
 
-    <component name="delivery" lazy="true">
+    <component name="delivery">
       <property name="routedAfterHandling" column="routed_after_handling" not-null="true"/>
-      <property name="lastUpdatedOn" column="last_update"/>
-      <component name="mostRecentHandlingActivity">
-        <many-to-one name="location" column="most_recent_location_id" foreign-key="most_recent_location_fk" cascade="none"/>
-        <property name="type" column="most_recent_handling_event_type">
-          <type name="org.hibernate.type.EnumType">
-            <param name="enumClass">se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent$Type</param>
-            <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
-          </type>
-        </property>
-      </component>
-        <component name="mostRecentPhysicalHandlingActivity">
-          <many-to-one name="location" column="most_recent_physical_location_id" foreign-key="most_recent_physical_location_fk" cascade="none"/>
-          <property name="type" column="most_recent_physical_handling_event_type">
-            <type name="org.hibernate.type.EnumType">
-              <param name="enumClass">se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent$Type</param>
-              <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
-            </type>
-          </property>
-        </component>
+      <property name="lastUpdatedOn" column="last_update" not-null="true"/>
+      <many-to-one name="mostRecentPhysicalHandlingActivity" column="most_recent_physical_act" not-null="false" update="false" cascade="all"/>
+      <many-to-one name="mostRecentHandlingActivity" column="most_recent_act" not-null="false" update="false" cascade="all"/>
     </component>
 
     <component name="routeSpecification">
@@ -52,6 +36,6 @@
         <one-to-many class="se.citerus.dddsample.tracking.core.domain.model.cargo.Leg"/>
       </list>
     </component>
-
   </class>
+
 </hibernate-mapping>

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingActivity.hbm.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+
+  <class name="se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity">
+      <id name="_primaryKey" column="id">
+        <generator class="org.hibernate.id.IdentityGenerator"/>
+      </id>
+      <many-to-one name="location" column="location_id" foreign-key="location_fk" cascade="none" update="false" fetch="join"/>
+      <property name="type" column="handling_event_type" update="false">
+        <type name="org.hibernate.type.EnumType">
+          <param name="enumClass">se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent$Type</param>
+          <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
+        </type>
+      </property>
+      <many-to-one name="voyage" column="voyage_id" foreign-key="voyage_fk" not-null="false" cascade="none" update="false" fetch="join"/>
+  </class>
+
+</hibernate-mapping>

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml

@@ -18,16 +18,6 @@
     <component name="operatorCode" update="false">
       <property name="code" column="operator_code" not-null="false" length="3"/>
     </component>
-    <component name="activity" update="false">
-      <many-to-one name="voyage" column="voyage_id" not-null="false" cascade="none" foreign-key="event_voyage_fk"/>
-      <many-to-one name="location" column="location_id" not-null="true" cascade="none" foreign-key="location_fk"/>
-      <property name="type" column="type" not-null="true">
-        <type name="org.hibernate.type.EnumType">
-          <param name="enumClass">se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent$Type</param>
-          <param name="type">12</param>
-          <!-- 12 is java.sql.Types.VARCHAR -->
-        </type>
-      </property>
-    </component>
+    <many-to-one name="activity" column="activity_id" foreign-key="activity_fk" not-null="true" update="false" cascade="all"/>
   </class>
 </hibernate-mapping>