Fixed format

Author: Wong-ZZ

lib/cadet/assessments/assessments.ex

@@ -28,6 +28,7 @@ defmodule Cadet.Assessments do
     if role in @change_dates_assessment_role do
       assessment = Repo.get(Assessment, id)
       previous_open_time = assessment.open_at
+
       cond do
         Timex.before?(close_at, open_at) ->
           {:error, {:bad_request, "New end date should occur after new opening date"}}
@@ -209,6 +210,7 @@ defmodule Cadet.Assessments do
   def assessment_with_questions_and_answers(id, user = %User{}, password)
       when is_ecto_id(id) do
     role = user.role
+
     assessment =
       if role in @open_all_assessment_roles do
         Assessment
@@ -313,6 +315,7 @@ defmodule Cadet.Assessments do
 
   def filter_published_assessments(assessments, user) do
     role = user.role
+
     case role do
       :student -> where(assessments, is_published: true)
       _ -> assessments
@@ -346,7 +349,11 @@ defmodule Cadet.Assessments do
   @spec insert_or_update_assessments_and_questions(map(), [map()], boolean()) ::
           {:ok, any()}
           | {:error, Ecto.Multi.name(), any(), %{optional(Ecto.Multi.name()) => any()}}
-  def insert_or_update_assessments_and_questions(assessment_params, questions_params, force_update) do
+  def insert_or_update_assessments_and_questions(
+        assessment_params,
+        questions_params,
+        force_update
+      ) do
     assessment_multi =
       Multi.insert_or_update(
         Multi.new(),
@@ -363,7 +370,10 @@ defmodule Cadet.Assessments do
         Multi.run(multi, String.to_atom("question#{index}"), fn _repo,
                                                                 %{assessment: %Assessment{id: id}} ->
           question_exists =
-            Repo.exists?(where(Question, [q], q.assessment_id == ^id and q.display_order == ^index))
+            Repo.exists?(
+              where(Question, [q], q.assessment_id == ^id and q.display_order == ^index)
+            )
+
           # the !question_exists check allows for force updating of brand new assessments
           if !force_update or !question_exists do
             question_params
@@ -372,22 +382,28 @@ defmodule Cadet.Assessments do
             |> Repo.insert()
           else
             params =
-              (if !question_params.max_xp do
+              if !question_params.max_xp do
                 question_params
                 |> Map.put(:max_xp, 0)
               else
                 question_params
-              end)
+              end
               |> Map.put(:display_order, index)
 
             %{id: question_id, type: type} =
               where(Question, [q], q.display_order == ^index and q.assessment_id == ^id)
               |> Repo.one()
 
             if question_params.type != Atom.to_string(type) do
-              {:error, create_invalid_changeset_with_error(:question, "Question types should remain the same")}
+              {:error,
+               create_invalid_changeset_with_error(
+                 :question,
+                 "Question types should remain the same"
+               )}
             else
-              changeset = Question.changeset(%Question{assessment_id: id, id: question_id}, params)
+              changeset =
+                Question.changeset(%Question{assessment_id: id, id: question_id}, params)
+
               Repo.update(changeset)
             end
           end
@@ -402,9 +418,9 @@ defmodule Cadet.Assessments do
   defp invalid_force_update(assessment_multi, questions_params) do
     assessment_id =
       (assessment_multi.operations
-      |> List.first()
-      |> elem(1)
-      |> elem(1)).data.id
+       |> List.first()
+       |> elem(1)
+       |> elem(1)).data.id
 
     # check if assessment already exists
     if !assessment_id do
@@ -418,7 +434,8 @@ defmodule Cadet.Assessments do
         existing_questions_count =
           where(Question, [q], q.assessment_id == ^assessment_id)
           |> Repo.all()
-          |> Enum.count
+          |> Enum.count()
+
         new_questions_count = Enum.count(questions_params)
         existing_questions_count != new_questions_count
       end
@@ -433,6 +450,7 @@ defmodule Cadet.Assessments do
     |> case do
       nil ->
         Assessment.changeset(%Assessment{}, params)
+
       assessment ->
         cond do
           Timex.after?(assessment.open_at, Timex.now()) ->

lib/cadet/jobs/xml_parser.ex

@@ -77,7 +77,8 @@ defmodule Cadet.Updater.XMLParser do
     end
   end
 
-  @spec parse_xml(String.t(), boolean()) :: :ok | {:ok, String.t} | {:error, {atom(), String.t}}
+  @spec parse_xml(String.t(), boolean()) ::
+          :ok | {:ok, String.t()} | {:error, {atom(), String.t()}}
   def parse_xml(xml, force_update \\ false) do
     with {:ok, assessment_params} <- process_assessment(xml),
          {:ok, questions_params} <- process_questions(xml),
@@ -102,10 +103,12 @@ defmodule Cadet.Updater.XMLParser do
 
       {:error, stage, changeset, _} when is_atom(stage) ->
         log_error_bad_changeset(changeset, stage)
+
         changeset_error =
           changeset
           |> Map.get(:errors)
           |> extract_changeset_error_message
+
         error_message = "Invalid #{stage} changeset #{changeset_error}"
         log_and_return_badrequest(error_message)
     end
@@ -117,6 +120,7 @@ defmodule Cadet.Updater.XMLParser do
         |> nested_tuple_to_list()
         |> List.flatten()
         |> Enum.reduce("", fn x, acc -> "#{acc <> to_string(x)} " end)
+
       {:error, {:bad_request, "Invalid XML #{error_message}"}}
   end
 
@@ -126,7 +130,7 @@ defmodule Cadet.Updater.XMLParser do
     |> List.foldr("", fn x, acc -> "#{acc <> x} " end)
   end
 
-  @spec process_assessment(String.t()) :: {:ok, map()} | {:error, String.t}
+  @spec process_assessment(String.t()) :: {:ok, map()} | {:error, String.t()}
   defp process_assessment(xml) do
     open_at =
       Timex.now()
@@ -164,7 +168,6 @@ defmodule Cadet.Updater.XMLParser do
     end
 
     {:ok, assessment_params}
-
   rescue
     # This error is raised by xpath/3 when TASK does not exist (hence is equal to nil)
     Protocol.UndefinedError ->
@@ -188,7 +191,7 @@ defmodule Cadet.Updater.XMLParser do
     type
   end
 
-  @spec process_questions(String.t()) :: {:ok, [map()]} | {:error, String.t}
+  @spec process_questions(String.t()) :: {:ok, [map()]} | {:error, String.t()}
   defp process_questions(xml) do
     default_library = xpath(xml, ~x"//TASK/DEPLOYMENT"e)
     default_grading_library = xpath(xml, ~x"//TASK/GRADERDEPLOYMENT"e)
@@ -234,7 +237,7 @@ defmodule Cadet.Updater.XMLParser do
     Logger.error("Changeset: #{inspect(changeset, pretty: true)}")
   end
 
-  @spec process_question_by_question_type(map()) :: map() | {:error, String.t}
+  @spec process_question_by_question_type(map()) :: map() | {:error, String.t()}
   defp process_question_by_question_type(question) do
     question[:entity]
     |> process_question_entity_by_type(question[:type])
@@ -297,7 +300,7 @@ defmodule Cadet.Updater.XMLParser do
     {:error, "Invalid question type"}
   end
 
-  @spec process_question_library(map(), any(), any()) :: map() | {:error, String.t}
+  @spec process_question_library(map(), any(), any()) :: map() | {:error, String.t()}
   defp process_question_library(question, default_library, default_grading_library) do
     library = xpath(question[:entity], ~x"./DEPLOYMENT"o) || default_library
 
@@ -361,7 +364,7 @@ defmodule Cadet.Updater.XMLParser do
   end
 
   defp nested_tuple_to_list(tuple) when is_tuple(tuple) do
-    tuple |> Tuple.to_list |> Enum.map(&nested_tuple_to_list/1)
+    tuple |> Tuple.to_list() |> Enum.map(&nested_tuple_to_list/1)
   end
 
   defp nested_tuple_to_list(x), do: x

lib/cadet_web/controllers/assessments_controller.ex

@@ -36,7 +36,8 @@ defmodule CadetWeb.AssessmentsController do
   end
 
   def publish(conn, %{"id" => id, "togglePublishTo" => toggle_publish_to}) do
-    result = Assessments.toggle_publish_assessment(conn.assigns.current_user, id, toggle_publish_to)
+    result =
+      Assessments.toggle_publish_assessment(conn.assigns.current_user, id, toggle_publish_to)
 
     case result do
       {:ok, _nil} ->
@@ -52,7 +53,14 @@ defmodule CadetWeb.AssessmentsController do
   def update(conn, %{"id" => id, "closeAt" => close_at, "openAt" => open_at}) do
     formatted_close_date = elem(DateTime.from_iso8601(close_at), 1)
     formatted_open_date = elem(DateTime.from_iso8601(open_at), 1)
-    result = Assessments.change_dates_assessment(conn.assigns.current_user, id, formatted_close_date, formatted_open_date)
+
+    result =
+      Assessments.change_dates_assessment(
+        conn.assigns.current_user,
+        id,
+        formatted_close_date,
+        formatted_open_date
+      )
 
     case result do
       {:ok, _nil} ->
@@ -81,11 +89,14 @@ defmodule CadetWeb.AssessmentsController do
 
   def create(conn, %{"assessment" => assessment, "forceUpdate" => force_update}) do
     role = conn.assigns[:current_user].role
+
     if role == :student do
       send_resp(conn, :forbidden, "User not allowed to create")
     else
-      file = assessment["file"].path
-      |> File.read!()
+      file =
+        assessment["file"].path
+        |> File.read!()
+
       result =
         case force_update do
           "true" -> parse_xml(file, true)
@@ -94,7 +105,7 @@ defmodule CadetWeb.AssessmentsController do
 
       case result do
         :ok ->
-          if (force_update == "true") do
+          if force_update == "true" do
             send_resp(conn, 200, "Force Update OK")
           else
             send_resp(conn, 200, "OK")