Merge pull request #14 from utopia-php/fix-attribute-document-import

Fix attribute + document import
utopia-php · Aug 31, 2023 · 49a28ad · 49a28ad
2 parents af4233f + 8941752
commit 49a28ad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Migration/Destinations/Appwrite.php b/src/Migration/Destinations/Appwrite.php
@@ -2,6 +2,7 @@
 
 namespace Utopia\Migration\Destinations;
 
+use Appwrite\AppwriteException;
 use Appwrite\Client;
 use Appwrite\InputFile;
 use Appwrite\Services\Databases;
@@ -274,7 +275,15 @@ public function importDatabaseResource(Resource $resource): Resource
                     break;
                 case Resource::TYPE_ATTRIBUTE:
                     /** @var Attribute $resource */
-                    $this->createAttribute($resource);
+                    try {
+                        $this->createAttribute($resource);
+                    } catch (AppwriteException $e) {
+                        if ($e->getType() === 'attribute_already_exists') {
+                            $resource->setStatus(Resource::STATUS_SKIPPED, 'Attribute has been already created');
+                        } else {
+                            throw $e;
+                        }
+                    }
                     break;
                 case Resource::TYPE_DOCUMENT:
                     /** @var Document $resource */

diff --git a/src/Migration/Sources/Firebase.php b/src/Migration/Sources/Firebase.php
@@ -393,7 +393,7 @@ private function exportCollection(Collection $collection, int $batchSize, bool $
 
         $nextPageToken = null;
 
-        $knownSchema = [];
+        $documentSchema = [];
 
         // Transfer Documents and Calculate Schemas
         while (true) {
@@ -410,8 +410,6 @@ private function exportCollection(Collection $collection, int $batchSize, bool $
                 break;
             }
 
-            // Calculate Schema and handle subcollections
-            $documentSchema = [];
             foreach ($result['documents'] as $document) {
                 if (! isset($document['fields'])) {
                     continue; //TODO: Transfer Empty Documents
@@ -480,6 +478,9 @@ private function convertDocument(Collection $collection, array $document): Docum
 
         $documentId = explode('/', $document['name']);
         $documentId = end($documentId);
+        // Strip non-alphanumeric except underscore and hyphen
+        $documentId = preg_replace("/[^A-Za-z0-9\_\-]/", '', $documentId);
+        $documentId = strtolower($documentId);
 
         return new Document($documentId, $collection->getDatabase(), $collection, $data, []);
     }