RetrieveDbRecordsUtil: handle HUTraceType

#4797
metasfresh · Nov 27, 2018 · 5a7862a · 5a7862a
1 parent 0047f63
commit 5a7862a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceType.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceType.java
@@ -71,4 +71,15 @@ public enum HUTraceType
 	 * Used for records/events related zo changes in the parent HU relation.
 	 */
 	TRANSFORM_PARENT
+	;
+
+	public static HUTraceType ofCode(final String code)
+	{
+		return valueOf(code);
+	}
+
+	public String getCode()
+	{
+		return name();
+	}
 }
diff --git a/...ase/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java b/...ase/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java
@@ -60,7 +60,7 @@ public static HUTraceEvent fromDbRecord(@NonNull final I_M_HU_Trace dbRecord)
 				.inOutId(dbRecord.getM_InOut_ID())
 				.movementId(dbRecord.getM_Movement_ID())
 				.shipmentScheduleId(ShipmentScheduleId.ofRepoIdOrNull(dbRecord.getM_ShipmentSchedule_ID()))
-				.type(HUTraceType.valueOf(dbRecord.getHUTraceType())); // HUTraceType is also a mandatory column, so no NPE
+				.type(HUTraceType.ofCode(dbRecord.getHUTraceType())); // HUTraceType is also a mandatory column, so no NPE
 
 		if (dbRecord.getM_HU_Trace_ID() > 0)
 		{

diff --git a/...its.base/src/main/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtil.java b/...its.base/src/main/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtil.java
@@ -297,6 +297,11 @@ static IQueryBuilder<I_M_HU_Trace> createQueryBuilderOrNull(@NonNull final HUTra
 			queryBuilder.addEqualsFilter(I_M_HU_Trace.COLUMN_M_HU_Trace_ID, query.getHuTraceEventId().getAsInt());
 			queryIsEmpty = false;
 		}
+		if(query.getType() != null)
+		{
+			queryBuilder.addEqualsFilter(I_M_HU_Trace.COLUMN_HUTraceType, query.getType().getCode());
+			queryIsEmpty = false;
+		}
 		if (query.getOrgId() != null)
 		{
 			queryBuilder.addEqualsFilter(I_M_HU_Trace.COLUMN_AD_Org_ID, query.getOrgId());