Merge pull request #12 from utopia-php/improve-firebase-stability

Fix pending counters
utopia-php · Aug 17, 2023 · af4233f · af4233f
2 parents 8a1d4de + b231a7c
commit af4233f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Migration/Transfer.php b/src/Migration/Transfer.php
@@ -88,13 +88,6 @@ public function getStatusCounters()
             ];
         }
 
-        foreach ($this->cache->getAll() as $resources) {
-            foreach ($resources as $resource) {
-                /** @var resource $resource */
-                $status[$resource->getName()][$resource->getStatus()]++;
-            }
-        }
-
         if ($this->source->previousReport) {
             foreach ($this->source->previousReport as $resource => $data) {
                 if ($resource != 'size' && $resource != 'version' && isset($status[$resource])) {
@@ -103,6 +96,16 @@ public function getStatusCounters()
             }
         }
 
+        foreach ($this->cache->getAll() as $resources) {
+            foreach ($resources as $resource) {
+                /** @var resource $resource */
+                $status[$resource->getName()][$resource->getStatus()]++;
+                if ($status[$resource->getName()]['pending'] > 0) {
+                    $status[$resource->getName()]['pending']--;
+                }
+            }
+        }
+
         // Remove all empty resources
         foreach ($status as $resource => $data) {
             $allEmpty = true;