NXP-32092: Do not try to make flexible record on enforced record

nuxeo · Oct 3, 2023 · 41ac86a · 41ac86a
1 parent 680d872
commit 41ac86a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/nuxeo-retention/src/main/java/org/nuxeo/retention/operations/RetainDocument.java b/nuxeo-retention/src/main/java/org/nuxeo/retention/operations/RetainDocument.java
@@ -44,23 +44,25 @@ public class RetainDocument {
     @Param(name = "until", required = false, description = "If empty, the input document will be retained indeterminately")
     protected Calendar until;
 
-    @Param(name = "flexible", required = false, description = "If true the document will be turned into a flexible record, enforced otherwise")
+    @Param(name = "flexible", required = false, description = "If true and if the document is not already a record, it will be turned into a flexible record, enforced otherwise")
     protected boolean flexible;
 
     @OperationMethod(collector = DocumentModelCollector.class)
-    public DocumentModel run(DocumentRef doc) {
-        if (flexible) {
-            session.makeFlexibleRecord(doc);
-        } else {
-            session.makeRecord(doc);
-        }
-        session.setRetainUntil(doc, until != null ? until : CoreSession.RETAIN_UNTIL_INDETERMINATE, null);
-        return session.getDocument(doc);
+    public DocumentModel run(DocumentRef docRef) {
+        return run(session.getDocument(docRef));
     }
 
     @OperationMethod(collector = DocumentModelCollector.class)
     public DocumentModel run(DocumentModel doc) {
-        return run(doc.getRef());
+        if (!doc.isRecord()) {
+            if (flexible) {
+                session.makeFlexibleRecord(doc.getRef());
+            } else {
+                session.makeRecord(doc.getRef());
+            }
+        }
+        session.setRetainUntil(doc.getRef(), until != null ? until : CoreSession.RETAIN_UNTIL_INDETERMINATE, null);
+        return session.getDocument(doc.getRef());
     }
 
 }
diff --git a/nuxeo-retention/src/test/java/org/nuxeo/retention/test/TestRetentionOperation.java b/nuxeo-retention/src/test/java/org/nuxeo/retention/test/TestRetentionOperation.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.time.Duration;
+import java.util.Calendar;
 
 import javax.inject.Inject;
 
@@ -123,14 +124,27 @@ public void testRetainFlexible() throws OperationException {
         DocumentModel file = session.createDocumentModel("/", "File", "File");
         file = session.createDocument(file);
         file = session.saveDocument(file);
+        Calendar retainUnitl = Calendar.getInstance();
         try (OperationContext ctx = new OperationContext(session)) {
             ctx.setInput(file);
             OperationChain chain = new OperationChain("testChain");
-            chain.add(RetainDocument.ID).set("flexible", true);
+            retainUnitl.add(Calendar.HOUR, 1);
+            chain.add(RetainDocument.ID).set("flexible", true).set("until", retainUnitl);
+            file = (DocumentModel) service.run(ctx, chain);
+            assertTrue(file.isRecord());
+            assertTrue(file.isFlexibleRecord());
+            assertTrue(file.isUnderRetentionOrLegalHold());
+        }
+        try (OperationContext ctx = new OperationContext(session)) {
+            ctx.setInput(file);
+            OperationChain chain = new OperationChain("testChain");
+            retainUnitl.add(Calendar.HOUR, 1);
+            chain.add(RetainDocument.ID).set("until", retainUnitl);
             file = (DocumentModel) service.run(ctx, chain);
             assertTrue(file.isRecord());
             assertTrue(file.isFlexibleRecord());
             assertTrue(file.isUnderRetentionOrLegalHold());
         }
     }
+
 }