refactor(guard): do not remove org and projects deletion after user deletion (#205)

Author: forestileao

guard/lib/guard/store/user.ex

@@ -254,27 +254,17 @@ defmodule Guard.Store.User do
           end
         end)
         |> Ecto.Multi.run(:delete_related_data, fn repo, _changes ->
-          from(o in Repo.Organization, where: o.creator_id == ^user_id)
-          |> repo.all()
-          |> Enum.each(fn org ->
-            :ok = Guard.Api.Project.destroy_all_projects_by_org_id(org.id)
-
-            repo.delete_all(from(m in Repo.Member, where: m.organization_id == ^org.id))
-
-            repo.delete_all(
-              from(s in Repo.OrganizationSuspension, where: s.organization_id == ^org.id)
+          members_query =
+            from(m in Guard.FrontRepo.Member,
+              join: rha in Guard.FrontRepo.RepoHostAccount,
+              on: m.github_uid == rha.github_uid,
+              where: rha.user_id == ^user_id
             )
 
-            repo.delete_all(
-              from(c in Repo.OrganizationContact, where: c.organization_id == ^org.id)
-            )
-          end)
-
+          repo.delete_all(members_query)
+          repo.delete_all(from(r in Repo.RepoHostAccount, where: r.user_id == ^user_id))
           {:ok, :deleted_related_data}
         end)
-        |> Ecto.Multi.delete_all(:delete_organizations, fn _changes ->
-          from(o in Repo.Organization, where: o.creator_id == ^user_id)
-        end)
         |> Ecto.Multi.delete(:delete_user, fn %{get_user: user} -> user end)
         |> Repo.transaction()
 

guard/test/guard/grpc_servers/user_server_test.exs

@@ -548,9 +548,8 @@ defmodule Guard.GrpcServers.UserServerTest do
   end
 
   describe "delete_with_owned_orgs" do
-    test "delete_with_owned_orgs should delete the user and their organizations", %{
-      grpc_channel: channel,
-      another_user: another_user
+    test "delete_with_owned_orgs should delete the user", %{
+      grpc_channel: channel
     } do
       alias Guard.FrontRepo
 
@@ -576,55 +575,37 @@ defmodule Guard.GrpcServers.UserServerTest do
           name: user.name
         )
 
-      orgs =
-        1..2
-        |> Enum.map(fn i ->
-          Support.Factories.Organization.insert!(creator_id: user.id, username: "test-org-#{i}")
-        end)
-
-      another_orgs =
-        1..2
-        |> Enum.map(fn i ->
-          Support.Factories.Organization.insert!(
-            creator_id: another_user.id,
-            username: "another-test-org-#{i}"
-          )
-        end)
+      {:ok, repo_host_account} =
+        Support.Members.insert_repo_host_account(
+          login: "test",
+          name: "test",
+          github_uid: "123123",
+          user_id: user.id,
+          token: "token",
+          revoked: false,
+          permission_scope: "repo"
+        )
+
+      {:ok, member} = Support.Members.insert_member(github_uid: "123123")
 
       request = User.DeleteWithOwnedOrgsRequest.new(user_id: user.id)
 
-      with_mocks [
-        {Guard.Api.Project, [], destroy_all_projects_by_org_id: fn _ -> :ok end}
-      ] do
-        {:ok, response} =
-          channel
-          |> Stub.delete_with_owned_orgs(request)
-
-        id = user.id
-        assert %User.User{id: ^id} = response
-
-        # check if the user is deleted
-        assert nil == FrontRepo.get(FrontRepo.User, id)
-
-        # check if the organizations are deleted
-        orgs
-        |> Enum.each(fn org ->
-          assert nil == FrontRepo.get(FrontRepo.Organization, org.id)
-        end)
-
-        # check if the another user organizations are not deleted
-        another_orgs
-        |> Enum.each(fn org ->
-          assert %FrontRepo.Organization{} = FrontRepo.get(FrontRepo.Organization, org.id)
-        end)
-
-        receive do
-          {:user_deleted_test, received_message} ->
-            user_deleted = User.UserDeleted.decode(received_message)
-            assert user_deleted.user_id == user.id
-        after
-          5000 -> flunk("Timeout: Message not received within 5 seconds")
-        end
+      {:ok, response} = channel |> Stub.delete_with_owned_orgs(request)
+
+      id = user.id
+      assert %User.User{id: ^id} = response
+
+      # check if the user is deleted
+      assert nil == FrontRepo.get(FrontRepo.User, id)
+      assert nil == FrontRepo.get(FrontRepo.RepoHostAccount, repo_host_account.id)
+      assert nil == FrontRepo.get(FrontRepo.Member, member.id)
+
+      receive do
+        {:user_deleted_test, received_message} ->
+          user_deleted = User.UserDeleted.decode(received_message)
+          assert user_deleted.user_id == user.id
+      after
+        5000 -> flunk("Timeout: Message not received within 5 seconds")
       end
     end