!fixup OXDEV-8733 Prepared UserDataexportController and adopted UserD…

…ataExportService
OXID-eSales · Oct 2, 2024 · cce11b7 · cce11b7
1 parent 42f2909
commit cce11b7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/src/UserData/Service/UserDataExportService.php b/src/UserData/Service/UserDataExportService.php
@@ -21,7 +21,7 @@ public function __construct(
 
     public function exportUserData(string $userId): void
     {
-        $outputZipFilePath  = '../' . $this->userDataZipFilePath . '/' . $userId . '.zip';
+        $outputZipFilePath  = $this->userDataZipFilePath . '/' . $userId . '.zip';
         $serializedFiles = $this->userDataCollectionService->getUserDataAsFilesList(userId: $userId);
         $this->zipCreatorService->createZip(files: $serializedFiles, outputFilePath: $outputZipFilePath);
         $this->userDataFileDownloadService->downloadFile(filePath: $outputZipFilePath);

diff --git a/src/UserData/services.yaml b/src/UserData/services.yaml
@@ -220,7 +220,7 @@ services:
     class: OxidEsales\GdprOptinModule\UserData\Service\UserDataExportService
     public: true
     arguments:
-      $userDataZipFilePath: 'tmp/UserData'
+      $userDataZipFilePath: '@=service("OxidEsales\\EshopCommunity\\Internal\\Transition\\Utility\\BasicContextInterface").getCacheDirectory()'
 
   OxidEsales\GdprOptinModule\UserData\Service\ZipArchiveFactoryInterface:
     class: OxidEsales\GdprOptinModule\UserData\Service\ZipArchiveFactory

diff --git a/tests/Unit/UserData/Service/UserDataExportServiceTest.php b/tests/Unit/UserData/Service/UserDataExportServiceTest.php
@@ -20,18 +20,13 @@
 
 class UserDataExportServiceTest extends TestCase
 {
-    private string $userId;
-    private string $tempDir;
-
-    protected function setUp(): void
-    {
-        $this->userId = uniqid();
-        $this->createTempDirectory();
-    }
-
     public function testZipCreationServiceTriggeredWithCorrectlyProcessedData(): void
     {
-        $expectedOutputFilePath = '../' . $this->tempDir . '/' . $this->userId . '.zip';
+        $userId = uniqid();
+
+        vfsStream::setup('outputDir');
+        $userDataZipFilePath = vfsStream::url('outputDir');
+        $expectedOutputFilePath = $userDataZipFilePath . '/' . $userId . '.zip';
 
         $filesListExample = [
             $this->createStub(ResultFileInterface::class),
@@ -40,7 +35,7 @@ public function testZipCreationServiceTriggeredWithCorrectlyProcessedData(): voi
 
         $userDataCollectionServiceMock = $this->createMock(UserDataCollectionServiceInterface::class);
         $userDataCollectionServiceMock->method('getUserDataAsFilesList')
-            ->with($this->userId)
+            ->with($userId)
             ->willReturn($filesListExample);
 
         $zipCreatorServiceSpy = $this->createMock(ZipCreatorServiceInterface::class);
@@ -58,10 +53,10 @@ public function testZipCreationServiceTriggeredWithCorrectlyProcessedData(): voi
             userDataCollectionService: $userDataCollectionServiceMock,
             zipCreatorService: $zipCreatorServiceSpy,
             userDataFileDownloadService: $fileDownloadServiceSpy,
-            userDataZipFilePath: $this->tempDir
+            userDataZipFilePath: $userDataZipFilePath
         );
 
-        $sut->exportUserData(userId: $this->userId);
+        $sut->exportUserData(userId: $userId);
     }
 
     public function getSut(
@@ -82,19 +77,4 @@ public function getSut(
             userDataZipFilePath: $userDataZipFilePath
         );
     }
-
-    private function createTempDirectory(): void
-    {
-        $this->tempDir = sys_get_temp_dir() . '/testDir';
-
-        mkdir($this->tempDir);
-        chmod($this->tempDir, 0777);
-    }
-
-    protected function tearDown(): void
-    {
-        if (file_exists($this->tempDir)) {
-            rmdir($this->tempDir);
-        }
-    }
 }