Merge pull request #540 from eyra/fix-publish

Fixed: Unable to publish assignment after disabling consent form #539

core/lib/core/repo.ex

@@ -7,23 +7,27 @@ defmodule Core.Repo do
   import Ecto.Query, warn: false
   alias Ecto.Multi
 
+  require Logger
+
   def multi_update(multi, name, changeset) do
     multi
     |> multi_update_guard(name, changeset.data)
     |> Multi.update(name, changeset)
   end
 
   def multi_update_guard(multi, name, model) do
-    Multi.run(multi, "#{name}_exists?", fn repo, _ ->
-      if valid?(repo, model) do
+    Multi.run(multi, "#{name}_up_to_date?", fn repo, _ ->
+      if up_to_date?(repo, model) do
         {:ok, true}
       else
-        {:error, false}
+        message = "#{String.capitalize(name)} is not up to date, preventing database change"
+        Logger.warning(message)
+        {:error, message}
       end
     end)
   end
 
-  defp valid?(repo, %schema{id: id, updated_at: updated_at}) do
+  defp up_to_date?(repo, %schema{id: id, updated_at: updated_at}) do
     from(e in schema, where: e.id == ^id and e.updated_at == ^updated_at)
     |> repo.exists?()
   end

core/systems/assignment/_public.ex

@@ -682,8 +682,14 @@ end
 defimpl Core.Persister, for: Systems.Assignment.Model do
   def save(_assignment, changeset) do
     case Frameworks.Utility.EctoHelper.update_and_dispatch(changeset, :assignment) do
-      {:ok, %{assignment: assignment}} -> {:ok, assignment}
-      _ -> {:error, changeset}
+      {:ok, %{assignment: assignment}} ->
+        {:ok, assignment}
+
+      {:error, new_changeset} ->
+        {:error, new_changeset}
+
+      _ ->
+        {:error, changeset}
     end
   end
 end

core/systems/assignment/content_page_builder.ex

@@ -160,7 +160,7 @@ defmodule Systems.Assignment.ContentPageBuilder do
   end
 
   defp set_status(%{assigns: %{model: assignment}} = socket, status) do
-    assignment = Assignment.Public.update!(assignment, %{status: status})
+    {:ok, assignment} = Assignment.Public.update(assignment, %{status: status})
     socket |> Phoenix.Component.assign(model: assignment)
   end
 

core/systems/observatory/_public.ex

@@ -73,7 +73,8 @@ defmodule Systems.Observatory.Public do
         {
           :noreply,
           socket
-          |> Public.update_view_model(__MODULE__, model, @presenter)
+          |> assign(model: model)
+          |> update_view_model()
           |> handle_view_model_updated()
           |> put_updated_info_flash()
         }