From 0350a0bfa814f7eec4d1267704768d4761af0eed Mon Sep 17 00:00:00 2001
From: lhameury <43-lhameury@users.noreply.gitlab.libriciel.fr>
Date: Tue, 29 Oct 2024 16:04:31 +0100
Subject: [PATCH] Fix "restartCircuit" missing count on folders, leading to
 negatives counters

---
 .../com/atolcd/parapheur/repo/impl/CorbeillesServiceImpl.java | 2 +-
 .../com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/CorbeillesServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/CorbeillesServiceImpl.java
index 1cfe273..32748a1 100644
--- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/CorbeillesServiceImpl.java
+++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/CorbeillesServiceImpl.java
@@ -106,7 +106,7 @@ public class CorbeillesServiceImpl extends AbstractLifecycleBean implements Corb
             policyComponent.bindClassBehaviour(
                     NodeServicePolicies.OnCreateNodePolicy.QNAME,
                     ParapheurModel.TYPE_DOSSIER,
-                    new JavaBehaviour(this, "onDossierCreated"));
+                    new JavaBehaviour(this, "onDossierCreated", NotificationFrequency.TRANSACTION_COMMIT));
 
             policyComponent.bindClassBehaviour(
                     NodeServicePolicies.OnDeleteNodePolicy.QNAME,
diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
index 2e81719..fec66c6 100755
--- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
+++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
@@ -1752,6 +1752,10 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin
         nodeService.setProperty(dossier, ParapheurModel.PROP_WORKFLOW, workflow);
         nodeService.setProperty(dossier, ParapheurModel.PROP_TERMINE, false);
 
+        corbeillesService.moveDossier(dossier,
+                nodeService.getPrimaryParent(dossier).getParentRef(),
+                getCorbeille(getParentParapheur(dossier), ParapheurModel.NAME_A_TRAITER));
+
         nodeService.moveNode(dossier,
                 getCorbeille(getParentParapheur(dossier), ParapheurModel.NAME_A_TRAITER),
                 ContentModel.ASSOC_CONTAINS,
-- 
GitLab