Merge branch 'dev/multitenent' into infinite-loop

Author: chownces

lib/cadet/helpers/model_helper.ex

@@ -132,4 +132,15 @@ defmodule Cadet.ModelHelper do
         |> cast_assoc(assoc_field)
     end
   end
+
+  def remove_preload(struct, field, cardinality \\ :one) do
+    %{
+      struct
+      | field => %Ecto.Association.NotLoaded{
+          __field__: field,
+          __owner__: struct.__struct__,
+          __cardinality__: cardinality
+        }
+    }
+  end
 end

priv/repo/migrations/20210531155751_multitenant_upgrade.exs

@@ -1,6 +1,6 @@
 defmodule Cadet.Repo.Migrations.MultitenantUpgrade do
   use Ecto.Migration
-  import Ecto.Query, only: [from: 2, where: 2]
+  import Ecto.Query
 
   alias Cadet.Accounts.{CourseRegistration, Notification, Role, User}
   alias Cadet.Assessments.{Answer, Assessment, Question, Submission, SubmissionVotes}
@@ -185,7 +185,7 @@ defmodule Cadet.Repo.Migrations.MultitenantUpgrade do
               # assign a staff to be the leader_id during migration
               nil ->
                 CourseRegistration
-                |> where(role: :staff)
+                |> where([cr], cr.role in [:admin, :staff])
                 |> Repo.one()
                 |> Map.fetch!(:id)
 

test/cadet/auth/guardian_test.exs

@@ -1,7 +1,7 @@
 defmodule Cadet.Auth.GuardianTest do
   use Cadet.DataCase
 
-  import Cadet.TestHelper
+  import Cadet.ModelHelper
   alias Cadet.Auth.Guardian
 
   test "token subject is user id" do

test/cadet_web/admin_controllers/admin_goals_controller_test.exs

@@ -263,6 +263,6 @@ defmodule CadetWeb.AdminGoalsControllerTest do
   end
 
   defp build_path(course_id, uuid, course_reg_id) do
-    "v2/courses/#{course_id}/admin/users/#{course_reg_id}/goals/#{uuid}/progress/"
+    "/v2/courses/#{course_id}/admin/users/#{course_reg_id}/goals/#{uuid}/progress/"
   end
 end

test/cadet_web/controllers/user_controller_test.exs

@@ -156,184 +156,10 @@ defmodule CadetWeb.UserControllerTest do
       assert expected == resp
     end
 
