From 41e41e7b51926873d06caacfb29b6930bbf59d87 Mon Sep 17 00:00:00 2001
From: rymsha <rymsha@yandex.ru>
Date: Wed, 31 Aug 2022 09:56:55 +0200
Subject: [PATCH] Update media always makes content IN_PROGRESS #9663

(cherry picked from commit ed35a8d798edd12546daa8db350e641775cfc04e)
---
 .../xp/core/impl/content/UpdateMediaCommand.java       |  8 --------
 .../xp/core/content/ContentServiceImplTest_media.java  |  2 --
 .../xp/core/content/ParentContentSynchronizerTest.java | 10 +---------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/UpdateMediaCommand.java b/modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/UpdateMediaCommand.java
index efee49d66d7..41a846b114d 100644
--- a/modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/UpdateMediaCommand.java
+++ b/modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/UpdateMediaCommand.java
@@ -7,8 +7,6 @@
 import com.enonic.xp.content.Content;
 import com.enonic.xp.content.UpdateContentParams;
 import com.enonic.xp.content.UpdateMediaParams;
-import com.enonic.xp.content.WorkflowInfo;
-import com.enonic.xp.content.WorkflowState;
 import com.enonic.xp.core.impl.content.serializer.ContentDataSerializer;
 import com.enonic.xp.media.MediaInfo;
 import com.enonic.xp.media.MediaInfoService;
@@ -104,12 +102,6 @@ private Content doExecute()
             .createAttachments( CreateAttachments.from( mediaAttachment ) )
             .editor( editable -> {
                 mediaFormBuilder.build( editable.data );
-
-                if ( WorkflowState.READY == editable.workflowInfo.getState() )
-                {
-                    editable.workflowInfo =
-                        WorkflowInfo.create().checks( editable.workflowInfo.getChecks() ).state( WorkflowState.IN_PROGRESS ).build();
-                }
             } );
 
         return UpdateContentCommand.create( this )
diff --git a/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_media.java b/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_media.java
index 47cff514f7d..ba5af4f140d 100644
--- a/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_media.java
+++ b/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_media.java
@@ -136,8 +136,6 @@ public void update_media_image()
 
         final Content updatedContent = this.contentService.getById( storedContent.getId() );
 
-        assertEquals( WorkflowState.IN_PROGRESS, updatedContent.getWorkflowInfo().getState() );
-
         final Attachments attachments = updatedContent.getAttachments();
 
         assertNotNull( attachments );
diff --git a/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ParentContentSynchronizerTest.java b/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ParentContentSynchronizerTest.java
index 8c2fb2e28bd..4075c511688 100644
--- a/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ParentContentSynchronizerTest.java
+++ b/modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ParentContentSynchronizerTest.java
@@ -30,7 +30,6 @@
 import com.enonic.xp.content.SetContentChildOrderParams;
 import com.enonic.xp.content.UpdateContentParams;
 import com.enonic.xp.content.UpdateMediaParams;
-import com.enonic.xp.content.WorkflowInfo;
 import com.enonic.xp.core.impl.content.ContentEventsSyncParams;
 import com.enonic.xp.core.impl.content.ContentSyncEventType;
 import com.enonic.xp.core.impl.content.ContentSyncParams;
@@ -343,14 +342,7 @@ public void updateMediaChanged()
             }
         } );
 
-        Content targetContentUpdated = syncUpdated( sourceContent.getId() );
-
-        assertEquals( targetContent, targetContentUpdated );
-
-        sourceContext.runWith( () -> contentService.update(
-            new UpdateContentParams().contentId( sourceContent.getId() ).editor( edit -> edit.workflowInfo = WorkflowInfo.ready() ) ) );
-
-        targetContentUpdated = syncUpdated( sourceContent.getId() );
+        final Content targetContentUpdated = syncUpdated( sourceContent.getId() );
 
         assertNotEquals( targetContent.getAttachments().first().getBinaryReference(),
                          targetContentUpdated.getAttachments().first().getBinaryReference() );