Merge pull request #16 from utopia-php/fix-create-team-membership

Fix a team membership migration bug
utopia-php · Sep 12, 2023 · 3f6e6df · 3f6e6df
2 parents 45bd831 + 60db4c3
commit 3f6e6df
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -27,13 +27,13 @@
         "format": "./vendor/bin/pint"
     },
     "require": {
-        "php": ">=8.0",
-        "utopia-php/cli": "^0.15.0",
-        "appwrite/appwrite": "^8.0"
+        "php": "8.*",
+        "utopia-php/cli": "0.*",
+        "appwrite/appwrite": "10.0.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3",
-        "vlucas/phpdotenv": "^5.5",
-        "laravel/pint": "^1.10"
+        "phpunit/phpunit": "9.*",
+        "vlucas/phpdotenv": "5.*",
+        "laravel/pint": "1.*"
     }
 }
diff --git a/src/Migration/Destinations/Appwrite.php b/src/Migration/Destinations/Appwrite.php
@@ -575,11 +575,7 @@ public function importAuthResource(Resource $resource): Resource
                     $teamService->createMembership(
                         $resource->getTeam()->getId(),
                         $resource->getRoles(),
-                        '',
-                        $user->getEmail(),
-                        $user->getId(),
-                        $user->getPhone(),
-                        $user->getName()
+                        userId: $user->getId(),
                     );
                     break;
             }

diff --git a/src/Migration/Sources/Appwrite.php b/src/Migration/Sources/Appwrite.php
@@ -365,7 +365,12 @@ private function exportMemberships(int $batchSize)
 
         // Export Memberships
         $cacheTeams = $this->cache->get(Team::getName());
-        $cacheUsers = $this->cache->get(User::getName());
+        /** @var array<string, User> - array where key is user ID */
+        $cacheUsers = [];
+        foreach ($this->cache->get(User::getName()) as $cacheUser) {
+            /** @var User $cacheUser */
+            $cacheUsers[$cacheUser->getId()] = $cacheUser;
+        }
 
         foreach ($cacheTeams as $team) {
             /** @var Team $team */
@@ -384,20 +389,12 @@ private function exportMemberships(int $batchSize)
                     break;
                 }
 
-                $user = null;
-                foreach ($cacheUsers as $cacheUser) {
-                    /** @var User $cacheUser */
-                    if ($cacheUser->getId() === $response['memberships'][0]['userId']) {
-                        $user = $cacheUser;
-                        break;
+                foreach ($response['memberships'] as $membership) {
+                    $user = $cacheUsers[$membership['userId']] ?? null;
+                    if ($user === null) {
+                        throw new \Exception('User not found');
                     }
-                }
 
-                if (! $user) {
-                    throw new \Exception('User not found');
-                }
-
-                foreach ($response['memberships'] as $membership) {
                     $memberships[] = new Membership(
                         $team,
                         $user,