-    # # This also tests for the case where assessment has no submission
-    # @tag authenticate: :student
-    # test "success, student story ordering", %{conn: conn} do
-    #   early_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -3))
-    #   late_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -1))
-
-    #   for assessment <- early_assessments ++ late_assessments do
-    #     resp_story =
-    #       conn
-    #       |> get("/v2/user")
-    #       |> json_response(200)
-    #       |> Map.get("latestViewedCourse").story
-
-    #     expected_story = %{
-    #       "story" => assessment.story,
-    #       "playStory" => true
-    #     }
-
-    #     assert resp_story == expected_story
-
-    #     {:ok, _} = Repo.delete(assessment)
-    #   end
-    # end
-
-    # @tag authenticate: :student
-    # test "success, student story skips assessment without story", %{conn: conn} do
-    #   assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -1))
-
-    #   assessments
-    #   |> List.first()
-    #   |> Assessment.changeset(%{story: nil})
-    #   |> Repo.update()
-
-    #   resp_story =
-    #     conn
-    #     |> get("/v2/user")
-    #     |> json_response(200)
-    #     |> Map.get("story")
-
-    #   expected_story = %{
-    #     "story" => Enum.fetch!(assessments, 1).story,
-    #     "playStory" => true
-    #   }
-
-    #   assert resp_story == expected_story
-    # end
-
-    # @tag authenticate: :student
-    # test "success, student story skips unopen assessments", %{conn: conn} do
-    #   build_assessments_starting_at(Timex.shift(Timex.now(), days: 1))
-    #   build_assessments_starting_at(Timex.shift(Timex.now(), months: -1))
-
-    #   valid_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -1))
-
-    #   for assessment <- valid_assessments do
-    #     assessment
-    #     |> Assessment.changeset(%{is_published: false})
-    #     |> Repo.update!()
-    #   end
-
-    #   resp_story =
-    #     conn
-    #     |> get("/v2/user")
-    #     |> json_response(200)
-    #     |> Map.get("story")
-
-    #   expected_story = %{
-    #     "story" => nil,
-    #     "playStory" => false
-    #   }
-
-    #   assert resp_story == expected_story
-    # end
-
-    # @tag authenticate: :student
-    # test "success, student story skips attempting/attempted/submitted", %{conn: conn} do
-    #   user = conn.assigns.current_user
-
-    #   early_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -3))
-    #   late_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -1))
-
-    #   # Submit for i-th assessment, expect (i+1)th story to be returned
-    #   for status <- [:attempting, :attempted, :submitted] do
-    #     for [tester, checker] <-
-    #           Enum.chunk_every(early_assessments ++ late_assessments, 2, 1, :discard) do
-    #       insert(:submission, %{student: user, assessment: tester, status: status})
-
-    #       resp_story =
-    #         conn
-    #         |> get("/v2/user")
-    #         |> json_response(200)
-    #         |> Map.get("story")
-
-    #       expected_story = %{
-    #         "story" => checker.story,
-    #         "playStory" => true
-    #       }
-
-    #       assert resp_story == expected_story
-    #     end
-
-    #     Repo.delete_all(Submission)
-    #   end
-    # end
-
-    # @tag authenticate: :student
-    # test "success, return most recent assessment when all are attempted", %{conn: conn} do
-    #   user = conn.assigns.current_user
-
-    #   early_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -3))
-    #   late_assessments = build_assessments_starting_at(Timex.shift(Timex.now(), days: -1))
-
-    #   for assessment <- early_assessments ++ late_assessments do
-    #     insert(:submission, %{student: user, assessment: assessment, status: :attempted})
-    #   end
-
-    #   resp_story =
-    #     conn
-    #     |> get("/v2/user")
-    #     |> json_response(200)
-    #     |> Map.get("story")
-
-    #   expected_story = %{
-    #     "story" => late_assessments |> List.first() |> Map.get(:story),
-    #     "playStory" => false
-    #   }
-
-    #   assert resp_story == expected_story
-    # end
-
-    # @tag authenticate: :staff
-    # test "success, staff", %{conn: conn} do
-    #   user = conn.assigns.current_user
-
-    #   resp =
-    #     conn
-    #     |> get("/v2/user")
-    #     |> json_response(200)
-    #     |> Map.delete("story")
-
-    #   expected = %{
-    #     "name" => user.name,
-    #     "role" => "#{user.role}",
-    #     "group" => nil,
-    #     "grade" => 0,
-    #     "maxGrade" => 0,
-    #     "xp" => 0,
-    #     "gameStates" => %{},
-    #     "userId" => user.id
-    #   }
-
-    #   assert expected == resp
-    # end
-
     test "unauthorized", %{conn: conn} do
       conn = get(conn, "/v2/user", nil)
       assert response(conn, 401) =~ "Unauthorised"
     end
-
-    # defp build_assessments_starting_at(time) do
-    #   type_order_map =
-    #     Assessment.assessment_types()
-    #     |> Enum.with_index()
-    #     |> Enum.reduce(%{}, fn {type, idx}, acc -> Map.put(acc, type, idx) end)
-
-    #   Assessment.assessment_types()
-    #   |> Enum.map(
-    #     &build(:assessment, %{
-    #       type: &1,
-    #       is_published: true,
-    #       open_at: time,
-    #       close_at: Timex.shift(time, days: 10)
-    #     })
-    #   )
-    #   |> Enum.shuffle()
-    #   |> Enum.map(&insert(&1))
-    #   |> Enum.sort(&(type_order_map[&1.type] < type_order_map[&2.type]))
-    # end
   end
 
   describe "GET /v2/user/latest_viewed_course" do

test/test_helper.exs

@@ -6,19 +6,3 @@ ExUnit.start()
 Faker.start()
 
 Ecto.Adapters.SQL.Sandbox.mode(Cadet.Repo, :manual)
-
-defmodule Cadet.TestHelper do
-  @doc """
-  Removes a preloaded Ecto association.
-  """
-  def remove_preload(struct, field, cardinality \\ :one) do
-    %{
-      struct
-      | field => %Ecto.Association.NotLoaded{
-          __field__: field,
-          __owner__: struct.__struct__,
-          __cardinality__: cardinality
-        }
-    }
-  end
-end