From c1108e03e6269a0c8f9b2ac3b9617748a6268bb3 Mon Sep 17 00:00:00 2001
From: GabrielCWT <77312579+GabrielCWT@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:23:08 +0800
Subject: [PATCH 1/3] fix: Mark notifications for grading as read when
 publishing grading

---
 lib/cadet/assessments/assessments.ex | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
index d1d326741..39533077f 100644
--- a/lib/cadet/assessments/assessments.ex
+++ b/lib/cadet/assessments/assessments.ex
@@ -1250,6 +1250,12 @@ defmodule Cadet.Assessments do
           :published_grading
         )
 
+        Notification
+        |> where([submission_id: ^submission.id, type: :submitted])
+        |> select([n], n.id)
+        |> Repo.all()
+        |> Notifications.acknowledge(cr)
+
         {:ok, nil}
 
       {:submission_found?, false} ->

From ea4e72a09e765f0d57206d790b90bddbe33a62f7 Mon Sep 17 00:00:00 2001
From: GabrielCWT <77312579+GabrielCWT@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:29:57 +0800
Subject: [PATCH 2/3] chore: Formatting

---
 lib/cadet/assessments/assessments.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
index 39533077f..b024a10d0 100644
--- a/lib/cadet/assessments/assessments.ex
+++ b/lib/cadet/assessments/assessments.ex
@@ -1251,7 +1251,7 @@ defmodule Cadet.Assessments do
         )
 
         Notification
-        |> where([submission_id: ^submission.id, type: :submitted])
+        |> where(submission_id: ^submission.id, type: :submitted)
         |> select([n], n.id)
         |> Repo.all()
         |> Notifications.acknowledge(cr)

From ff7183cb2b25db5aff2f79ec66aab32d8e722797 Mon Sep 17 00:00:00 2001
From: GabrielCWT <77312579+GabrielCWT@users.noreply.github.com>
Date: Tue, 27 Aug 2024 13:22:12 +0800
Subject: [PATCH 3/3] feat: Acknowledge grading notification when unsubmitting
 submission

---
 lib/cadet/assessments/assessments.ex | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
index b024a10d0..980736479 100644
--- a/lib/cadet/assessments/assessments.ex
+++ b/lib/cadet/assessments/assessments.ex
@@ -1139,6 +1139,13 @@ defmodule Cadet.Assessments do
           )
       end
 
+      # Remove grading notifications for submissions
+      Notification
+      |> where(submission_id: ^submission_id, type: :submitted)
+      |> select([n], n.id)
+      |> Repo.all()
+      |> Notifications.acknowledge(cr)
+
       {:ok, nil}
     else
       {:submission_found?, false} ->