Merge pull request #73 from ArnabChatterjee20k/fix-migration-documents-status

Fix migration documents status

Author: abnegate

composer.lock

@@ -13,7 +13,7 @@
 class Cache
 {
     /**
-     * @var array<string, array<string, Resource>> $cache
+     * @var array<string, array<string, Resource|string>> $cache
      */
     protected array $cache = [];
 
@@ -39,15 +39,18 @@ public function add(Resource $resource): void
             $resource->setInternalId(uniqid());
         }
 
+        if ($resource->getName() == Resource::TYPE_DOCUMENT) {
+            $status = $resource->getStatus();
+            $documentId = $resource->getInternalId();
+            $this->cache[$resource->getName()][$documentId] = $status;
+            return;
+        }
+
         if ($resource->getName() == Resource::TYPE_FILE || $resource->getName() == Resource::TYPE_DEPLOYMENT) {
             /** @var File|Deployment $resource */
             $resource->setData(''); // Prevent Memory Leak
         }
 
-        if ($resource->getName() == Resource::TYPE_DOCUMENT) {
-            return;
-        }
-
         $this->cache[$resource->getName()][$resource->getInternalId()] = $resource;
     }
 
@@ -75,14 +78,22 @@ public function addAll(array $resources): void
      */
     public function update(Resource $resource): void
     {
-        if (! in_array($resource->getName(), $this->cache)) {
-            $this->add($resource);
-        }
-
+        // if documents then updating the status counter only
         if ($resource->getName() == Resource::TYPE_DOCUMENT) {
+            $documentId = $resource->getInternalId();
+            if (!isset($this->cache[$resource->getName()][$documentId])) {
+                $this->add($resource);
+            } else {
+                $status = $resource->getStatus();
+                $this->cache[$resource->getName()][$documentId] = $status;
+            }
             return;
         }
 
+        if (! in_array($resource->getName(), $this->cache)) {
+            $this->add($resource);
+        }
+
         $this->cache[$resource->getName()][$resource->getInternalId()] = $resource;
     }
 
@@ -108,6 +119,11 @@ public function updateAll(array $resources): void
      */
     public function remove(Resource $resource): void
     {
+        if ($resource->getName() === Resource::TYPE_DOCUMENT) {
+            if (! isset($this->cache[$resource->getName()][$resource->getInternalId()])) {
+                throw new \Exception('Resource does not exist in cache');
+            }
+        }
         if (! in_array($resource, $this->cache[$resource->getName()])) {
             throw new \Exception('Resource does not exist in cache');
         }
@@ -133,7 +149,7 @@ public function get(string|Resource $resource): array
     /**
      * Get All Resources
      *
-     * @return array<string, array<string, Resource>>
+     * @return array<string, array<string, Resource|string>>
      */
     public function getAll(): array
     {

src/Migration/Cache.php

@@ -130,10 +130,22 @@ public function getStatusCounters(): array
             }
         }
 
-        foreach ($this->cache->getAll() as $resources) {
+        foreach ($this->cache->getAll() as $resourceType => $resources) {
             foreach ($resources as $resource) {
+                if ($resourceType === Resource::TYPE_DOCUMENT && is_string($resource)) {
+                    $documentStatus = $resource;
+                    $status[$resourceType][$documentStatus]++;
+
+                    if ($status[$resourceType]['pending'] > 0) {
+                        $status[$resourceType]['pending']--;
+                    }
+
+                    continue;
+                }
+
                 if (isset($status[$resource->getName()])) {
                     $status[$resource->getName()][$resource->getStatus()]++;
+
                     if ($status[$resource->getName()]['pending'] > 0) {
                         $status[$resource->getName()]['pending']--;
                     }
@@ -260,11 +272,28 @@ public function getCurrentResource(): string
     public function getReport(string $statusLevel = ''): array
     {
         $report = [];
-
         $cache = $this->cache->getAll();
 
         foreach ($cache as $type => $resources) {
-            foreach ($resources as $resource) {
+            foreach ($resources as $id => $resource) {
+                if ($type === Resource::TYPE_DOCUMENT && is_string($resource)) {
+                    if ($statusLevel && $resource !== $statusLevel) {
+                        continue;
+                    }
+                    // no message for document is stored
+                    $report[] = [
+                        'resource' => $type,
+                        'id' => $id,
+                        'status' => $resource,
+                        'message' => '',
+                    ];
+                    continue;
+                }
+
+                if (!is_object($resource)) {
+                    continue;
+                }
+
                 if ($statusLevel && $resource->getStatus() !== $statusLevel) {
                     continue;
                 }