Skip to content

Commit

Permalink
small fixes are review tool critizism
Browse files Browse the repository at this point in the history 
HU-Trace: show all connected records #632
  • Loading branch information
@metas-ts
metas-ts committed Oct 14, 2017
1 parent 6cc3f5a commit 097a349
Show file tree
Hide file tree
Showing 4 changed files with 363 additions and 345 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/metas/ui/web/handlingunits/trace/HUTraceResultExtender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public String getSql(
{
return converter.getSql(sqlParamsOut, filter, sqlOpts); // do whatever the system usually does
}
final HUTraceEventQuery huTraceQuery = HUTraceSqlConverterDecorator.createTraceQueryFromDocumentFilter(filter);
final HUTraceEventQuery huTraceQuery = HuTraceQueryCreator.createTraceQueryFromDocumentFilter(filter);
final int selectionId = huTraceRepository.queryToSelection(huTraceQuery);

final String sqlPlaceHolder = sqlParamsOut.placeholder(selectionId);
Expand Down
317 changes: 0 additions & 317 deletions src/main/java/de/metas/ui/web/handlingunits/trace/HUTraceSqlConverterDecorator.java
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
package de.metas.ui.web.handlingunits.trace;

import java.util.Date;
import java.util.Map;
import java.util.OptionalInt;
import java.util.function.BiFunction;

import javax.annotation.Nullable;

import org.adempiere.exceptions.AdempiereException;
import org.adempiere.util.Check;
import org.adempiere.util.StringUtils;
import org.springframework.stereotype.Component;

import com.google.common.collect.ImmutableMap;

import de.metas.handlingunits.model.I_M_HU_Trace;
import de.metas.handlingunits.trace.HUTraceEventQuery;
import de.metas.handlingunits.trace.HUTraceEventQuery.EventTimeOperator;
import de.metas.handlingunits.trace.HUTraceRepository;
import de.metas.handlingunits.trace.HUTraceType;
import de.metas.ui.web.document.filter.DocumentFilter;
import de.metas.ui.web.document.filter.DocumentFilterParam;
import de.metas.ui.web.document.filter.DocumentFilterParam.Operator;
import de.metas.ui.web.document.filter.sql.SqlDocumentFilterConverter;
import de.metas.ui.web.document.filter.sql.SqlDocumentFilterConverterDecorator;
import de.metas.ui.web.handlingunits.WEBUI_HU_Constants;
import de.metas.ui.web.window.datatypes.LookupValue;
import de.metas.ui.web.window.datatypes.LookupValue.IntegerLookupValue;
import de.metas.ui.web.window.datatypes.WindowId;
import lombok.NonNull;

Expand Down Expand Up @@ -78,300 +57,4 @@ public SqlDocumentFilterConverter decorate(@NonNull final SqlDocumentFilterConve
{
return HUTraceResultExtender.createForRepositoryAndconverter(huTraceRepository, converter);
}

public static HUTraceEventQuery createTraceQueryFromDocumentFilter(@NonNull final DocumentFilter documentFilter)
{
try
{
return createTraceQueryFromDocumentFilter0(documentFilter);
}
catch (final AdempiereException e)
{
throw e.appendParametersToMessage()
.setParameter("documentFilter", documentFilter);
}
}

private static HUTraceEventQuery createTraceQueryFromDocumentFilter0(final DocumentFilter documentFilter)
{
HUTraceEventQuery query = HUTraceEventQuery.builder().build();
for (final DocumentFilterParam filterParam : documentFilter.getParameters())
{
query = updateQueryFromParams(query, filterParam);
}
return query;
}

private static final Map<String, BiFunction<HUTraceEventQuery, DocumentFilterParam, HUTraceEventQuery>> fieldName2QueryUpdater = //
ImmutableMap.<String, BiFunction<HUTraceEventQuery, DocumentFilterParam, HUTraceEventQuery>> builder()
.put(I_M_HU_Trace.COLUMNNAME_AD_Org_ID, HUTraceSqlConverterDecorator::updateOrgIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_C_DocType_ID, HUTraceSqlConverterDecorator::updateDocTypeIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_DocStatus, HUTraceSqlConverterDecorator::updateDocStatusFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_HUTraceType, HUTraceSqlConverterDecorator::updateTypeFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_HU_ID, HUTraceSqlConverterDecorator::updateTopLevelHuIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_HU_Trace_ID, HUTraceSqlConverterDecorator::updateHuTraceIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_HU_Trx_Line_ID, HUTraceSqlConverterDecorator::updateHuTrxLineIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_InOut_ID, HUTraceSqlConverterDecorator::updateInOutIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_Movement_ID, HUTraceSqlConverterDecorator::updateMovementIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_Product_ID, HUTraceSqlConverterDecorator::updateProductIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_M_ShipmentSchedule_ID, HUTraceSqlConverterDecorator::updateShipmentScheduleIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_PP_Cost_Collector_ID, HUTraceSqlConverterDecorator::updatePpCostCollectorIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_PP_Order_ID, HUTraceSqlConverterDecorator::updatePpOrderIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_VHU_ID, HUTraceSqlConverterDecorator::updateVhuIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_VHU_Source_ID, HUTraceSqlConverterDecorator::updateVhuSourceIdFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_VHUStatus, HUTraceSqlConverterDecorator::updateVhuStatusFromParameter)
.put(I_M_HU_Trace.COLUMNNAME_EventTime, HUTraceSqlConverterDecorator::updateEventTimeFromParameter)
.build();

private static HUTraceEventQuery updateEventTimeFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueNotNull("EventTime", query.getEventTime(), query);

switch (parameter.getOperator())
{
case EQUAL:
final Date value = (Date)parameter.getValue();
return query
.withEventTimeOperator(EventTimeOperator.EQUAL)
.withEventTime(value.toInstant());
case BETWEEN:
final Date valueFrom = (Date)parameter.getValue();
final Date valueTo = (Date)parameter.getValueTo();
return query
.withEventTimeOperator(EventTimeOperator.BETWEEN)
.withEventTime(valueFrom.toInstant()).withEventTimeTo(valueTo.toInstant());
default:
throw new AdempiereException("Unexpected operator=" + parameter.getOperator() + " in parameter")
.appendParametersToMessage()
.setParameter("HUTraceEventQuery", query)
.setParameter("DocumentFilterParam", parameter);
}
}

private static HUTraceEventQuery updateProductIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorfIfNotEqualsOperator(parameter);
errorIfQueryValueGreaterThanZero("ProductId", query.getProductId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withProductId(value.getIdAsInt());
}

private static HUTraceEventQuery updateShipmentScheduleIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("ShipmentScheduleId", query.getShipmentScheduleId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withShipmentScheduleId(value.getIdAsInt());
}

private static HUTraceEventQuery updatePpCostCollectorIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("PpCostCollectorId", query.getPpCostCollectorId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withPpCostCollectorId(value.getIdAsInt());
}

private static HUTraceEventQuery updatePpOrderIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("PpOrderId", query.getPpOrderId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withPpOrderId(value.getIdAsInt());
}

private static HUTraceEventQuery updateVhuIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("VhuId", query.getVhuId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withVhuId(value.getIdAsInt());
}

private static HUTraceEventQuery updateVhuSourceIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("VhuSourceId", query.getVhuSourceId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withVhuSourceId(value.getIdAsInt());
}

private static HUTraceEventQuery updateTypeFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueNotNull("Type", query.getType(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withType(HUTraceType.valueOf(value.getIdAsString()));
}

private static HUTraceEventQuery updateVhuStatusFromParameter(
@NonNull final HUTraceEventQuery query, @NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueNotEmpty("VhuStatus", query.getVhuStatus(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withVhuStatus(value.getIdAsString());
}

private static HUTraceEventQuery updateMovementIdFromParameter(
@NonNull final HUTraceEventQuery query, @NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("MovementId", query.getMovementId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withMovementId(value.getIdAsInt());
}

private static HUTraceEventQuery updateHuTrxLineIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("TopLevelHuId", query.getHuTrxLineId(), query);

final IntegerLookupValue value = (IntegerLookupValue)parameter.getValue();
return query.withHuTrxLineId(value.getIdAsInt());
}

private static HUTraceEventQuery updateQueryFromParams(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
final String paramName = parameter.getFieldName();

final BiFunction<HUTraceEventQuery, DocumentFilterParam, HUTraceEventQuery> queryUpdateFunction = fieldName2QueryUpdater.get(paramName);
if (queryUpdateFunction == null)
{
final String message = StringUtils.formatMessage("The given filterparam has an unexpected fieldName={}", paramName);
throw new AdempiereException(message)
.setParameter("documentFilterParam", parameter)
.setParameter("HUTraceEventQuery", query);
}

return queryUpdateFunction.apply(query, parameter);
}

private static HUTraceEventQuery updateTopLevelHuIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("TopLevelHuId", query.getTopLevelHuId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withTopLevelHuId(value.getIdAsInt());
}

private static HUTraceEventQuery updateInOutIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("InOutId", query.getInOutId(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withInOutId(value.getIdAsInt());
}

private static HUTraceEventQuery updateDocStatusFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueNotEmpty("DocStatus", query.getDocStatus(), query);

final LookupValue value = (LookupValue)parameter.getValue();
return query.withDocStatus(value.getIdAsString());
}

private static HUTraceEventQuery updateDocTypeIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
if (query.getDocTypeId().isPresent())
{
errorIfQueryValueGreaterThanZero("DocTypeId", query.getDocTypeId().getAsInt(), query);
}
final LookupValue value = (LookupValue)parameter.getValue();
return query.withDocTypeId(OptionalInt.of(value.getIdAsInt()));
}

private static HUTraceEventQuery updateHuTraceIdFromParameter(@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
if (query.getHuTraceEventId().isPresent())
{
errorIfQueryValueGreaterThanZero("HuTraceEventId", query.getHuTraceEventId().getAsInt(), query);
}
final LookupValue value = (LookupValue)parameter.getValue();
return query.withHuTraceEventId(OptionalInt.of(value.getIdAsInt()));
}

private static HUTraceEventQuery updateOrgIdFromParameter(
@NonNull final HUTraceEventQuery query,
@NonNull final DocumentFilterParam parameter)
{
errorIfQueryValueGreaterThanZero("OrgId", query.getOrgId(), query);

final IntegerLookupValue value = (IntegerLookupValue)parameter.getValue();
return query.withOrgId(value.getIdAsInt());
}

private static void errorIfQueryValueGreaterThanZero(
@NonNull final String field,
final int value,
@NonNull final HUTraceEventQuery query)
{
if (value > 0)
{
final String message = StringUtils.formatMessage("The given HUTraceEventQuery already has {}={}", field, value);
throw new AdempiereException(message).setParameter("HUTraceEventQuery", query);
}
}

private static void errorIfQueryValueNotEmpty(
@NonNull final String field,
@Nullable final String value, // empty can mean "" or null
@NonNull final HUTraceEventQuery query)
{
if (!Check.isEmpty(value))
{
final String message = StringUtils.formatMessage("The given HUTraceEventQuery already has {}={}", field, value);
throw new AdempiereException(message).setParameter("HUTraceEventQuery", query);
}
}

private static void errorIfQueryValueNotNull(
@NonNull final String field,
final Object value,
@NonNull final HUTraceEventQuery query)
{
if (value != null)
{
final String message = StringUtils.formatMessage("The given HUTraceEventQuery already has {}={}", field, value);
throw new AdempiereException(message).setParameter("HUTraceEventQuery", query);
}
}

private static void errorfIfNotEqualsOperator(@NonNull final DocumentFilterParam parameter)
{
if (!Operator.EQUAL.equals(parameter.getOperator()))
{
final String message = StringUtils.formatMessage("The given DocumentFilterParam needs to have an EQUAL operator, but has {}", parameter.getOperator());
throw new AdempiereException(message).setParameter("DocumentFilterParam", parameter);
}
}
}
Loading

0 comments on commit 097a349

Please sign in to comment.