Merge pull request #288 from CaptainFact/feat/merge-speakers

Add function to merge speakers

Author: Betree

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/[email protected]
         with:
-          otp-version: 21.x
-          elixir-version: 1.6.x
+          otp-version: 22.x
+          elixir-version: 1.10.1
       - name: Check format
         run: mix format --check-formatted
 
@@ -39,8 +39,8 @@ jobs:
             ${{ runner.os }}-mix-
       - uses: actions/[email protected]
         with:
-          otp-version: 21.x
-          elixir-version: 1.6.x
+          otp-version: 22.x
+          elixir-version: 1.10.1
       - name: Install dependencies
         run: mix deps.get
       - name: Prepare DB

.github/workflows/e2e.yml

@@ -34,8 +34,8 @@ jobs:
           key: ${{ runner.os }}-mix-build
       - uses: actions/[email protected]
         with:
-          otp-version: 21.x
-          elixir-version: 1.6.x
+          otp-version: 22.x
+          elixir-version: 1.10.1
       - name: Install API's dependencies
         run: mix deps.get
       - name: Compile dependencies

apps/cf/lib/speakers/speakers.ex

@@ -8,6 +8,7 @@ defmodule CF.Speakers do
 
   alias DB.Repo
   alias DB.Schema.Speaker
+  alias DB.Schema.VideoSpeaker
   alias DB.Type.SpeakerPicture
 
   @doc """
@@ -86,6 +87,60 @@ defmodule CF.Speakers do
     end
   end
 
+  @merged_profile_fields [:full_name, :title, :country, :wikidata_item_id, :picture]
+
+  def merge_speakers(speaker_from, speaker_into) do
+    Ecto.Multi.new()
+    # Update speaker profile
+    |> Ecto.Multi.run(:speaker_into, fn _ ->
+      speaker_into
+      |> Speaker.changeset(merge_speakers_fields(speaker_from, speaker_into))
+      |> Repo.update()
+    end)
+    # Update VideoSpeakers
+    |> Ecto.Multi.update_all(:videos_speakers, speaker_videos(speaker_from),
+      set: [speaker_id: speaker_into.id]
+    )
+    # Update statements
+    |> Ecto.Multi.update_all(:statements, speaker_statements(speaker_from),
+      set: [speaker_id: speaker_into.id]
+    )
+    # Update user profiles
+    |> Ecto.Multi.update_all(:users, speaker_users(speaker_from),
+      set: [speaker_id: speaker_into.id]
+    )
+    # Mark first speaker as deleted
+    |> Ecto.Multi.delete(:speaker_from, speaker_from)
+    |> DB.Repo.transaction()
+  end
+
+  defp merge_speakers_fields(speaker_from, speaker_into) do
+    speaker_from
+    |> Map.from_struct()
+    |> Map.merge(remove_nil_values_from_struct(speaker_into))
+    |> Map.take([:full_name, :title, :country, :wikidata_item_id, :picture])
+    |> Enum.into(%{})
+  end
+
+  defp speaker_videos(speaker) do
+    from(v in VideoSpeaker, where: v.speaker_id == ^speaker.id)
+  end
+
+  defp speaker_statements(speaker) do
+    from(s in DB.Schema.Statement, where: s.speaker_id == ^speaker.id)
+  end
+
+  defp speaker_users(speaker) do
+    from(u in DB.Schema.User, where: u.speaker_id == ^speaker.id)
+  end
+
+  defp remove_nil_values_from_struct(struct) do
+    struct
+    |> Map.from_struct()
+    |> Enum.filter(fn {_, v} -> v != nil end)
+    |> Enum.into(%{})
+  end
+
   defp picture_filename_from_response(%{"claims" => %{"P18" => images}}) do
     case images do
       [%{"mainsnak" => %{"datavalue" => %{"value" => filename}}}] ->

apps/cf/test/authenticator/authenticator_test.exs

@@ -29,7 +29,7 @@ defmodule CF.AuthenticatorTest do
 
       user = insert_user_with_custom_password(password)
 
-      check all password <- binary(), max_runs: 3 do
+      check all(password <- binary(), max_runs: 3) do
         assert is_nil(Authenticator.get_user_for_email_or_name_password(user.email, password))
       end
     end

apps/cf/test/speakers/speakers_test.exs

@@ -46,4 +46,55 @@ defmodule CF.SpeakersTest do
       assert DB.Repo.get(DB.Schema.Speaker, speaker.id).slug == @slug
     end
   end
+
+  describe "merge_speakers" do
+    test "merges profiles and related data" do
+      speaker1 = insert(:speaker, %{title: "speaker_1"})
+      speaker2 = insert(:speaker, %{title: nil})
+      speaker1_statements = insert_list(3, :statement, speaker: speaker1)
+      speaker2_statements = insert_list(4, :statement, speaker: speaker2)
+      speaker1_videos = insert_list(3, :video_speaker, speaker: speaker1)
+      speaker2_videos = insert_list(4, :video_speaker, speaker: speaker2)
+      speaker1_users = insert_list(3, :user, speaker: speaker1)
+      speaker2_users = insert_list(4, :user, speaker: speaker2)
+
+      {:ok, result} = Speakers.merge_speakers(speaker1, speaker2)
+
+      assert result.speaker_from.id === speaker1.id
+      assert result.speaker_into.id === speaker2.id
+
+      # Profiles should be merged
+      assert result.speaker_into.title == speaker1.title
+
+      # Statements should be upddated
+      assert elem(result.statements, 0) == 3
+
+      assert DB.Repo.aggregate(
+               from(s in DB.Schema.Statement, where: s.speaker_id == ^speaker2.id),
+               :count,
+               :id
+             ) == 7
+
+      # Videos should be updated
+      assert elem(result.videos_speakers, 0) == 3
+
+      assert DB.Repo.aggregate(
+               from(s in DB.Schema.VideoSpeaker, where: s.speaker_id == ^speaker2.id),
+               :count,
+               :video_id
+             ) == 7
+
+      # Users should be upddated
+      assert elem(result.users, 0) == 3
+
+      assert DB.Repo.aggregate(
+               from(s in DB.Schema.User, where: s.speaker_id == ^speaker2.id),
+               :count,
+               :id
+             ) == 7
+
+      # First speaker should be deleted
+      assert DB.Repo.get(DB.Schema.Speaker, speaker1.id) == nil
+    end
+  end
 end

apps/cf_jobs/lib/report_manager.ex

@@ -1,5 +1,6 @@
 defmodule CF.Jobs.ReportManager do
   import Ecto.Query
+
   # TODO Implement this as a behaviour
 
   alias DB.Repo

apps/db/test/db_type/video_hash_id_test.exs

@@ -22,11 +22,11 @@ defmodule DB.Type.VideoHashIdTest do
   end
 
   property "should work with any integer" do
-    check all id <- id_generator(), do: assert(String.length(VideoHashId.encode(id)) >= 4)
+    check(all(id <- id_generator(), do: assert(String.length(VideoHashId.encode(id)) >= 4)))
   end
 
   defp id_generator do
-    ExUnitProperties.gen all id <- integer() do
+    ExUnitProperties.gen all(id <- integer()) do
       abs(id)
     end
   end

apps/db/test/support/factory.ex

@@ -13,6 +13,7 @@ defmodule DB.Factory do
   alias DB.Schema.InvitationRequest
   alias DB.Schema.UserAction
   alias DB.Schema.Video
+  alias DB.Schema.VideoSpeaker
   alias DB.Schema.Comment
   alias DB.Schema.Vote
   alias DB.Schema.Speaker
@@ -70,6 +71,13 @@ defmodule DB.Factory do
     }
   end
 
+  def video_speaker_factory do
+    %VideoSpeaker{
+      speaker: build(:speaker),
+      video: build(:video)
+    }
+  end
+
   def statement_factory do
     %Statement{
       text: Faker.Lorem.sentence(6..10),