Fix same user being set in every team membership resource

utopia-php · Sep 8, 2023 · 77049ab · 77049ab
1 parent 110b9bf
commit 77049ab
Showing 1 changed file with 10 additions and 13 deletions.
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) {
+                        throw new \Exception('User not found');
                     }
-                }
 
-                if (! $user) {
-                    throw new \Exception('User not found');
-                }
-
-                foreach ($response['memberships'] as $membership) {
                     $memberships[] = new Membership(
                         $team,
                         $user,