Merge pull request #497 from liimaorg/rescopy_autoflush

Persist resource copy result before permission check
liimaorg · Jul 11, 2019 · e8e4325 · e8e4325
2 parents 893712c + 4ed4e99
commit e8e4325
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java b/...java/ch/puzzle/itc/mobiliar/business/resourcegroup/control/CopyResourceDomainService.java
@@ -208,10 +208,11 @@ protected CopyResourceResult doCopyResourceAndSave(CopyUnit copyUnit) throws For
 
         // do save
         if (copyUnit.getResult().isSuccess()) {
-            // check if only decorable fields on resource changed when changing owner is different from resource owner
-            foreignableService.verifyEditableByOwner(copyUnit.getActingOwner(), targetHashCodeBeforeChange, copyUnit.getTargetResource());
             auditService.storeIdInThreadLocalForAuditLog(copyUnit.getTargetResource());
+            // persist before permission check to avoid TransientPropertyValueException when JPA tries to auto flush
             entityManager.persist(copyUnit.getTargetResource());
+            // check if only decorable fields on resource changed when changing owner is different from resource owner
+            foreignableService.verifyEditableByOwner(copyUnit.getActingOwner(), targetHashCodeBeforeChange, copyUnit.getTargetResource());
         }
         copyUnit.getResult().setTargetResource(copyUnit.getTargetResource());
         return copyUnit.getResult();