fix reverse log logic

#17902
metasfresh · Apr 24, 2024 · 0191753 · 0191753
1 parent b37212e
commit 0191753
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 39 deletions.
diff --git a/.../de/metas/contracts/modular/computing/purchasecontract/interim/InterimInvoiceLineLog.java b/.../de/metas/contracts/modular/computing/purchasecontract/interim/InterimInvoiceLineLog.java
@@ -217,10 +217,10 @@ public InterimInvoiceLineLog(
 						.flatrateTermId(handleLogsRequest.getContractId())
 						.description(description)
 						.logEntryContractType(LogEntryContractType.INTERIM)
-						.modularContractTypeId(handleLogsRequest.getContractInfo()
-													   .getModularContractSettings()
-													   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-													   .getModularContractTypeId())
+						.contractModuleId(handleLogsRequest.getContractInfo()
+													 .getModularContractSettings()
+													 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+													 .getId().getModularContractModuleId())
 						.build()
 		);
 	}

diff --git a/...a/de/metas/contracts/modular/computing/purchasecontract/receipt/PurchaseOrderLineLog.java b/...a/de/metas/contracts/modular/computing/purchasecontract/receipt/PurchaseOrderLineLog.java
@@ -146,10 +146,10 @@ class PurchaseOrderLineLog implements IModularContractLogHandler
 											.flatrateTermId(handleLogsRequest.getContractId())
 											.description(null)
 											.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-											.modularContractTypeId(handleLogsRequest.getContractInfo()
-																		   .getModularContractSettings()
-																		   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-																		   .getModularContractTypeId())
+											.contractModuleId(handleLogsRequest.getContractInfo()
+																		 .getModularContractSettings()
+																		 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+																		 .getId().getModularContractModuleId())
 											.build());
 	}
 

diff --git a/...main/java/de/metas/contracts/modular/computing/tbd/inventory/InventoryLineLogHandler.java b/...main/java/de/metas/contracts/modular/computing/tbd/inventory/InventoryLineLogHandler.java
@@ -168,10 +168,10 @@ public ExplainedOptional<LogEntryCreateRequest> createLogEntryCreateRequest(
 											.referencedModel(recordRef)
 											.flatrateTermId(handleLogsRequest.getContractId())
 											.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-											.modularContractTypeId(handleLogsRequest.getContractInfo()
-																		   .getModularContractSettings()
-																		   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-																		   .getModularContractTypeId())
+											.contractModuleId(handleLogsRequest.getContractInfo()
+																		 .getModularContractSettings()
+																		 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+																		 .getId().getModularContractModuleId())
 											.build());
 	}
 }
diff --git a/...ontracts/modular/computing/tbd/purchasecontract/salesorderline/SOLineForPOLogHandler.java b/...ontracts/modular/computing/tbd/purchasecontract/salesorderline/SOLineForPOLogHandler.java
@@ -166,10 +166,10 @@ class SOLineForPOLogHandler implements IModularContractLogHandler
 						.flatrateTermId(handleLogsRequest.getContractId())
 						.description(description)
 						.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-						.modularContractTypeId(handleLogsRequest.getContractInfo()
-													   .getModularContractSettings()
-													   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-													   .getModularContractTypeId())
+						.contractModuleId(handleLogsRequest.getContractInfo()
+													 .getModularContractSettings()
+													 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+													 .getId().getModularContractModuleId())
 						.build());
 	}
 

diff --git a/...ontracts/modular/computing/tbd/purchasecontract/shipment/ShipmentLineForPOLogHandler.java b/...ontracts/modular/computing/tbd/purchasecontract/shipment/ShipmentLineForPOLogHandler.java
@@ -149,10 +149,10 @@ class ShipmentLineForPOLogHandler implements IModularContractLogHandler
 											.flatrateTermId(handleLogsRequest.getContractId())
 											.description(description)
 											.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-											.modularContractTypeId(handleLogsRequest.getContractInfo()
-																		   .getModularContractSettings()
-																		   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-																		   .getModularContractTypeId())
+											.contractModuleId(handleLogsRequest.getContractInfo()
+																		 .getModularContractSettings()
+																		 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+																		 .getId().getModularContractModuleId())
 											.build());
 	}
 

diff --git a/...tas/contracts/modular/computing/tbd/salescontract/invoice/SalesInvoiceLineLogHandler.java b/...tas/contracts/modular/computing/tbd/salescontract/invoice/SalesInvoiceLineLogHandler.java
@@ -181,10 +181,10 @@ private static Quantity extractQtyEntered(final @NonNull I_C_InvoiceLine invoice
 						.flatrateTermId(handleLogsRequest.getContractId())
 						.description(description)
 						.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-						.modularContractTypeId(handleLogsRequest.getContractInfo()
-													   .getModularContractSettings()
-													   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-													   .getModularContractTypeId())
+						.contractModuleId(handleLogsRequest.getContractInfo()
+													 .getModularContractSettings()
+													 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+													 .getId().getModularContractModuleId())
 						.build()
 		);
 	}

diff --git a/...s/contracts/modular/computing/tbd/salescontract/shipment/ShipmentLineForSOLogHandler.java b/...s/contracts/modular/computing/tbd/salescontract/shipment/ShipmentLineForSOLogHandler.java
@@ -170,10 +170,10 @@ class ShipmentLineForSOLogHandler implements IModularContractLogHandler
 											.flatrateTermId(handleLogsRequest.getContractId())
 											.description(description)
 											.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-											.modularContractTypeId(handleLogsRequest.getContractInfo()
-																		   .getModularContractSettings()
-																		   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-																		   .getModularContractTypeId())
+											.contractModuleId(handleLogsRequest.getContractInfo()
+																		 .getModularContractSettings()
+																		 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+																		 .getId().getModularContractModuleId())
 											.build());
 	}
 }
