From a9be7649ccf82a6b7ce33882a1269f586532b517 Mon Sep 17 00:00:00 2001
From: alison11liu <alison11liu@gmail.com>
Date: Mon, 5 Oct 2026 17:31:36 -0700
Subject: [PATCH] soft delete sections

created a delete section button (only accessible to coordinators), archives the section while keeping all of its attendance/enrollment information in the admin data table (using a new "active" attirbute)
---
 .../coord_interface/CoordSectionDelete.tsx    | 77 +++++++++----------
 .../components/section/MentorSectionInfo.tsx  |  8 +-
 csm_web/frontend/src/css/section_delete.scss  | 19 +++++
 csm_web/frontend/src/utils/queries/coord.tsx  | 38 +--------
 .../frontend/src/utils/queries/sections.tsx   | 31 ++++++++
 csm_web/scheduler/admin.py                    |  3 +-
 .../migrations/0036_section_active.py         | 19 +++++
 csm_web/scheduler/models.py                   |  1 +
 csm_web/scheduler/views/coord.py              | 18 +++--
 csm_web/scheduler/views/course.py             | 44 ++++++-----
 csm_web/scheduler/views/profile.py            | 10 ++-
 csm_web/scheduler/views/section.py            | 11 +--
 csm_web/scheduler/views/spacetime.py          |  3 +-
 csm_web/scheduler/views/student.py            | 12 ++-
 csm_web/scheduler/views/waitlistedStudent.py  | 16 ++--
 15 files changed, 183 insertions(+), 127 deletions(-)
 create mode 100644 csm_web/frontend/src/css/section_delete.scss
 create mode 100644 csm_web/scheduler/migrations/0036_section_active.py

diff --git a/csm_web/frontend/src/components/coord_interface/CoordSectionDelete.tsx b/csm_web/frontend/src/components/coord_interface/CoordSectionDelete.tsx
index 8c1aedf33..9cf61188e 100644
--- a/csm_web/frontend/src/components/coord_interface/CoordSectionDelete.tsx
+++ b/csm_web/frontend/src/components/coord_interface/CoordSectionDelete.tsx
@@ -1,55 +1,50 @@
 import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
 
-import { useCoordDeleteSectionMutation } from "../../utils/queries/coord";
-// import Modal from "../Modal";
-import XIcon from "../../../static/frontend/img/x.svg";
+import { useDeleteSectionMutation } from "../../utils/queries/sections";
+import Modal from "../Modal";
+import TrashIcon from "../../../static/frontend/img/trash-alt.svg";
 
