Merge pull request #256 from CaptainFact/deps/update-ecto

Update ecto

Author: Betree

.github/workflows/ci.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-elixir@v1.1.0
+      - uses: erlef/setup-elixir@v1
         with:
-          otp-version: 22.x
+          otp-version: 22.2.7
           elixir-version: 1.10.1
       - name: Check format
         run: mix format --check-formatted
@@ -37,9 +37,9 @@ jobs:
           key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
           restore-keys: |
             ${{ runner.os }}-mix-
-      - uses: actions/setup-elixir@v1.1.0
+      - uses: erlef/setup-elixir@v1
         with:
-          otp-version: 22.x
+          otp-version: 22.2.7
           elixir-version: 1.10.1
       - name: Install dependencies
         run: mix deps.get

.github/workflows/e2e.yml

@@ -32,9 +32,9 @@ jobs:
         with:
           path: build
           key: ${{ runner.os }}-mix-build
-      - uses: actions/setup-elixir@v1.1.0
+      - uses: erlef/setup-elixir@v1
         with:
-          otp-version: 22.x
+          otp-version: 22.2.7
           elixir-version: 1.10.1
       - name: Install API's dependencies
         run: mix deps.get

apps/cf/lib/accounts/accounts.ex

@@ -168,7 +168,7 @@ defmodule CF.Accounts do
       end)
       |> User.provider_changeset(provider_params)
     )
