feat: imp v2;

RonasIT · Oct 25, 2024 · e99c3a3 · e99c3a3
1 parent c64db73
commit e99c3a3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 36 deletions.
diff --git a/src/Drivers/BaseDriver.php b/src/Drivers/BaseDriver.php
@@ -41,6 +41,8 @@ public function getTmpData(): ?array
 
     protected function clearTmpDir(): void
     {
-        File::deleteDirectory(config('auto-doc.tmp_dir'));
+        if (file_exists($this->tempFilePath)) {
+            unlink($this->tempFilePath);
+        }
     }
 }
diff --git a/src/Services/SwaggerService.php b/src/Services/SwaggerService.php
@@ -802,9 +802,9 @@ public function saveProductionData()
         $this->driver->saveData();
     }
 
-    public function saveTmpData(array $data): void
+    public function getDocumentation(): array
     {
-        $this->driver->saveTmpData($data);
+        return $this->driver->getDocumentation();
     }
 
     public function getDocFileContent()

diff --git a/src/Support/PHPUnit/EventSubscribers/ApplicationFinishedSubscriber.php b/src/Support/PHPUnit/EventSubscribers/ApplicationFinishedSubscriber.php
@@ -15,7 +15,9 @@ public function notify(Finished $event): void
     {
         $this->createApplication();
 
-        if ($this->isReadyToSaveProductionData()) {
+        if ($token = ParallelTesting::token()) {
+            $this->mergeTempDocumentation($token);
+        } else {
             app(SwaggerService::class)->saveProductionData();
         }
     }
@@ -28,41 +30,24 @@ protected function createApplication(): void
         $app->make(Kernel::class)->bootstrap();
     }
 
-    protected function isReadyToSaveProductionData(): bool
+    protected function mergeTempDocumentation(string $token): void
     {
-        if ($token = ParallelTesting::token()) {
-            unlink(config('auto-doc.tmp_dir') . "/worker_{$token}_in_progress.flag");
+        $swaggerService = app(SwaggerService::class);
 
-            if (empty(glob(config('auto-doc.tmp_dir') . '/worker_*_in_progress.flag'))) {
-                $this->mergeTempDocumentation();
+        $handle = fopen(config('auto-doc.drivers.local.production_path'), 'c+');
 
-                return true;
-            }
-        } else {
-            return true;
+        while (!flock($handle, LOCK_EX | LOCK_NB)) {
+            usleep(10);
         }
 
-        return false;
-    }
+        $tmpDoc = file_get_contents(config('auto-doc.tmp_dir') . "/temp_documentation_{$token}.json");
 
-    protected function mergeTempDocumentation(): void
-    {
-        $swaggerService = app(SwaggerService::class);
-
-        $resultDoc = [];
+        $prodDoc = json_decode(stream_get_contents($handle), true);
 
-        $tmpPaths = glob(config('auto-doc.tmp_dir') . '/temp_documentation_*.json');
+        $swaggerService->mergeOpenAPIDocs($prodDoc, json_decode($tmpDoc, true));
 
-        foreach ($tmpPaths as $tmpDocFilePath) {
-            $tmpDoc = json_decode(file_get_contents($tmpDocFilePath), true);
-
-            if (empty($resultDoc)) {
-                $resultDoc = $tmpDoc;
-            } else {
-                $swaggerService->mergeOpenAPIDocs($resultDoc, $tmpDoc);
-            }
-        }
+        $swaggerService->saveProductionData();
 
-        $swaggerService->saveTmpData($resultDoc);
+        fclose($handle);
     }
 }
diff --git a/src/Support/PHPUnit/EventSubscribers/ApplicationStartedSubscriber.php b/src/Support/PHPUnit/EventSubscribers/ApplicationStartedSubscriber.php
@@ -12,11 +12,11 @@ final class ApplicationStartedSubscriber implements StartedSubscriber
 {
     public function notify(Started $event): void
     {
-        $this->createApplication();
-
-        if ($token = ParallelTesting::token()) {
-            touch(config('auto-doc.tmp_dir') . "/worker_{$token}_in_progress.flag");
-        }
+//        $this->createApplication();
+//
+//        if ($token = ParallelTesting::token()) {
+//            touch(config('auto-doc.tmp_dir') . "/worker_{$token}_in_progress.flag");
+//        }
     }
 
     protected function createApplication(): void