MC-37137: Advance Reporting generated csv files are not properly escaped which causes reports to fail on MBI side (continuation)

- Fix escaped quotes with backslash are not properly escaped in the generated csv

Author: bubasuma

app/code/Magento/Analytics/Model/ReportWriter.php

@@ -103,14 +103,14 @@ public function write(WriteInterface $directory, $path)
     /**
      * Replace wrong symbols in row
      *
+     * Strip backslashes before double quotes so they will be properly escaped in the generated csv
+     *
+     * @see fputcsv()
      * @param array $row
      * @return array
      */
     private function prepareRow(array $row): array
     {
-        $row = preg_replace('/(?<!\\\\)"/', '\\"', $row);
-        $row = preg_replace('/[\\\\]+/', '\\', $row);
-
-        return $row;
+        return preg_replace('/\\\+(?=\")/', '', $row);
     }
 }

app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php

@@ -103,7 +103,7 @@ protected function setUp(): void
      * @param array $expectedFileData
      * @return void
      *
-     * @dataProvider configDataProvider
+     * @dataProvider writeDataProvider
      */
     public function testWrite(array $configData, array $fileData, array $expectedFileData): void
     {
@@ -162,7 +162,7 @@ public function testWrite(array $configData, array $fileData, array $expectedFil
      * @param array $configData
      * @return void
      *
-     * @dataProvider configDataProvider
+     * @dataProvider writeErrorFileDataProvider
      */
     public function testWriteErrorFile(array $configData): void
     {
@@ -195,10 +195,75 @@ public function testWriteEmptyReports(): void
     /**
      * @return array
      */
-    public function configDataProvider(): array
+    public function writeDataProvider(): array
+    {
+        $configData = [
+            'providers' => [
+                [
+                    'name' => $this->providerName,
+                    'class' => $this->providerClass,
+                    'parameters' => [
+                        'name' => $this->reportName
+                    ],
+                ]
+            ]
+        ];
+        return [
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'Shoes"" Usual"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \"World\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \\"World\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \\\"World\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function writeErrorFileDataProvider(): array
     {
         return [
-            'reportProvider' => [
+            [
                 'configData' => [
                     'providers' => [
                         [
@@ -210,12 +275,6 @@ public function configDataProvider(): array
                         ]
                     ]
                 ],
-                'fileData' => [
-                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
-                ],
-                'expectedFileData' => [
-                    ['number' => 1, 'type' => 'Shoes\"\" Usual\\"']
-                ]
             ],
         ];
     }