fix: update teammate onboarding to preserve existing org details

Author: zcesur

lib/algora/organizations/organizations.ex

@@ -82,8 +82,15 @@ defmodule Algora.Organizations do
             |> Repo.insert()
 
           existing_org ->
+            updated_params =
+              params.organization
+              |> Map.take([:hiring, :categories, :tech_stack])
+              |> Map.update(:hiring, existing_org.hiring, &(existing_org.hiring || &1))
+              |> Map.update(:categories, existing_org.categories, &Enum.uniq(existing_org.categories ++ &1))
+              |> Map.update(:tech_stack, existing_org.tech_stack, &Enum.uniq(existing_org.tech_stack ++ &1))
+
             existing_org
-            |> Org.changeset(Map.delete(params.organization, :handle))
+            |> Org.changeset(updated_params)
             |> Repo.update()
         end
 

priv/repo/migrations/20250520113115_update_user_categories.exs

@@ -0,0 +1,11 @@
+defmodule Algora.Repo.Migrations.UpdateUserCategories do
+  use Ecto.Migration
+
+  def change do
+    execute "UPDATE users SET categories = '{}' WHERE categories IS NULL"
+
+    alter table(:users) do
+      modify :categories, {:array, :string}, null: false, default: "{}"
+    end
+  end
+end

test/algora/organizations_test.exs

@@ -87,34 +87,57 @@ defmodule Algora.OrganizationsTest do
       assert user.avatar_url == "https://avatars.githubusercontent.com/u/17045339?v=4"
     end
 
-    test "onboard updates existing records when params change" do
-      assert {:ok, first_result} = Algora.Organizations.onboard_organization(@params)
-
-      updated_params =
-        @params
-        |> put_in([:user, :display_name], "Updated User")
-        |> put_in([:user, :tech_stack], ["Haskell"])
-        |> put_in([:organization, :display_name], "Updated Org")
-        |> put_in([:organization, :tech_stack], ["Rust"])
-        |> put_in([:organization, :categories], ["nonprofit"])
-        |> put_in([:organization, :hiring], false)
-        |> put_in([:member, :role], :mod)
-
-      assert {:ok, second_result} = Algora.Organizations.onboard_organization(updated_params)
-
-      assert first_result.user.last_context == first_result.org.handle
-      assert first_result.user.id == second_result.user.id
-      assert first_result.org.id == second_result.org.id
-      assert first_result.member.id == second_result.member.id
-
-      assert second_result.user.last_context == second_result.org.handle
-      assert second_result.user.display_name == "Updated User"
-      assert second_result.user.tech_stack == ["Haskell"]
-      assert second_result.org.display_name == "Updated Org"
-      assert second_result.org.tech_stack == ["Rust"]
-      assert second_result.org.categories == ["nonprofit"]
-      assert second_result.org.hiring == false
-      assert second_result.member.role == :mod
+    test "onboard preserves original org details when subsequent teammates join unless autogenerated" do
+      assert {:ok, result0} =
+               @params_crawler
+               |> put_in([:organization, :hiring], nil)
+               |> put_in([:organization, :categories], [])
+               |> put_in([:organization, :tech_stack], [])
+               |> put_in([:organization, :og_title], "Title 0")
+               |> put_in([:user, :email], "[email protected]")
+               |> Algora.Organizations.onboard_organization()
+
+      assert {:ok, result1} =
+               @params_crawler
+               |> put_in([:organization, :hiring], false)
+               |> put_in([:organization, :categories], ["open_source"])
+               |> put_in([:organization, :tech_stack], ["Elixir"])
+               |> put_in([:organization, :og_title], "Title 1")
+               |> put_in([:user, :email], "[email protected]")
+               |> Algora.Organizations.onboard_organization()
+
+      assert {:ok, result2} =
+               @params_crawler
+               |> put_in([:organization, :hiring], true)
+               |> put_in([:organization, :categories], ["agency"])
+               |> put_in([:organization, :tech_stack], ["Phoenix"])
+               |> put_in([:organization, :og_title], "Title 2")
+               |> put_in([:user, :email], "[email protected]")
+               |> Algora.Organizations.onboard_organization()
+
+      assert {:ok, result3} =
+               @params_crawler
+               |> put_in([:organization, :hiring], false)
+               |> put_in([:organization, :categories], ["nonprofit"])
+               |> put_in([:organization, :tech_stack], ["PostgreSQL"])
+               |> put_in([:organization, :og_title], "Title 3")
+               |> put_in([:user, :email], "[email protected]")
+               |> Algora.Organizations.onboard_organization()
+
+      assert Enum.all?([result0, result1, result2, result3], &(&1.org.id == result0.org.id))
+      assert Enum.all?([result0, result1, result2, result3], &(&1.org.og_title == "Title 0"))
+      assert is_nil(result0.org.hiring)
+      assert result1.org.hiring == false
+      assert result2.org.hiring == true
+      assert result3.org.hiring == true
+      assert result0.org.categories == []
+      assert result1.org.categories == ["open_source"]
+      assert result2.org.categories == ["open_source", "agency"]
+      assert result3.org.categories == ["open_source", "agency", "nonprofit"]
+      assert result0.org.tech_stack == []
+      assert result1.org.tech_stack == ["Elixir"]
+      assert result2.org.tech_stack == ["Elixir", "Phoenix"]
+      assert result3.org.tech_stack == ["Elixir", "Phoenix", "PostgreSQL"]
     end
 
     test "onboard handles user handle collision by generating alternative handles" do