Merge remote-tracking branch 'origin/MC-38829' into 2.4-develop-pr46

Author: serhii-balko

app/code/Magento/Paypal/Model/Report/Settlement.php

@@ -595,6 +595,7 @@ public function getSftpCredentials($automaticMode = false)
     protected function _fileNameToDate($filename)
     {
         // Currently filenames look like STL-YYYYMMDD, so that is what we care about.
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $dateSnippet = substr(basename($filename), 4, 8);
         $result = substr($dateSnippet, 0, 4) . '-' . substr($dateSnippet, 4, 2) . '-' . substr($dateSnippet, 6, 2);
         return $result;
@@ -603,13 +604,16 @@ protected function _fileNameToDate($filename)
     /**
      * Filter SFTP file list by filename format
      *
+     * Single Account format = STL-yyyymmdd.sequenceNumber.version.format
+     * Multiple Account format = STL-yyyymmdd.reportingWindow.sequenceNumber.totalFiles.version.format
+     *
      * @param array $list List of files as per $connection->rawls()
      * @return array Trimmed down list of files
      */
     protected function _filterReportsList($list)
     {
         $result = [];
-        $pattern = '/^STL-(\d{8,8})\.(\d{2,2})\.(.{3,3})\.CSV$/';
+        $pattern = '/^STL-(\d{8,8})\.((\d{2,2})|(([A-Z])\.(\d{2,2})\.(\d{2,2})))\.(.{3,3})\.CSV$/';
         foreach ($list as $filename => $data) {
             if (preg_match($pattern, $filename)) {
                 $result[$filename] = $data;

app/code/Magento/Paypal/Test/Unit/Model/Report/SettlementTest.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Test\Unit\Model\Report;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Model\Report\Settlement;
+use Magento\Framework\Filesystem\Io\Sftp;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for paypal settlement
+ */
+class SettlementTest extends TestCase
+{
+    /**
+     * @var Settlement
+     */
+    private $settlement;
+
+    /**
+     * @var WriteInterface|MockObject
+     */
+    private $tmpDirectory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->tmpDirectory = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->settlement = $objectManagerHelper->getObject(
+            Settlement::class,
+            [
+                '_tmpDirectory' => $this->tmpDirectory
+            ]
+        );
+    }
+
+    /**
+     * Test for filter report list
+     *
+     * @return void
+     */
+    public function testFilterReportList(): void
+    {
+        $this->tmpDirectory->method('getAbsolutePath')
+            ->willReturn('');
+        /** @var Sftp|MockObject $connection */
+        $connection = $this->getMockBuilder(Sftp::class)
+            ->onlyMethods(['rawls', 'read'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->method('rawls')
+            ->willReturn(
+                [
+                    'STL-20201221.01.009.CSV' => 'Single account',
+                    'STL-20201221.H.01.01.009.CSV' => 'Multiple account',
+                ]
+            );
+        $connection->expects($this->exactly(2))->method('read')->willReturn(false);
+        $this->settlement->fetchAndSave($connection);
+    }
+}