ASI API minor improvements

metasfresh/metasfresh-webui-api-legacy#1134
metasfresh · Jan 28, 2019 · d2f7a08 · d2f7a08
1 parent fb2c146
commit d2f7a08
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/IAttributeDAO.java b/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/IAttributeDAO.java
@@ -187,4 +187,6 @@ default ASICopy prepareCopy(final I_M_AttributeSetInstance fromASI)
 	Optional<ITranslatableString> getAttributeDisplayNameByValue(String value);
 
 	boolean areAttributeSetsEqual(AttributeSetInstanceId firstASIId, AttributeSetInstanceId secondASIId);
+
+	I_M_AttributeSetInstance getAttributeSetInstanceById(AttributeSetInstanceId attributeSetInstanceId);
 }
diff --git a/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/IAttributeSetInstanceBL.java b/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/IAttributeSetInstanceBL.java
@@ -3,6 +3,7 @@
 import java.util.function.Predicate;
 
 import org.adempiere.mm.attributes.AttributeId;
+import org.adempiere.mm.attributes.AttributeSetInstanceId;
 import org.compiere.model.I_M_Attribute;
 import org.compiere.model.I_M_AttributeInstance;
 import org.compiere.model.I_M_AttributeSetInstance;
@@ -110,4 +111,6 @@ default I_M_AttributeSetInstance createASIFromAttributeSet(IAttributeSet attribu
 	void setAttributeInstanceValue(I_M_AttributeSetInstance asi, I_M_Attribute attribute, Object value);
 
 	void setAttributeInstanceValue(I_M_AttributeSetInstance asi, AttributeId attributeId, Object value);
+
+	String getASIDescriptionById(AttributeSetInstanceId asiId);
 }
diff --git a/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributeDAO.java b/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributeDAO.java
@@ -255,6 +255,12 @@ public boolean isHighVolumeValuesList(@NonNull final I_M_Attribute attribute)
 		return attribute.isHighVolume();
 	}
 
+	@Override
+	public I_M_AttributeSetInstance getAttributeSetInstanceById(@NonNull final AttributeSetInstanceId attributeSetInstanceId)
+	{
+		return load(attributeSetInstanceId, I_M_AttributeSetInstance.class);
+	}
+
 	@Override
 	public List<I_M_AttributeInstance> retrieveAttributeInstances(final AttributeSetInstanceId attributeSetInstanceId)
 	{
@@ -263,7 +269,7 @@ public List<I_M_AttributeInstance> retrieveAttributeInstances(final AttributeSet
 			return ImmutableList.of();
 		}
 
-		I_M_AttributeSetInstance asi = load(attributeSetInstanceId, I_M_AttributeSetInstance.class);
+		I_M_AttributeSetInstance asi = getAttributeSetInstanceById(attributeSetInstanceId);
 		return retrieveAttributeInstances(asi);
 	}
 

diff --git a/...s.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributeSetInstanceBL.java b/...s.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributeSetInstanceBL.java
@@ -14,6 +14,7 @@
 
 import org.adempiere.mm.attributes.AttributeId;
 import org.adempiere.mm.attributes.AttributeSetId;
+import org.adempiere.mm.attributes.AttributeSetInstanceId;
 import org.adempiere.mm.attributes.api.IAttributeDAO;
 import org.adempiere.mm.attributes.api.IAttributeSet;
 import org.adempiere.mm.attributes.api.IAttributeSetInstanceAware;
@@ -312,4 +313,16 @@ else if (X_M_Attribute.ATTRIBUTEVALUETYPE_Number.equals(attributeValueType))
 
 		return attributeInstance;
 	}
+
+	@Override
+	public String getASIDescriptionById(final AttributeSetInstanceId asiId)
+	{
+		if (asiId.isNone())
+		{
+			return "";
+		}
+
+		I_M_AttributeSetInstance asi = Services.get(IAttributeDAO.class).getAttributeSetInstanceById(asiId);
+		return asi != null ? asi.getDescription() : "";
+	}
 }