Fix inconsistencies

Author: RichDom2185

lib/cadet/courses/courses.ex

@@ -45,15 +45,14 @@ defmodule Cadet.Courses do
     case result do
       {:ok, %{course: course}} ->
         Logger.info("Successfully created course #{course.id} for user #{user.id}")
-        result
 
       {:error, _operation, changeset, _changes} ->
         Logger.error(
           "Failed to create course for user #{user.id}: #{full_error_messages(changeset)}"
         )
-
-        result
     end
+
+    result
   end
 
   @doc """
@@ -108,15 +107,14 @@ defmodule Cadet.Courses do
         case result do
           {:ok, _} ->
             Logger.info("Successfully updated course configuration for course #{course_id}")
-            result
 
           {:error, changeset} ->
             Logger.error(
               "Failed to update course configuration for course #{course_id}: #{full_error_messages(changeset)}"
             )
-
-            result
         end
+
+        result
     end
   end
 
@@ -450,15 +448,14 @@ defmodule Cadet.Courses do
         case result do
           {:ok, _} ->
             Logger.info("Successfully deleted sourcecast #{sourcecast_id}")
-            result
 
           {:error, changeset} ->
             Logger.error(
               "Failed to delete sourcecast #{sourcecast_id}: #{full_error_messages(changeset)}"
             )
-
-            result
         end
+
+        result
     end
   end
 

lib/cadet/devices/devices.ex

@@ -65,15 +65,14 @@ defmodule Cadet.Devices do
     case result do
       {:ok, _} ->
         Logger.info("Successfully deleted device registration #{registration.id}")
-        result
 
       {:error, changeset} ->
         Logger.error(
-          "Failed to delete device registration #{registration.id}: #{inspect(changeset)}"
+          "Failed to delete device registration #{registration.id}: #{full_error_messages(changeset)}"
         )
-
-        result
     end
+
+    result
   end
 
   @spec rename_registration(DeviceRegistration.t(), String.t()) ::
@@ -89,15 +88,14 @@ defmodule Cadet.Devices do
     case result do
       {:ok, _} ->
         Logger.info("Successfully renamed device registration #{registration.id}")
-        result
 
       {:error, changeset} ->
         Logger.error(
           "Failed to rename device registration #{registration.id}: #{full_error_messages(changeset)}"
         )
-
-        result
     end
+
+    result
   end
 
   @spec get_device(binary | integer) :: Device.t() | nil

lib/cadet/incentives/achievements.ex

@@ -86,31 +86,28 @@ defmodule Cadet.Incentives.Achievements do
     # course_id not nil check is left to the changeset
     case uuid do
       nil ->
-        Logger.warning("Achievement upsert failed - no UUID specified")
+        Logger.error("Achievement upsert failed - no UUID specified")
         {:error, {:bad_request, "No UUID specified in Achievement"}}
 
       uuid ->
-        result =
-          Achievement
-          |> preload([:prerequisites, :goals])
-          |> Repo.get(uuid)
-          |> (&(&1 || %Achievement{})).()
-          |> Achievement.changeset(attrs)
-          |> Repo.insert_or_update()
-          |> case do
-            result = {:ok, _} ->
-              Logger.info("Successfully upserted achievement #{uuid}")
-              result
-
-            {:error, changeset} ->
-              Logger.error(
-                "Failed to upsert achievement #{uuid}: #{full_error_messages(changeset)}"
-              )
-
-              {:error, {:bad_request, full_error_messages(changeset)}}
-          end
-
-        result
+        Achievement
+        |> preload([:prerequisites, :goals])
+        |> Repo.get(uuid)
+        |> (&(&1 || %Achievement{})).()
+        |> Achievement.changeset(attrs)
+        |> Repo.insert_or_update()
+        |> case do
+          result = {:ok, _} ->
+            Logger.info("Successfully upserted achievement #{uuid}")
+            result
+
+          {:error, changeset} ->
+            Logger.error(
+              "Failed to upsert achievement #{uuid}: #{full_error_messages(changeset)}"
+            )
+
+            {:error, {:bad_request, full_error_messages(changeset)}}
+        end
     end
   end
 
@@ -138,7 +135,7 @@ defmodule Cadet.Incentives.Achievements do
          |> where(uuid: ^uuid)
          |> Repo.delete_all() do
       {0, _} ->
-        Logger.warning("Cannot delete achievement #{uuid} - not found")
+        Logger.error("Cannot delete achievement #{uuid} - not found")
         {:error, {:not_found, "Achievement not found"}}
 
       {count, _} ->

lib/cadet/stories/stories.ex

@@ -54,7 +54,7 @@ defmodule Cadet.Stories.Stories do
 
     case Repo.get(Story, id) do
       nil ->
-        Logger.warning("Cannot update story #{id} - story not found")
+        Logger.error("Cannot update story #{id} - story not found")
         {:error, {:not_found, "Story not found"}}
 
       story ->
@@ -67,14 +67,14 @@ defmodule Cadet.Stories.Stories do
           case result do
             {:ok, _} ->
               Logger.info("Successfully updated story #{id}")
-              result
 
             {:error, changeset} ->
               Logger.error("Failed to update story #{id}: #{full_error_messages(changeset)}")
-              result
           end
+
+          result
         else
-          Logger.warning(
+          Logger.error(
             "Cannot update story #{id} - user not allowed to manage stories from another course"
           )
 
@@ -88,7 +88,7 @@ defmodule Cadet.Stories.Stories do
 
     case Repo.get(Story, id) do
       nil ->
-        Logger.warning("Cannot delete story #{id} - story not found")
+        Logger.error("Cannot delete story #{id} - story not found")
         {:error, {:not_found, "Story not found"}}
 
       story ->
@@ -98,14 +98,14 @@ defmodule Cadet.Stories.Stories do
           case result do
             {:ok, _} ->
               Logger.info("Successfully deleted story #{id}")
-              result
 
             {:error, changeset} ->
               Logger.error("Failed to delete story #{id}: #{full_error_messages(changeset)}")
-              result
           end
+
+          result
         else
-          Logger.warning(
+          Logger.error(
             "Cannot delete story #{id} - user not allowed to manage stories from another course"
           )