From 107e0c29a172fc6df563177c70ee606e4e38666f Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 7 Dec 2022 15:31:42 +0000
Subject: [PATCH] final changes

---
 app/controllers/api/account.php | 4 ----
 app/controllers/api/teams.php   | 9 ---------
 app/init.php                    | 1 +
 app/workers/databases.php       | 3 ---
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index f83ebe73f9..0909e14344 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -699,8 +699,6 @@ App::post('/v1/account/sessions/magic-url')
                 Permission::delete(Role::user($user->getId())),
             ]));
 
-        $dbForProject->deleteCachedDocument('users', $user->getId());
-
         if (empty($url)) {
             $url = $request->getProtocol() . '://' . $request->getHostname() . '/auth/magic-url';
         }
@@ -950,8 +948,6 @@ App::post('/v1/account/sessions/phone')
                 Permission::delete(Role::user($user->getId())),
             ]));
 
-        $dbForProject->deleteCachedDocument('users', $user->getId());
-
         $messaging
             ->setRecipient($phone)
             ->setMessage($secret)
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 567560c6a8..99e6b8782f 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -108,7 +108,6 @@ App::post('/v1/teams')
             ]);
 
             $membership = $dbForProject->createDocument('memberships', $membership);
-            $dbForProject->deleteCachedDocument('users', $user->getId());
         }
 
         $events->setParam('teamId', $team->getId());
@@ -420,7 +419,6 @@ App::post('/v1/teams/:teamId/memberships')
             $team->setAttribute('total', $team->getAttribute('total', 0) + 1);
             $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
 
-            $dbForProject->deleteCachedDocument('users', $invitee->getId());
         } else {
             try {
                 $membership = $dbForProject->createDocument('memberships', $membership);
@@ -639,7 +637,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
         /**
          * Replace membership on profile
          */
-        $dbForProject->deleteCachedDocument('users', $profile->getId());
 
         $events
             ->setParam('teamId', $team->getId())
@@ -754,14 +751,10 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
                 Permission::delete(Role::user($user->getId())),
             ]));
 
-        $dbForProject->deleteCachedDocument('users', $user->getId());
-
         Authorization::setRole(Role::user($userId)->toString());
 
         $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
 
-        $dbForProject->deleteCachedDocument('users', $user->getId());
-
         $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('total', $team->getAttribute('total', 0) + 1)));
 
         $events
@@ -839,8 +832,6 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove membership from DB');
         }
 
-        $dbForProject->deleteCachedDocument('users', $user->getId());
-
         if ($membership->getAttribute('confirm')) { // Count only confirmed members
             $team->setAttribute('total', \max($team->getAttribute('total', 0) - 1, 0));
             Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
diff --git a/app/init.php b/app/init.php
index 45bf5c6806..2feb9693e3 100644
--- a/app/init.php
+++ b/app/init.php
@@ -397,6 +397,7 @@ Database::addFilter(
         return null;
     },
     function (mixed $value, Document $document, Database $database) {
+        $database->deleteCachedDocument('users', $document->getId());
         return Authorization::skip(fn() => $database
             ->find('memberships', [
                 Query::equal('userInternalId', [$document->getInternalId()]),
diff --git a/app/workers/databases.php b/app/workers/databases.php
index 71e78b3777..5840d3b942 100644
--- a/app/workers/databases.php
+++ b/app/workers/databases.php
@@ -233,8 +233,6 @@ class DatabaseV1 extends Worker
             }
         }
 
-        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
-        $dbForProject->deleteCachedCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
     }
 
     /**
@@ -291,7 +289,6 @@ class DatabaseV1 extends Worker
             );
         }
 
-        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
     }
 
     /**