diff --git a/....metas.contracts/src/main/java/de/metas/contracts/modular/log/LogEntryReverseRequest.java b/....metas.contracts/src/main/java/de/metas/contracts/modular/log/LogEntryReverseRequest.java
@@ -23,7 +23,7 @@
 package de.metas.contracts.modular.log;
 
 import de.metas.contracts.FlatrateTermId;
-import de.metas.contracts.modular.settings.ModularContractTypeId;
+import de.metas.contracts.modular.settings.ModularContractModuleId;
 import lombok.Builder;
 import lombok.NonNull;
 import org.adempiere.exceptions.AdempiereException;
@@ -38,7 +38,7 @@ public record LogEntryReverseRequest(
 		@Nullable FlatrateTermId flatrateTermId,
 		@Nullable String description,
 		@NonNull LogEntryContractType logEntryContractType,
-		@NonNull ModularContractTypeId modularContractTypeId)
+		@NonNull ModularContractModuleId contractModuleId)
 {
 	public LogEntryReverseRequest
 	{

diff --git a/...e.metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogDAO.java b/...e.metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogDAO.java
@@ -191,7 +191,7 @@ public ModularContractLogEntryId reverse(@NonNull final LogEntryReverseRequest r
 				.flatrateTermId(request.flatrateTermId())
 				.referenceSet(TableRecordReferenceSet.of(request.referencedModel()))
 				.contractType(request.logEntryContractType())
-				.modularContractTypeId(request.modularContractTypeId());
+				.contractModuleId(request.contractModuleId());
 
 		if (request.id() != null)
 		{
@@ -313,6 +313,11 @@ private IQueryBuilder<I_ModCntr_Log> toSqlQuery(@NonNull final ModularContractLo
 			sqlQueryBuilder.addEqualsFilter(I_ModCntr_Log.COLUMNNAME_ModCntr_Type_ID, query.getModularContractTypeId());
 		}
 
+		if (query.getContractModuleId() != null)
+		{
+			sqlQueryBuilder.addEqualsFilter(I_ModCntr_Log.COLUMNNAME_ModCntr_Module_ID, query.getContractModuleId());
+		}
+
 		if (query.getProcessed() != null)
 		{
 			sqlQueryBuilder.addEqualsFilter(I_ModCntr_Log.COLUMNNAME_Processed, query.getProcessed());

diff --git a/...metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogQuery.java b/...metas.contracts/src/main/java/de/metas/contracts/modular/log/ModularContractLogQuery.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.ImmutableSet;
 import de.metas.contracts.FlatrateTermId;
 import de.metas.contracts.modular.ComputingMethodType;
+import de.metas.contracts.modular.settings.ModularContractModuleId;
 import de.metas.contracts.modular.settings.ModularContractTypeId;
 import de.metas.invoicecandidate.InvoiceCandidateId;
 import de.metas.lock.api.LockOwner;
@@ -45,6 +46,7 @@ public class ModularContractLogQuery
 	@Nullable LogEntryContractType contractType;
 	@Nullable FlatrateTermId flatrateTermId;
 	@Nullable ModularContractTypeId modularContractTypeId;
+	@Nullable ModularContractModuleId contractModuleId;
 	@Nullable Boolean processed;
 	@Nullable Boolean billable;
 	@Nullable ComputingMethodType computingMethodType;

diff --git a/...n/java/de/metas/contracts/modular/workpackage/impl/AbstractMaterialReceiptLogHandler.java b/...n/java/de/metas/contracts/modular/workpackage/impl/AbstractMaterialReceiptLogHandler.java
@@ -149,10 +149,10 @@ public abstract class AbstractMaterialReceiptLogHandler implements IModularContr
 											.flatrateTermId(request.getContractId())
 											.description(description)
 											.logEntryContractType(getLogEntryContractType())
-											.modularContractTypeId(request.getContractInfo()
-																		   .getModularContractSettings()
-																		   .getModuleConfigOrError(request.getComputingMethodType(), productId)
-																		   .getModularContractTypeId())
+											.contractModuleId(request.getContractInfo()
+																		 .getModularContractSettings()
+																		 .getModuleConfigOrError(request.getComputingMethodType(), productId)
+																		 .getId().getModularContractModuleId())
 											.build());
 	}
 }
diff --git a/...a/de/metas/contracts/modular/workpackage/impl/AbstractShippingNotificationLogHandler.java b/...a/de/metas/contracts/modular/workpackage/impl/AbstractShippingNotificationLogHandler.java
@@ -144,10 +144,10 @@ public abstract class AbstractShippingNotificationLogHandler implements IModular
 						.flatrateTermId(handleLogsRequest.getContractId())
 						.description(description)
 						.logEntryContractType(LogEntryContractType.MODULAR_CONTRACT)
-						.modularContractTypeId(handleLogsRequest.getContractInfo()
-													   .getModularContractSettings()
-													   .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
-													   .getModularContractTypeId())
+						.contractModuleId(handleLogsRequest.getContractInfo()
+													 .getModularContractSettings()
+													 .getModuleConfigOrError(handleLogsRequest.getComputingMethodType(), productId)
+													 .getId().getModularContractModuleId())
 						.build());
 	}