-    |> Multi.run(:final_user, fn %{base_user: user} ->
+    |> Multi.run(:final_user, fn _repo, %{base_user: user} ->
       user
       |> User.changeset(%{})
       |> Ecto.Changeset.put_change(:username, UsernameGenerator.generate(user.id))
@@ -373,12 +373,12 @@ defmodule CF.Accounts do
   """
   def check_reset_password_token!(token) do
     date_limit =
-      DateTime.utc_now()
-      |> DateTime.to_naive()
+      NaiveDateTime.utc_now()
+      |> NaiveDateTime.truncate(:second)
       |> NaiveDateTime.add(-@request_validity, :second)
 
     User
-    |> join(:inner, [u], r in ResetPasswordRequest, r.user_id == u.id)
+    |> join(:inner, [u], r in ResetPasswordRequest, on: r.user_id == u.id)
     |> where([u, r], r.token == ^token)
     |> where([u, r], r.inserted_at >= ^date_limit)
     |> Repo.one!()

apps/cf/lib/accounts/invitations.ex

@@ -153,7 +153,7 @@ defmodule CF.Accounts.Invitations do
     do: generate_invites(number, TokenGenerator.generate(@default_token_length))
 
   def generate_invites(number, token) do
-    time = Ecto.DateTime.utc()
+    time = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
 
     Repo.insert_all(
       InvitationRequest,

apps/cf/lib/actions/action_creator.ex

@@ -105,10 +105,6 @@ defmodule CF.Actions.ActionCreator do
     )
   end
 
-  def action_update(user_id, %{data: %Speaker{id: id}, changes: changes}, video_id) do
-    action(user_id, :speaker, :update, speaker_id: id, video_id: video_id, changes: changes)
-  end
-
   def action_update(user_id, %{data: %Speaker{id: id}, changes: changes}) do
     action(user_id, :speaker, :update, speaker_id: id, changes: changes)
   end
@@ -118,6 +114,10 @@ defmodule CF.Actions.ActionCreator do
     action(user_id, :user, :update, logged_changes)
   end
 
+  def action_update(user_id, %{data: %Speaker{id: id}, changes: changes}, video_id) do
+    action(user_id, :speaker, :update, speaker_id: id, video_id: video_id, changes: changes)
+  end
+
   # Remove
 
   def action_remove(user_id, video_id, %Speaker{id: id}) do

apps/cf/lib/actions/actions.ex

@@ -96,7 +96,7 @@ defmodule CF.Actions do
     do: query
 
   defp age_filter(query, age) do
-    datetime_now = NaiveDateTime.utc_now()
+    datetime_now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
     datetime_start = NaiveDateTime.add(datetime_now, -age)
     ActionsQuery.for_period(query, datetime_start, datetime_now)
   end

apps/cf/lib/comments/comments.ex

@@ -54,18 +54,18 @@ defmodule CF.Comments do
       |> Comment.changeset(params)
 
     Multi.new()
-    |> Multi.run(:comment, fn _ ->
+    |> Multi.run(:comment, fn _repo, _changes ->
       comment_changeset
       |> Repo.insert!()
       |> Map.put(:user, user)
       |> Repo.preload([:source, :statement])
       |> Map.put(:score, 0)
       |> Result.ok()
     end)
-    |> Multi.run(:action, fn %{comment: comment} ->
+    |> Multi.run(:action, fn _repo, %{comment: comment} ->
       Repo.insert(action_create(user.id, video_id, comment, source_url))
     end)
-    |> Multi.run(:suscription, fn %{comment: comment} ->
+    |> Multi.run(:suscription, fn _repo, %{comment: comment} ->
       Subscriptions.subscribe(user, comment, :is_author)
     end)
     |> Repo.transaction()

apps/cf/lib/moderation/moderation.ex

@@ -88,7 +88,7 @@ defmodule CF.Moderation do
       UserAction
       |> without_user_feedback(user)
       |> where([a, _], a.id == ^action_id)
-      |> join(:inner, [a, _], f in Flag, f.action_id == a.id)
+      |> join(:inner, [a, _], f in Flag, on: f.action_id == a.id)
       |> group_by([a, _, _], a.id)
       # Following conditions will fail if target action is not reported. This is on purpose
       |> being_reported()
@@ -110,6 +110,7 @@ defmodule CF.Moderation do
     Comment
     |> where([c], c.id == ^comment_id)
     |> where([c], c.is_reported == false)
+    |> select([c], c)
     |> Repo.update_all([set: [is_reported: true]], returning: true)
     |> case do
       {1, [comment]} ->
@@ -124,7 +125,7 @@ defmodule CF.Moderation do
 
   defp without_user_feedback(query, user) do
     query
-    |> join(:left, [a], fb in subquery(user_feedbacks(user)), fb.action_id == a.id)
+    |> join(:left, [a], fb in subquery(user_feedbacks(user)), on: fb.action_id == a.id)
     |> where([_, fb], is_nil(fb.action_id))
   end
 
@@ -147,7 +148,7 @@ defmodule CF.Moderation do
     query
     |> where([a], a.user_id != ^user.id)
     |> without_user_feedback(user)
-    |> join(:inner, [a, _], f in Flag, f.action_id == a.id)
+    |> join(:inner, [a, _], f in Flag, on: f.action_id == a.id)
     |> group_by([a, _, _], a.id)
     |> being_reported()
   end

apps/cf/lib/speakers/speakers.ex

@@ -19,7 +19,12 @@ defmodule CF.Speakers do
     case SpeakerPicture.store({picture_url, speaker}) do
       {:ok, picture} ->
         speaker
-        |> Ecto.Changeset.change(picture: %{file_name: picture, updated_at: DateTime.utc_now()})
+        |> Ecto.Changeset.change(
+          picture: %{
+            file_name: picture,
+            updated_at: NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+          }
+        )
         |> Repo.update()
 
       error ->
@@ -31,7 +36,7 @@ defmodule CF.Speakers do
   Calls `fetch_picture/2` with the picture retrieved from wikidata using
   `retrieve_wikimedia_picture_url/1`
   """
-  def fetch_picture_from_wikimedia(speaker = %Speaker{wikidata_item_id: nil}) do
+  def fetch_picture_from_wikimedia(_speaker = %Speaker{wikidata_item_id: nil}) do
     {:error, "Cannot fetch picture from wikimedia if wikidata_item_id is no set"}
   end
 
@@ -81,18 +86,16 @@ defmodule CF.Speakers do
         Logger.warn("Wikidata query failed: #{error.reason}")
         {:error, "Connection failed"}
 
-      e ->
+      _e ->
         Logger.info("No picture found for #{speaker.full_name}")
         {:error, "No picture found"}
     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 _ ->
+    |> Ecto.Multi.run(:speaker_into, fn _repo, _ ->
       speaker_into
       |> Speaker.changeset(merge_speakers_fields(speaker_from, speaker_into))
       |> Repo.update()

apps/cf/lib/videos/videos.ex

@@ -41,7 +41,7 @@ defmodule CF.Videos do
   """
   def added_by_user(user, paginate_options \\ []) do
     Video
-    |> join(:inner, [v], a in DB.Schema.UserAction, a.video_id == v.id)
+    |> join(:inner, [v], a in DB.Schema.UserAction, on: a.video_id == v.id)
     |> where([_, a], a.user_id == ^user.id)
     |> where([_, a], a.type == ^:add and a.entity == ^:video)
     |> DB.Query.order_by_last_inserted_desc()
@@ -93,12 +93,12 @@ defmodule CF.Videos do
 
       Multi.new()
       |> Multi.insert(:video_without_hash_id, Video.changeset(base_video, metadata))
-      |> Multi.run(:video, fn %{video_without_hash_id: video} ->
+      |> Multi.run(:video, fn _repo, %{video_without_hash_id: video} ->
         video
         |> Video.changeset_generate_hash_id()
         |> Repo.update()
       end)
-      |> Multi.run(:action, fn %{video: video} ->
+      |> Multi.run(:action, fn _repo, %{video: video} ->
         Repo.insert(ActionCreator.action_add(user.id, video))
       end)
       |> Repo.transaction()