Check for already merged file from reverting back by callback

AcclaroInc · Jan 20, 2024 · 87b0a6c · 87b0a6c
1 parent f211a86
commit 87b0a6c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
@@ -116,8 +116,11 @@ public function actionOrderCallback()
             echo 'Starting file sync' . PHP_EOL;
 
             foreach($order->getFiles() as $file) {
-                $translationService->updateFile($order, $file);
-                Translations::$plugin->fileRepository->saveFile($file);
+                // Only process the file is not already done
+                if ($file->isNew() || $file->isInProgress()) {
+                    $translationService->updateFile($order, $file);
+                    Translations::$plugin->fileRepository->saveFile($file);
+                }
             }
 
             echo 'File sync successful' . PHP_EOL;
@@ -178,16 +181,20 @@ public function actionFileCallback()
             echo 'Translation service found'.PHP_EOL;
         }
 
-        $translationService->updateFile($order, $file);
-
         echo 'Updating file'.PHP_EOL;
+        // Skip if file already has target content
+        if ($file->isNew() || $file->isInProgress()) {
+            $translationService->updateFile($order, $file);
 
-        $success = Translations::$plugin->fileRepository->saveFile($file);
+            $success = Translations::$plugin->fileRepository->saveFile($file);
 
-        if (!$success) {
-            Craft::$app->end('Couldn’t save the file');
+            if (!$success) {
+                Craft::$app->end('Couldn’t save the file');
+            } else {
+                echo 'File saved'.PHP_EOL;
+            }
         } else {
-            echo 'Saving file'.PHP_EOL;
+            echo 'File skipped'.PHP_EOL;
         }
 
         Craft::$app->end('OK');

diff --git a/src/models/GlobalSetDraftModel.php b/src/models/GlobalSetDraftModel.php
@@ -61,7 +61,7 @@ public function rules(): array
         return $rules;
     }
 
-    public function getFieldLayout(): ?\craft\models\FieldLayout
+    public function getFieldLayout(): \craft\models\FieldLayout
     {
         $globalSet = $this->getGlobalSet();