ACP2E-1971: Status of mview_state records remains in "waiting" state in Magento cloud

Author: dhorytskyi

lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php

@@ -22,7 +22,10 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/** test Mview functionality
+/**
+ * Test Mview functionality
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ViewTest extends TestCase
 {
@@ -517,6 +520,41 @@ function () {
         $this->model->update();
     }
 
+    /**
+     * Test update with no changes in the changelog
+     */
+    public function testUpdateWithNoChanges()
+    {
+        $currentVersionId = 3;
+        $lastVersionId = 3;
+
+        $this->stateMock->method('getViewId')
+            ->willReturn(1);
+        $this->stateMock->method('getMode')
+            ->willReturn(StateInterface::MODE_ENABLED);
+        $this->stateMock->method('getStatus')
+            ->willReturn(StateInterface::STATUS_IDLE);
+        $this->stateMock->expects(self::once())
+            ->method('getVersionId')
+            ->willReturn($lastVersionId);
+        $this->changelogMock->expects(self::once())
+            ->method('getVersion')
+            ->willReturn($currentVersionId);
+
+        $this->stateMock->expects(self::never())
+            ->method('setVersionId');
+        $this->stateMock->expects(self::never())
+            ->method('setStatus');
+        $this->stateMock->expects(self::never())
+            ->method('save');
+        $this->actionFactoryMock->expects(self::never())
+            ->method('get');
+        $this->iteratorMock->expects(self::never())
+            ->method('walk');
+
+        $this->model->update();
+    }
+
     /**
      * Test to Suspend view updates and set version ID to changelog's end
      */

lib/internal/Magento/Framework/Mview/View.php

@@ -258,8 +258,11 @@ public function update()
         }
 
         $lastVersionId = (int)$this->getState()->getVersionId();
-        $action = $this->actionFactory->get($this->getActionClass());
+        if ($lastVersionId >= $currentVersionId) {
+            return;
+        }
 
+        $action = $this->actionFactory->get($this->getActionClass());
         try {
             $this->getState()->setStatus(View\StateInterface::STATUS_WORKING)->save();