Merge pull request #541 from Smartling/WP-907-batches-error

fix batch creation error (WP-907)

Author: vsolovei-smartling

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "smartling/wordpress-connector",
   "license": "GPL-2.0-or-later",
-  "version": "3.9.8",
+  "version": "3.9.9",
   "description": "",
   "type": "wordpress-plugin",
   "repositories": [

inc/Smartling/Services/ContentRelationsDiscoveryService.php

@@ -302,7 +302,7 @@ public function createSubmissions(UserTranslationRequest $request): void
         $this->uploadQueueManager->enqueue($queueIds, $this->apiWrapper->createBatch(
             $profile,
             $jobInfo->getJobUid(),
-            array_unique($fileUris),
+            array_values(array_unique($fileUris)),
             $job->isAuthorize(),
         ));
     }

readme.txt

@@ -4,7 +4,7 @@ Tags: translation, localization, localisation, translate, multilingual, smartlin
 Requires at least: 5.5
 Tested up to: 6.4.1
 Requires PHP: 8.0
-Stable tag: 3.9.8
+Stable tag: 3.9.9
 License: GPLv2 or later
 
 Translate content in WordPress quickly and seamlessly with Smartling, the industry-leading Translation Management System.
@@ -62,6 +62,9 @@ Additional information on the Smartling Connector for WordPress can be found [he
 3. Track translation status within WordPress from the Submissions Board. View overall progress of submitted translation requests as well as resend updated content.
 
 == Changelog ==
+= 3.9.9 =
+* Fixed submissions not being uploaded when related assets list has multiple entries that point to the same content
+
 = 3.9.8 =
 * Fixed extra slashes being added in Gutenberg block attributes that had quotes after translation
 

smartling-connector.php

@@ -11,7 +11,7 @@
  * Plugin Name:       Smartling Connector
  * Plugin URI:        https://www.smartling.com/products/automate/integrations/wordpress/
  * Description:       Integrate your WordPress site with Smartling to upload your content and download translations.
- * Version:           3.9.8
+ * Version:           3.9.9
  * Author:            Smartling
  * Author URI:        https://www.smartling.com
  * License:           GPL-2.0+

tests/Services/ContentRelationDiscoveryServiceTest.php

@@ -151,6 +151,70 @@ public function testCreateSubmissionsHandler()
             ]));
         }
 
+        public function testCreateSubmissionsRelations()
+        {
+            $sourceBlogId = 1;
+            $sourceId = 48;
+            $contentType = 'post';
+            $targetBlogId = 2;
+            $jobName = 'Job Name';
+            $jobUid = 'abcdef123456';
+
+            $apiWrapper = $this->createMock(ApiWrapper::class);
+            $apiWrapper->expects($this->once())->method('createBatch')->willReturnCallback(
+                function (ConfigurationProfileEntity $profile, string $jobUid, array $fileUris): string {
+                    $arrayPointer = 0; // TODO replace with array_is_list() once php 8.1 is used
+                    foreach ($fileUris as $key => $value) {
+                        if ($key !== $arrayPointer++) {
+                            throw new \RuntimeException('FileUris expected to be list');
+                        }
+                    }
+
+                    return '';
+            });
+
+            $submission1 = $this->createMock(SubmissionEntity::class);
+            $submission1->method('getId')->willReturn(17);
+            $submission1->method('getFileUri')->willReturn('17');
+
+            $submission2 = $this->createMock(SubmissionEntity::class);
+            $submission2->method('getId')->willReturn(23);
+            $submission2->method('getFileUri')->willReturn('23');
+
+            $submissionFactory = $this->createMock(SubmissionFactory::class);
+            $submissionFactory->method('fromArray')->willReturn($submission1, $submission2);
+
+            $submissionManager = $this->getMockBuilder(SubmissionManager::class)->disableOriginalConstructor()
+                ->getMock();
+            $submissionManager->method('findOne')->willReturn($submission1, $submission1, $submission2);
+            $submissionManager->method('storeEntity')->willReturnArgument(0);
+
+            $wpProxy = $this->createMock(WordpressFunctionProxyHelper::class);
+            $wpProxy->method('get_current_blog_id')->willReturn($sourceBlogId);
+
+            $this->getContentRelationDiscoveryService(
+                $apiWrapper,
+                submissionManager: $submissionManager,
+                submissionFactory: $submissionFactory,
+                wpProxy: $wpProxy
+            )->createSubmissions(UserTranslationRequest::fromArray([
+                'source' => ['contentType' => $contentType, 'id' => [$sourceId]],
+                'job' =>
+                    [
+                        'id' => $jobUid,
+                        'name' => $jobName,
+                        'description' => '',
+                        'dueDate' => '',
+                        'timeZone' => 'Europe/Kiev',
+                        'authorize' => 'true',
+                    ],
+                'targetBlogIds' => $targetBlogId,
+                'relations' => [
+                    1 => [$targetBlogId => ['post' => [17]]],
+                    2 => [$targetBlogId => ['attachment' => [23]]],
+                ],
+            ]));
+        }
         public function testBulkSubmitHandler()
         {
             $sourceBlogId = 1;