Change from :submissions to :assessments

lib/cadet/accounts/notification.ex

@@ -5,27 +5,27 @@ defmodule Cadet.Accounts.Notification do
   alias Cadet.Accounts.NotificationType
   alias Cadet.Accounts.User
   alias Cadet.Assessments.Question
-  alias Cadet.Assessments.Submission
+  alias Cadet.Assessments.Assessment
 
   schema "notification" do
     field(:type, NotificationType)
     field(:read, :boolean)
 
     belongs_to(:user, User)
-    belongs_to(:submission, Submission)
+    belongs_to(:assessment, Assessment)
     belongs_to(:question, Question)
 
     timestamps()
   end
 
-  @required_fields ~w(type read user_id submission_id question_id)a
+  @required_fields ~w(type read user_id assessment_id)a
 
   def changeset(answer, params) do
     answer
-    |> cast(params, @required_fields)
+    |> cast(params, @required_fields ++ [:question_id])
     |> validate_required(@required_fields)
     |> foreign_key_constraint(:user)
-    |> foreign_key_constraint(:submission_id)
+    |> foreign_key_constraint(:assessment_id)
     |> foreign_key_constraint(:question_id)
   end
 

priv/repo/migrations/20190603023734_add_notifications.exs

@@ -6,10 +6,11 @@ defmodule Cadet.Repo.Migrations.AddNotifications do
       add(:type, :string)
       add(:read, :boolean)
       add(:user_id, references(:users), null: false)
-      add(:submission_id, references(:submissions), null: false)
+      add(:assessment_id, references(:assessments), null: false)
+      add(:question_id, references(:questions), null: true)
       timestamps()
     end
 
-    create(index(:notifications, [:user_id, :submission_id]))
+    create(index(:notifications, [:user_id, :assessment_id]))
   end
 end

test/cadet/accounts/notification_test.exs

@@ -3,28 +3,23 @@ defmodule Cadet.Accounts.NotificationTest do
 
   use Cadet.ChangesetCase, entity: Notification
 
-  @required_fields ~w(type read user_id submission_id question_id)a
+  @required_fields ~w(type read user_id assessment_id)a
 
   setup do
     assessment = insert(:assessment, %{is_published: true})
     student = insert(:user, %{role: :student})
-    submission = insert(:submission, %{student: student, assessment: assessment})
-    programming_question = insert(:programming_question, %{assessment: assessment})
 
     valid_notification_params = %{
       type: :new,
       read: false,
       user_id: student.id,
-      submission_id: submission.id,
-      question_id: programming_question.id
+      assessment_id: assessment.id
     }
 
     {:ok,
      %{
        assessment: assessment,
-       programming_question: programming_question,
        student: student,
-       submission: submission,
        valid_notification_params: valid_notification_params
      }}
   end
@@ -34,6 +29,12 @@ defmodule Cadet.Accounts.NotificationTest do
       assert_changeset(params, :valid)
     end
 
+    test "valid notification params with question id", %{valid_notification_params: params} do
+      params = Map.put(params, :question_id, 12345)
+
+      assert_changeset(params, :valid)
+    end
+
     test "invalid changeset missing required params", %{valid_notification_params: params} do
       for field <- @required_fields do
         params_missing_field = Map.delete(params, field)