refactor: CourseArchiveStatus references CourseRun via FK

Replace the CourseKeyField on CourseArchiveStatus with a ForeignKey to
openedx_catalog.CourseRun, following the new "use a FK to CourseRun for
any model-level course reference" guidance from openedx-core. The public
API still identifies courses by their course_key string (never by
CourseRun's internal PK), so frontend consumers and the JSON contract
are unchanged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: kdmccormick

backend-plugin-sample/pyproject.toml

@@ -32,6 +32,7 @@ dependencies = [
     "djangorestframework",
     "django-filter",
     "edx-opaque-keys",
+    "openedx-core",
     "openedx-events",
     "openedx-filters",
     "openedx-atlas",

backend-plugin-sample/src/openedx_plugin_sample/migrations/0001_initial.py

@@ -1,78 +1,36 @@
-# Generated by Django 4.2.20 on 2025-04-14 12:39
+# Generated by Django 5.2.13 on 2026-05-14 01:13
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
-import opaque_keys.edx.django.models
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
+        ('openedx_catalog', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name="CourseArchiveStatus",
+            name='CourseArchiveStatus',
             fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "course_id",
-                    opaque_keys.edx.django.models.CourseKeyField(
-                        db_index=True,
-                        help_text="The unique identifier for the course.",
-                        max_length=255,
-                    ),
-                ),
-                (
-                    "is_archived",
-                    models.BooleanField(
-                        db_index=True,
-                        default=False,
-                        help_text="Whether the course is archived.",
-                    ),
-                ),
-                (
-                    "archive_date",
-                    models.DateTimeField(
-                        blank=True,
-                        help_text="The date and time when the course was archived.",
-                        null=True,
-                    ),
-                ),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "user",
-                    models.ForeignKey(
-                        help_text="The user who this archive status is for.",
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="course_archive_statuses",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_archived', models.BooleanField(db_index=True, default=False, help_text='Whether the course is archived.')),
+                ('archive_date', models.DateTimeField(blank=True, help_text='The date and time when the course was archived.', null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('course_run', models.ForeignKey(help_text='The course run that this archive status is for.', on_delete=django.db.models.deletion.CASCADE, related_name='archive_statuses', to='openedx_catalog.courserun')),
+                ('user', models.ForeignKey(help_text='The user who this archive status is for.', on_delete=django.db.models.deletion.CASCADE, related_name='course_archive_statuses', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                "verbose_name": "Course Archive Status",
-                "verbose_name_plural": "Course Archive Statuses",
-                "ordering": ["-updated_at"],
+                'verbose_name': 'Course Archive Status',
+                'verbose_name_plural': 'Course Archive Statuses',
+                'ordering': ['-updated_at'],
+                'constraints': [models.UniqueConstraint(fields=('course_run', 'user'), name='unique_user_course_archive_status')],
             },
         ),
-        migrations.AddConstraint(
-            model_name="coursearchivestatus",
-            constraint=models.UniqueConstraint(
-                fields=("course_id", "user"), name="unique_user_course_archive_status"
-            ),
-        ),
     ]

backend-plugin-sample/src/openedx_plugin_sample/models.py

@@ -4,7 +4,7 @@
 
 from django.contrib.auth import get_user_model
 from django.db import models
-from opaque_keys.edx.django.models import CourseKeyField
+from openedx_catalog.models import CourseRun
 
 
 class CourseArchiveStatus(models.Model):
@@ -16,8 +16,11 @@ class CourseArchiveStatus(models.Model):
     .. no_pii: This model does not store PII directly, only references to users via foreign keys.
     """
 
-    course_id = CourseKeyField(
-        max_length=255, db_index=True, help_text="The unique identifier for the course."
+    course_run = models.ForeignKey(
+        CourseRun,
+        on_delete=models.CASCADE,
+        related_name="archive_statuses",
+        help_text="The course run that this archive status is for.",
     )
 
     user = models.ForeignKey(
@@ -47,7 +50,9 @@ def __str__(self):
         Return a string representation of the course archive status.
         """
         # pylint: disable=no-member
-        return f"{self.course_id} - {self.user.username} - {'Archived' if self.is_archived else 'Not Archived'}"
+        # Identify the course by its course_key string, never by the internal PK.
+        archived = "Archived" if self.is_archived else "Not Archived"
+        return f"{self.course_run.course_key} - {self.user.username} - {archived}"
 
     class Meta:
         """
@@ -57,9 +62,9 @@ class Meta:
         verbose_name = "Course Archive Status"
         verbose_name_plural = "Course Archive Statuses"
         ordering = ["-updated_at"]
-        # Ensure combination of course_id and user is unique
+        # Ensure combination of course_run and user is unique
         constraints = [
             models.UniqueConstraint(
-                fields=["course_id", "user"], name="unique_user_course_archive_status"
+                fields=["course_run", "user"], name="unique_user_course_archive_status"
             )
         ]

backend-plugin-sample/src/openedx_plugin_sample/serializers.py

@@ -3,6 +3,7 @@
 """
 
 from django.contrib.auth import get_user_model
+from openedx_catalog.models import CourseRun
 from rest_framework import serializers
 
 from openedx_plugin_sample.models import CourseArchiveStatus
@@ -21,6 +22,16 @@ class CourseArchiveStatusSerializer(serializers.ModelSerializer):
         required=False,
     )
 
+    # The model stores a FK to CourseRun, but APIs should identify courses by
+    # their full course key string (e.g. "course-v1:edX+DemoX+Demo_Course"),
+    # never by CourseRun's internal integer PK. The slug field looks up the
+    # related CourseRun by its `course_key` for both reads and writes.
+    course_id = serializers.SlugRelatedField(
+        source="course_run",
+        slug_field="course_key",
+        queryset=CourseRun.objects.all(),
+    )
+
     class Meta:
         """
         Meta class for CourseArchiveStatusSerializer.
@@ -37,3 +48,14 @@ class Meta:
             "updated_at",
         ]
         read_only_fields = ["id", "created_at", "updated_at", "archive_date"]
+
+    def to_representation(self, instance):
+        """
+        Serialize the instance, casting course_id to a string.
+
+        CourseRun.course_key returns a CourseLocator (not a string), which the
+        default JSON encoder can't serialize, so we coerce to str on output.
+        """
+        data = super().to_representation(instance)
+        data["course_id"] = str(data["course_id"])
+        return data

backend-plugin-sample/src/openedx_plugin_sample/signals.py

@@ -128,5 +128,5 @@ def log_course_info_changed(signal, sender, catalog_info: CourseCatalogData, **k
     # Example: Update internal tracking
     # from .models import CourseArchiveStatus
     # CourseArchiveStatus.objects.filter(
-    #     course_id=catalog_info.course_key
+    #     course_run__course_key=catalog_info.course_key
     # ).update(last_catalog_update=timezone.now())

backend-plugin-sample/src/openedx_plugin_sample/views.py

@@ -5,6 +5,7 @@
 import logging
 
 from django.utils import timezone
+from django_filters import rest_framework as django_filters
 from django_filters.rest_framework import DjangoFilterBackend
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
@@ -64,6 +65,39 @@ class CourseArchiveStatusThrottle(UserRateThrottle):
     rate = "60/minute"
 
 
+class CourseArchiveStatusFilterSet(django_filters.FilterSet):
+    """
+    FilterSet for CourseArchiveStatus.
+
+    The model stores a FK to CourseRun, but the public API filters and orders
+    by the course_key string (never by the internal CourseRun PK).
+    """
+
+    # Map ?course_id=course-v1:... onto the FK's course_key column.
+    course_id = django_filters.CharFilter(field_name="course_run__course_key")
+
+    # Expose ?ordering=course_id (and other fields) without leaking the
+    # double-underscore FK lookup path.
+    ordering = django_filters.OrderingFilter(
+        fields=(
+            ("course_run__course_key", "course_id"),
+            ("user", "user"),
+            ("is_archived", "is_archived"),
+            ("archive_date", "archive_date"),
+            ("created_at", "created_at"),
+            ("updated_at", "updated_at"),
+        )
+    )
+
+    class Meta:
+        """
+        FilterSet Meta options for CourseArchiveStatus.
+        """
+
+        model = CourseArchiveStatus
+        fields = ["course_id", "user", "is_archived"]
+
+
 class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
     """
     API viewset for CourseArchiveStatus.
@@ -81,15 +115,7 @@ class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
         CourseArchiveStatusThrottle,
     ]
     filter_backends = [DjangoFilterBackend, filters.OrderingFilter]
-    filterset_fields = ["course_id", "user", "is_archived"]
-    ordering_fields = [
-        "course_id",
-        "user",
-        "is_archived",
-        "archive_date",
-        "created_at",
-        "updated_at",
-    ]
+    filterset_class = CourseArchiveStatusFilterSet
     ordering = ["-updated_at"]
 
     def get_queryset(self):
@@ -104,8 +130,9 @@ def get_queryset(self):
         # Validate query parameters to prevent injection
         self._validate_query_params()
 
-        # Always use select_related to avoid N+1 queries
-        base_queryset = CourseArchiveStatus.objects.select_related("user")
+        # Always use select_related to avoid N+1 queries when accessing
+        # related user and course_run (for course_key) fields.
+        base_queryset = CourseArchiveStatus.objects.select_related("user", "course_run")
 
         if user.is_staff or user.is_superuser:
             return base_queryset
@@ -172,7 +199,7 @@ def perform_create(self, serializer):
         # Log at debug level for normal operation
         logger.debug(
             "CourseArchiveStatus created: course_id=%s, user=%s, is_archived=%s",
-            instance.course_id,
+            instance.course_run.course_key,
             instance.user.username,
             instance.is_archived,
         )
@@ -218,7 +245,7 @@ def perform_update(self, serializer):
         # Log at debug level
         logger.debug(
             "CourseArchiveStatus updated: course_id=%s, user=%s, is_archived=%s",
-            updated_instance.course_id,
+            updated_instance.course_run.course_key,
             updated_instance.user.username,
             updated_instance.is_archived,
         )
@@ -232,7 +259,7 @@ def perform_destroy(self, instance):
         # Log at debug level before deletion
         logger.debug(
             "CourseArchiveStatus deleted: course_id=%s, user=%s, by=%s",
-            instance.course_id,
+            instance.course_run.course_key,
             instance.user.username,
             self.request.user.username,
         )

backend-plugin-sample/test_settings.py

@@ -47,6 +47,8 @@ def root(*args):
     "django_filters",
     "edx_django_utils.plugins",
     "django_extensions",
+    "organizations",
+    "openedx_catalog",
 ]
 
 # Dynamically add plugin apps - only using the LMS context for simplicity