use AdProcessId

metasfresh/metasfresh#5370

src/main/java/de/metas/ui/web/handlingunits/process/WEBUI_M_HU_PrintReceiptLabel.java

@@ -10,6 +10,7 @@
 import de.metas.handlingunits.report.HUReportExecutor;
 import de.metas.handlingunits.report.HUReportService;
 import de.metas.handlingunits.report.HUToReport;
+import de.metas.process.AdProcessId;
 import de.metas.process.IProcessPrecondition;
 import de.metas.process.Param;
 import de.metas.process.ProcessPreconditionsResolution;
@@ -55,8 +56,8 @@ public ProcessPreconditionsResolution checkPreconditionsApplicable()
 
 		final HUReportService huReportService = HUReportService.get();
 
-		final int adProcessId = huReportService.retrievePrintReceiptLabelProcessId();
-		if (adProcessId <= 0)
+		final AdProcessId adProcessId = huReportService.retrievePrintReceiptLabelProcessIdOrNull();
+		if (adProcessId == null)
 		{
 			return ProcessPreconditionsResolution.reject("Receipt label process not configured via sysconfig " + HUReportService.SYSCONFIG_RECEIPT_LABEL_PROCESS_ID);
 		}
@@ -86,7 +87,7 @@ protected String doIt() throws Exception
 	{
 		final HUReportService huReportService = HUReportService.get();
 
-		final int adProcessId = huReportService.retrievePrintReceiptLabelProcessId();
+		final AdProcessId adProcessId = huReportService.retrievePrintReceiptLabelProcessIdOrNull();
 		final HUToReport hu = getSingleSelectedRow().getAsHUToReport();
 
 		final List<HUToReport> husToProcess = huReportService.getHUsToProcess(hu, adProcessId)

src/main/java/de/metas/ui/web/handlingunits/report/HUReportProcessInstance.java

@@ -18,7 +18,7 @@
 import de.metas.handlingunits.report.HUReportExecutorResult;
 import de.metas.handlingunits.report.HUReportService;
 import de.metas.handlingunits.report.HUToReport;
-import de.metas.printing.esb.base.util.Check;
+import de.metas.process.AdProcessId;
 import de.metas.ui.web.handlingunits.HUEditorRow;
 import de.metas.ui.web.handlingunits.HUEditorView;
 import de.metas.ui.web.process.IProcessInstanceController;
@@ -72,7 +72,7 @@ final class HUReportProcessInstance implements IProcessInstanceController
 
 	private final DocumentId instanceId;
 	private final ViewRowIdsSelection viewRowIdsSelection;
-	private final int reportADProcessId;
+	private final AdProcessId reportAdProcessId;
 	private final Document parameters;
 	@Getter
 	private final boolean startProcessDirectly;
@@ -85,14 +85,12 @@ final class HUReportProcessInstance implements IProcessInstanceController
 	private HUReportProcessInstance(
 			@NonNull final DocumentId instanceId,
 			@NonNull final ViewRowIdsSelection viewRowIdsSelection,
-			final int reportADProcessId,
+			@NonNull final AdProcessId reportAdProcessId,
 			@NonNull final Document parameters)
 	{
-		Check.assume(reportADProcessId > 0, "reportADProcessId > 0");
-
 		this.instanceId = instanceId;
 		this.viewRowIdsSelection = viewRowIdsSelection;
-		this.reportADProcessId = reportADProcessId;
+		this.reportAdProcessId = reportAdProcessId;
 		this.parameters = parameters;
 		this.startProcessDirectly = parameters.getFieldNames().isEmpty();
 
@@ -101,11 +99,14 @@ private HUReportProcessInstance(
 		readwriteLock = new ReentrantReadWriteLock();
 	}
 
-	private HUReportProcessInstance(final HUReportProcessInstance from, final CopyMode copyMode, final IDocumentChangesCollector changesCollector)
+	private HUReportProcessInstance(
+			final HUReportProcessInstance from, 
+			final CopyMode copyMode, 
+			final IDocumentChangesCollector changesCollector)
 	{
 		instanceId = from.instanceId;
 		viewRowIdsSelection = from.viewRowIdsSelection;
-		reportADProcessId = from.reportADProcessId;
+		reportAdProcessId = from.reportAdProcessId;
 		parameters = from.parameters.copy(copyMode, changesCollector);
 		startProcessDirectly = from.startProcessDirectly;
 
@@ -124,14 +125,14 @@ public HUReportProcessInstance copyReadWrite(final IDocumentChangesCollector cha
 		return new HUReportProcessInstance(this, CopyMode.CheckOutWritable, changesCollector);
 	}
 
-	/* package */ final IAutoCloseable lockForReading()
+	/* package */ IAutoCloseable lockForReading()
 	{
 		final ReadLock readLock = readwriteLock.readLock();
 		readLock.lock();
 		return readLock::unlock;
 	}
 
-	/* package */ final IAutoCloseable lockForWriting()
+	/* package */ IAutoCloseable lockForWriting()
 	{
 		final WriteLock writeLock = readwriteLock.writeLock();
 		writeLock.lock();
@@ -161,7 +162,7 @@ public synchronized ProcessInstanceResult startProcess(@NonNull final ProcessExe
 		final HUReportExecutorResult reportExecutorResult = HUReportExecutor.newInstance(context.getCtx())
 				.numberOfCopies(numberOfCopies)
 				.printPreview(true)
-				.executeNow(reportADProcessId, extractHUsToReport(view));
+				.executeNow(reportAdProcessId, extractHUsToReport(view));
 
 		final ADProcessPostProcessService postProcessService = ADProcessPostProcessService.builder()
 				.viewsRepo(viewsRepo)

src/main/java/de/metas/ui/web/handlingunits/report/HUReportProcessInstancesRepository.java

@@ -25,6 +25,7 @@
 import de.metas.i18n.IModelTranslationMap;
 import de.metas.i18n.IMsgBL;
 import de.metas.i18n.ITranslatableString;
+import de.metas.process.AdProcessId;
 import de.metas.process.IADProcessDAO;
 import de.metas.ui.web.exceptions.EntityNotFoundException;
 import de.metas.ui.web.handlingunits.HUEditorRow;
@@ -123,8 +124,8 @@ private IndexedWebuiHUProcessDescriptors retrieveIndexedWebuiHUProcessDescriptor
 
 	private WebuiHUProcessDescriptor toWebuiHUProcessDescriptor(@NonNull final HUProcessDescriptor huProcessDescriptor)
 	{
-		final int reportADProcessId = huProcessDescriptor.getProcessId();
-		final ProcessId processId = ProcessId.of(PROCESS_HANDLER_TYPE, reportADProcessId);
+		final AdProcessId reportADProcessId = huProcessDescriptor.getProcessId();
+		final ProcessId processId = ProcessId.of(PROCESS_HANDLER_TYPE, reportADProcessId.getRepoId());
 
 		final I_AD_Process adProcess = Services.get(IADProcessDAO.class).getById(reportADProcessId);
 		final IModelTranslationMap adProcessTrl = InterfaceWrapperHelper.getModelTranslationMap(adProcess);
@@ -218,7 +219,7 @@ public HUReportProcessInstance createNewProcessInstance(final CreateProcessInsta
 		final HUReportProcessInstance instance = HUReportProcessInstance.builder()
 				.instanceId(instanceId)
 				.viewRowIdsSelection(request.getViewRowIdsSelection())
-				.reportADProcessId(descriptor.getReportADProcessId())
+				.reportAdProcessId(descriptor.getReportAdProcessId())
 				.parameters(parameters)
 				.build();
 		instance.setCopies(1);

src/main/java/de/metas/ui/web/handlingunits/report/WebuiHUProcessDescriptor.java

@@ -1,6 +1,7 @@
 package de.metas.ui.web.handlingunits.report;
 
 import de.metas.handlingunits.process.api.HUProcessDescriptor;
+import de.metas.process.AdProcessId;
 import de.metas.process.ProcessPreconditionsResolution;
 import de.metas.process.RelatedProcessDescriptor.DisplayPlace;
 import de.metas.ui.web.process.ProcessId;
@@ -56,7 +57,7 @@ public ProcessId getProcessId()
 		return processDescriptor.getProcessId();
 	}
 
-	public int getReportADProcessId()
+	public AdProcessId getReportAdProcessId()
 	{
 		return huProcessDescriptor.getProcessId();
 	}