-// import "../../css/student_dropper.scss";
+import "../../css/section_delete.scss";
 
 interface CoordSectionDeleteProps {
   sectionId: number;
 }
 
 export default function CoordSectionDelete({ sectionId }: CoordSectionDeleteProps) {
-  const [showDropPrompt, setShowDropPrompt] = useState(false);
-  const [drop, setDrop] = useState(false);
-  const [ban, setBan] = useState(false);
-  const [blacklist, setBlacklist] = useState(false);
-
-  /**
-   * Mutation to drop a student from the section. (Inspiration taken from dropping students within sections)
-   */
-  const coordSectionDeleteMutation = useCoordDeleteSectionMutation(sectionId);
-
-  function handleClickDrop() {
-    coordSectionDeleteMutation.mutate({ banned: ban, blacklisted: blacklist });
-    setShowDropPrompt(false);
+  const [showDeletePrompt, setShowDeletePrompt] = useState(false);
+  const [confirmed, setConfirmed] = useState(false);
+  const deleteSectionMutation = useDeleteSectionMutation(sectionId);
+  const navigate = useNavigate();
+
+  function handleDelete() {
+    deleteSectionMutation.mutate(undefined, {
+      onSuccess: () => navigate(-1)
+    });
   }
 
-  const dropDiv = (
-    <div>
-      <h2 className="student-dropper-head-item">DROP Student</h2>
-      <div className="student-dropper-checkbox-container">
-        <input type="checkbox" id="drop" name="drop" onChange={e => setDrop(e.target.checked)} />
-        <label className="student-dropper-checkbox-label" htmlFor="drop">
-          I would like to DELETE the section: {sectionId}.
-        </label>
-        <br></br>
-      </div>
-    </div>
-  );
-
   return (
-    //   <span className={`student-dropper ${showDropPrompt ? "ban-prompt-visible" : ""}`}>
-    //     <XIcon
-    //       className="icon inline-plus-sign"
-    //       title="Drop student from section"
-    //       onClick={() => setShowDropPrompt(true)}
-    //     />
-    //     <div>dropDiv</div>
-    <button className="danger-btn" onClick={handleClickDrop} disabled={!drop}>
-      Submit
-    </button>
-    //   </span>
+    <div className="section-delete">
+      <button className="danger-btn" onClick={() => setShowDeletePrompt(true)}>
+        <TrashIcon className="icon" aria-hidden="true" /> Delete section
+      </button>
+      {showDeletePrompt && (
+        <Modal className="section-delete-modal" closeModal={() => setShowDeletePrompt(false)}>
+          <h2>Delete section</h2>
+          <p>This section will be hidden, but its enrollment and attendance history will be preserved.</p>
+          <label className="section-delete-confirmation">
+            <input type="checkbox" checked={confirmed} onChange={event => setConfirmed(event.target.checked)} />I
+            understand and want to delete this section.
+          </label>
+          <button
+            className="danger-btn"
+            onClick={handleDelete}
+            disabled={!confirmed || deleteSectionMutation.isLoading}
+          >
+            {deleteSectionMutation.isLoading ? "Deleting…" : "Delete"}
+          </button>
+        </Modal>
+      )}
+    </div>
   );
 }
diff --git a/csm_web/frontend/src/components/section/MentorSectionInfo.tsx b/csm_web/frontend/src/components/section/MentorSectionInfo.tsx
index d3ecddcee..84ce33197 100644
--- a/csm_web/frontend/src/components/section/MentorSectionInfo.tsx
+++ b/csm_web/frontend/src/components/section/MentorSectionInfo.tsx
@@ -8,6 +8,7 @@ import {
 } from "../../utils/queries/sections";
 import { Mentor, Spacetime, Student } from "../../utils/types";
 import LoadingSpinner from "../LoadingSpinner";
+import CoordSectionDelete from "../coord_interface/CoordSectionDelete";
 import { CoordinatorAddStudentModal } from "./CoordinatorAddStudentModal";
 import MetaEditModal from "./MetaEditModal";
 import { InfoCard, SectionSpacetime } from "./Section";
@@ -16,7 +17,7 @@ import SpacetimeEditModal from "./SpacetimeEditModal";
 import StudentDropper from "./StudentDropper";
 
 import PencilIcon from "../../../static/frontend/img/pencil.svg";
-import XIcon from "../../../static/frontend/img/x.svg";
+import TrashIcon from "../../../static/frontend/img/trash-alt.svg";
 
 import "../../css/coordinator-add-student.scss";
 
@@ -162,6 +163,7 @@ export default function MentorSectionInfo({
       <h3 className="section-detail-page-title">{`${
         isCoordinator ? `${mentor.name || mentor.email}'s` : "My"
       } Section`}</h3>
+      {isCoordinator && <CoordSectionDelete sectionId={sectionId} />}
       <div className="section-info-cards-container">
         <SectionInfo
           title="Enrolled Students"
@@ -203,7 +205,7 @@ export default function MentorSectionInfo({
                         setDeleteType(false);
                       }}
                     >
-                      <XIcon className="icon" /> Delete
+                      <TrashIcon className="icon" aria-hidden="true" /> Delete
                     </button>
                   ) : (
                     <div>{/* empty div for positioning */}</div>
@@ -230,7 +232,7 @@ export default function MentorSectionInfo({
                       setDeleteType(true);
                     }}
                   >
-                    <XIcon className="icon" /> Delete
+                    <TrashIcon className="icon" aria-hidden="true" /> Delete
                   </button>
                   <button
                     className="secondary-link-btn info-card-edit-btn"
diff --git a/csm_web/frontend/src/css/section_delete.scss b/csm_web/frontend/src/css/section_delete.scss
new file mode 100644
index 000000000..ddf59e860
--- /dev/null
+++ b/csm_web/frontend/src/css/section_delete.scss
@@ -0,0 +1,19 @@
+.section-delete {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 1rem;
+}
+
+.section-delete-modal {
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+  align-items: center;
+  justify-content: center;
+}
+
+.section-delete-confirmation {
+  display: flex;
+  gap: 0.5rem;
+  align-items: center;
+}
diff --git a/csm_web/frontend/src/utils/queries/coord.tsx b/csm_web/frontend/src/utils/queries/coord.tsx
index 4a3352537..ac0a0d24d 100644
--- a/csm_web/frontend/src/utils/queries/coord.tsx
+++ b/csm_web/frontend/src/utils/queries/coord.tsx
@@ -1,4 +1,4 @@
-import { useMutation, UseMutationResult, useQuery, useQueryClient, UseQueryResult } from "@tanstack/react-query";
+import { useMutation, UseMutationResult, useQueryClient } from "@tanstack/react-query";
 import { fetchNormalized, fetchWithMethod, HTTP_METHODS } from "../api";
 import { handleError, handleRetry, handlePermissionsError, PermissionError, ServerError } from "./helpers";
 
@@ -77,39 +77,3 @@ export const useCoordDropStudentMutation = (
   handleError(mutationResult);
   return mutationResult;
 };
-
-/**
- * Hook to delete a section though the coord interface.
- * Invalidates all queries associated with the section.
- * (insprition from /queries/sections.tsx, but there wasn't a delete section sooo)
- */
-
-export const useCoordDeleteSectionMutation = (
-  sectionId: number
-): UseMutationResult<void, ServerError, StudentDropMutationBody> => {
-  const queryClient = useQueryClient();
-  const mutationResult = useMutation<void, Error, StudentDropMutationBody>(
-    async (body: StudentDropMutationBody) => {
-      if (isNaN(sectionId)) {
-        throw new PermissionError("Invalid section id");
-      }
-      const response = await fetchWithMethod(`coord/${sectionId}/section`, HTTP_METHODS.PATCH, body); // changed this to match the path within urls.py
-      if (response.ok) {
-        return;
-      } else {
-        handlePermissionsError(response.status);
-        throw new ServerError(`Failed to delete section ${sectionId}`);
-      }
-    },
-    {
-      onSuccess: () => {
-        // invalidate all queries for the section
-        queryClient.invalidateQueries(["sections", sectionId]); // might still need this?
-      },
-      retry: handleRetry
-    }
-  );
-
-  handleError(mutationResult);
-  return mutationResult;
-};
diff --git a/csm_web/frontend/src/utils/queries/sections.tsx b/csm_web/frontend/src/utils/queries/sections.tsx
index b17948a2a..926182338 100644
--- a/csm_web/frontend/src/utils/queries/sections.tsx
+++ b/csm_web/frontend/src/utils/queries/sections.tsx
@@ -355,6 +355,37 @@ export const useDropStudentMutation = (
   return mutationResult;
 };
 
+/**
+ * Soft-delete (archive) a section as a coordinator.
+ */
+export const useDeleteSectionMutation = (sectionId: number): UseMutationResult<void, ServerError, void, unknown> => {
+  const queryClient = useQueryClient();
+  const mutationResult = useMutation<void, ServerError, void, unknown>(
+    async () => {
+      if (isNaN(sectionId)) {
+        throw new PermissionError("Invalid section id");
+      }
+
+      const response = await fetchWithMethod(`coord/${sectionId}/section`, HTTP_METHODS.DELETE);
+      if (!response.ok) {
+        handlePermissionsError(response.status);
+        throw new ServerError(`Failed to delete section ${sectionId}`);
+      }
+    },
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries(["sections", sectionId]);
+        queryClient.invalidateQueries(["courses"]);
+        queryClient.invalidateQueries(["profiles"]);
+      },
+      retry: handleRetry
+    }
+  );
+
+  handleError(mutationResult);
+  return mutationResult;
+};
+
 /**
  * Hook to drop the current user from their section.
  *
diff --git a/csm_web/scheduler/admin.py b/csm_web/scheduler/admin.py
index d36ee1bef..84ff66790 100644
--- a/csm_web/scheduler/admin.py
+++ b/csm_web/scheduler/admin.py
@@ -566,7 +566,7 @@ class SectionAdmin(BasePermissionModelAdmin):
     autocomplete_fields = ("mentor",)
 
     actions = ("swap_mentors",)
-    list_filter = ("mentor__course", "spacetimes__day_of_week")
+    list_filter = ("active", "mentor__course", "spacetimes__day_of_week")
     list_display = (
         "id",
         "get_mentor",
@@ -574,6 +574,7 @@ class SectionAdmin(BasePermissionModelAdmin):
         "get_spacetimes",
         "description",
         "get_capacity",
+        "active",
     )
     search_fields = (
         "id",
diff --git a/csm_web/scheduler/migrations/0036_section_active.py b/csm_web/scheduler/migrations/0036_section_active.py
new file mode 100644
index 000000000..1ca8d89c8
--- /dev/null
+++ b/csm_web/scheduler/migrations/0036_section_active.py
@@ -0,0 +1,19 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "scheduler",
+            "0035_course_max_waitlist_enroll_section_waitlist_capacity_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="section",
+            name="active",
+            field=models.BooleanField(db_index=True, default=True),
+        ),
+    ]
diff --git a/csm_web/scheduler/models.py b/csm_web/scheduler/models.py
index 4d3ff8aab..fa9e1fdeb 100644
--- a/csm_web/scheduler/models.py
+++ b/csm_web/scheduler/models.py
@@ -406,6 +406,7 @@ class Meta:
 
 class Section(ValidatingModel):
     # course = models.ForeignKey(Course, on_delete=models.CASCADE)
+    active = models.BooleanField(default=True, db_index=True)
     capacity = models.PositiveSmallIntegerField()
     waitlist_capacity = models.PositiveSmallIntegerField(default=DEFAULT_WAITLIST_CAP)
     mentor = OneToOneOrNoneField(
diff --git a/csm_web/scheduler/views/coord.py b/csm_web/scheduler/views/coord.py
index 3d5b6495a..689dd2638 100644
--- a/csm_web/scheduler/views/coord.py
+++ b/csm_web/scheduler/views/coord.py
@@ -26,9 +26,9 @@ def view_students(request, pk=None):
             "You do not have permission to view the coordinator view."
         )
 
-    students = Student.objects.filter(active=True, course=pk).order_by(
-        "user__first_name"
-    )
+    students = Student.objects.filter(
+        active=True, section__active=True, course=pk
+    ).order_by("user__first_name")
 
     return Response(CoordStudentSerializer(students, many=True).data)
 
@@ -52,7 +52,9 @@ def view_mentors(request, pk=None):
             "You do not have permission to view the coordinator view."
         )
 
-    mentors = Mentor.objects.filter(course=pk).order_by("user__first_name")
+    mentors = Mentor.objects.filter(course=pk, section__active=True).order_by(
+        "user__first_name"
+    )
     return Response(CoordMentorSerializer(mentors, many=True).data)
 
 
@@ -62,9 +64,9 @@ def delete_section(request, pk):
     Endpoint: /coord/<section id: int>/section
     pk = section id
 
-    Delete a section and all associated spacetimes and overrides.
+    Archive a section while preserving its enrollment and attendance history.
     """
-    section = get_object_or_error(Section.objects, pk=pk)
+    section = get_object_or_error(Section.objects, pk=pk, active=True)
     is_coord = bool(
         section.mentor.course.coordinator_set.filter(user=request.user).count()
     )
@@ -73,6 +75,6 @@ def delete_section(request, pk):
             "You do not have permission to view the coordinator view."
         )
 
-    # Delete the section itself, will cascade and delete everything else
-    section.delete()
+    section.active = False
+    section.save(update_fields=["active"])
     return Response(status=204)
diff --git a/csm_web/scheduler/views/course.py b/csm_web/scheduler/views/course.py
index ef858fba4..a98184a1a 100644
--- a/csm_web/scheduler/views/course.py
+++ b/csm_web/scheduler/views/course.py
@@ -29,26 +29,34 @@ def get_queryset(self):
             "section__mentor__course__id", flat=True
         )
         now = timezone.now().astimezone(timezone.get_default_timezone())
-        unrestricted_courses = set(Course.objects.filter(is_restricted=False).values_list('pk', flat=True))
+        unrestricted_courses = set(
+            Course.objects.filter(is_restricted=False).values_list("pk", flat=True)
+        )
         user = self.request.user
-        user_coords = set(user.coordinator_set.values_list('course__pk', flat=True))
-        user_mentors = set(user.mentor_set.values_list('course__pk', flat=True))
-        user_students = set(user.student_set.values_list('course__pk', flat=True))
-        user_whitelist = set(user.whitelist.values_list('pk', flat=True))
+        user_coords = set(user.coordinator_set.values_list("course__pk", flat=True))
+        user_mentors = set(user.mentor_set.values_list("course__pk", flat=True))
+        user_students = set(user.student_set.values_list("course__pk", flat=True))
+        user_whitelist = set(user.whitelist.values_list("pk", flat=True))
         # mentor/student/whitelist/unrestricted all have restriction of valid_until
-        course_pks_filter_valid = user_mentors | user_students | user_whitelist | unrestricted_courses
-        valid_courses = Course.objects.filter(pk__in=course_pks_filter_valid, valid_until__gte=now.date())
+        course_pks_filter_valid = (
+            user_mentors | user_students | user_whitelist | unrestricted_courses
+        )
+        valid_courses = Course.objects.filter(
+            pk__in=course_pks_filter_valid, valid_until__gte=now.date()
+        )
         # coord can still see invalid courses
-        coord_courses = Course.objects.exclude(pk__in=banned_from).filter(pk__in=user_coords)
+        coord_courses = Course.objects.exclude(pk__in=banned_from).filter(
+            pk__in=user_coords
+        )
 
-        return (valid_courses | coord_courses).distinct().order_by('name')
+        return (valid_courses | coord_courses).distinct().order_by("name")
 
     def get_sections_by_day(self, course):
         """Get a course's sections, grouped by the days the section occurs."""
         sections = (
             # get all mentor sections
             Section.objects.select_related("mentor")
-            .filter(mentor__course=course)
+            .filter(mentor__course=course, active=True)
             .annotate(
                 day_key=ArrayAgg(
                     "spacetimes__day_of_week",
@@ -132,9 +140,9 @@ def students(self, request):
         )
 
         response = HttpResponse(content_type="text/csv")
-        response[
-            "Content-Disposition"
-        ] = 'attachment; filename="csm-student-emails.csv"'
+        response["Content-Disposition"] = (
+            'attachment; filename="csm-student-emails.csv"'
+        )
         writer = csv.writer(response)
 
         for s in studs:
@@ -158,7 +166,7 @@ def whitelist(self, request, pk=None):
                 {"users": UserSerializer(whitelisted, many=True).data},
                 status=status.HTTP_200_OK,
             )
-        elif request.method == "PUT":
+        if request.method == "PUT":
             for email in request.data["emails"]:
                 if not email or "@" not in email:
                     # invalid or blank email
@@ -168,17 +176,17 @@ def whitelist(self, request, pk=None):
                     user, _ = User.objects.get_or_create(username=username, email=email)
                     course.whitelist.add(user)
             return Response({}, status=status.HTTP_200_OK)
-        elif request.method == "DELETE":
+        if request.method == "DELETE":
             for email in request.data["emails"]:
                 if not email or "@" not in email:
                     # invalid or blank email
                     pass
                 else:
                     username = email.split("@")[0]
-                    userQueryset = User.objects.filter(username=username, email=email)
+                    user_query_set = User.objects.filter(username=username, email=email)
                     # do nothing if user is not whitelisted
-                    if userQueryset.exists():
-                        user = userQueryset.get()
+                    if user_query_set.exists():
+                        user = user_query_set.get()
                         course.whitelist.remove(user)
             return Response({}, status=status.HTTP_200_OK)
 
diff --git a/csm_web/scheduler/views/profile.py b/csm_web/scheduler/views/profile.py
index fc34c5cc9..01019ed70 100644
--- a/csm_web/scheduler/views/profile.py
+++ b/csm_web/scheduler/views/profile.py
@@ -17,9 +17,13 @@ def list(self, request):
         return Response(
             ProfileSerializer(
                 [
-                    *request.user.student_set.filter(active=True, banned=False),
-                    *request.user.waitlistedstudent_set.filter(active=True),
-                    *request.user.mentor_set.all(),  # .exclude(section=None),
+                    *request.user.student_set.filter(
+                        active=True, banned=False, section__active=True
+                    ),
+                    *request.user.waitlistedstudent_set.filter(
+                        active=True, section__active=True
+                    ),
+                    *request.user.mentor_set.filter(section__active=True),
                     *request.user.coordinator_set.all(),
                 ],
                 many=True,
diff --git a/csm_web/scheduler/views/section.py b/csm_web/scheduler/views/section.py
index d9a22ff5c..5ef40759b 100644
--- a/csm_web/scheduler/views/section.py
+++ b/csm_web/scheduler/views/section.py
@@ -204,7 +204,7 @@ def add_from_waitlist(pk):
     cascade_section_id = None
     response = None
     with transaction.atomic():
-        section = Section.objects.select_for_update().get(pk=pk)
+        section = Section.objects.select_for_update().get(pk=pk, active=True)
         waitlisted_students = list(
             WaitlistedStudent.objects.select_for_update()
             .filter(active=True, section=section)
@@ -267,7 +267,8 @@ def get_queryset(self):
             "section__mentor__course__id", flat=True
         )
         return (
-            Section.objects.exclude(mentor__course__pk__in=banned_from)
+            Section.objects.filter(active=True)
+            .exclude(mentor__course__pk__in=banned_from)
             .prefetch_related(
                 Prefetch(
                     "spacetimes",
@@ -509,11 +510,11 @@ def students(self, request, pk=None):
             # We reload the section object for atomicity. Even though we do not update
             # the section directly, any student trying to enroll must first acquire a lock on the
             # desired section. This allows us to assume that current_student_count is correct.
-            section = get_object_or_error(Section.objects, pk=pk)
+            section = get_object_or_error(Section.objects, pk=pk, active=True)
             section = (
                 Section.objects.select_for_update()
                 .prefetch_related("mentor__course")
-                .get(pk=section.pk)
+                .get(pk=section.pk, active=True)
             )
             is_coordinator = bool(
                 section.mentor.course.coordinator_set.filter(user=request.user).count()
@@ -870,7 +871,7 @@ def wotd(self, request, pk=None):
                 { id: int, word: string }
                 where "id" is the section occurrence id
         """
-        section = get_object_or_error(Section.objects, pk=pk)
+        section = get_object_or_error(Section.objects, pk=pk, active=True)
         course = section.mentor.course
 
         is_student = Student.objects.filter(
diff --git a/csm_web/scheduler/views/spacetime.py b/csm_web/scheduler/views/spacetime.py
index c96b169db..f585e3418 100644
--- a/csm_web/scheduler/views/spacetime.py
+++ b/csm_web/scheduler/views/spacetime.py
@@ -18,8 +18,9 @@ class SpacetimeViewSet(viewsets.GenericViewSet):
 
     def get_queryset(self):
         return Spacetime.objects.filter(
+            Q(section__active=True),
             Q(section__mentor__user=self.request.user)
-            | Q(section__mentor__course__coordinator__user=self.request.user)
+            | Q(section__mentor__course__coordinator__user=self.request.user),
         ).distinct()
 
     def destroy(self, request, pk=None):
diff --git a/csm_web/scheduler/views/student.py b/csm_web/scheduler/views/student.py
index bffbba906..acbd7707b 100644
--- a/csm_web/scheduler/views/student.py
+++ b/csm_web/scheduler/views/student.py
@@ -16,12 +16,18 @@ class StudentViewSet(viewsets.GenericViewSet):
     serializer_class = StudentSerializer
 
     def get_queryset(self):
-        own_profiles = Student.objects.filter(user=self.request.user, active=True)
+        own_profiles = Student.objects.filter(
+            user=self.request.user, active=True, section__active=True
+        )
         pupil_profiles = Student.objects.filter(
-            section__mentor__user=self.request.user, active=True
+            section__mentor__user=self.request.user,
+            active=True,
+            section__active=True,
         )
         coordinator_student_profiles = Student.objects.filter(
-            section__mentor__course__coordinator__user=self.request.user, active=True
+            section__mentor__course__coordinator__user=self.request.user,
+            active=True,
+            section__active=True,
         )
         return (own_profiles | pupil_profiles | coordinator_student_profiles).distinct()
 
diff --git a/csm_web/scheduler/views/waitlistedStudent.py b/csm_web/scheduler/views/waitlistedStudent.py
index 47ad799ed..8726eba6d 100644
--- a/csm_web/scheduler/views/waitlistedStudent.py
+++ b/csm_web/scheduler/views/waitlistedStudent.py
@@ -21,7 +21,7 @@ def view(request, pk=None):
 
     GET: View all students on the waitlist for a section
     """
-    section = get_object_or_error(Section.objects, pk=pk)
+    section = get_object_or_error(Section.objects, pk=pk, active=True)
     if section.mentor is None:
         raise NotFound("This section has no mentor assigned.")
     is_mentor = request.user == section.mentor.user
@@ -51,8 +51,8 @@ def add(request, pk=None):
     """
 
     with transaction.atomic():
-        section = get_object_or_error(Section.objects, pk=pk)
-        section = Section.objects.select_for_update().get(pk=section.pk)
+        section = get_object_or_error(Section.objects, pk=pk, active=True)
+        section = Section.objects.select_for_update().get(pk=section.pk, active=True)
         student = request.user
 
         response = _add_to_waitlist_or_section(
@@ -84,7 +84,7 @@ def add_by_coord(request, pk=None):
         emails: list of {"email": str}
     """
 
-    section = get_object_or_error(Section.objects, pk=pk)
+    section = get_object_or_error(Section.objects, pk=pk, active=True)
 
     is_coord = bool(
         section.mentor.course.coordinator_set.filter(user=request.user).count()
@@ -119,7 +119,9 @@ def add_by_coord(request, pk=None):
     any_errors = False
     for email in emails:
         with transaction.atomic():
-            section = Section.objects.select_for_update().get(pk=section.pk)
+            section = Section.objects.select_for_update().get(
+                pk=section.pk, active=True
+            )
             user, _ = User.objects.get_or_create(
                 username=email.split("@")[0], email=email
             )
@@ -263,7 +265,7 @@ def count_waitlist(request, pk=None):
     Endpoint: /api/waitlist/<pk>/count_waitlist
     pk= section id
     """
-    section = get_object_or_error(Section.objects, pk=pk)
+    section = get_object_or_error(Section.objects, pk=pk, active=True)
     return Response(section.current_waitlist_count)
 
 
@@ -278,7 +280,7 @@ def position(request, pk=None):
     Returns {"position": <int>} where position is 1-indexed rank among
     active waitlisted students.
     """
-    section = get_object_or_error(Section.objects, pk=pk)
+    section = get_object_or_error(Section.objects, pk=pk, active=True)
     waitlisted_student = WaitlistedStudent.objects.filter(
         active=True, section=section, user=request.user
     ).first()