openedx-plugin-sample 3.1.0__tar.gz → 3.2.0__tar.gz

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/.annotation_safe_list.yml

@@ -39,3 +39,11 @@ waffle.Sample:
   ".. no_pii:": "This model has no PII"
 waffle.Switch:
   ".. no_pii:": "This model has no PII"
+openedx_catalog.CatalogCourse:
+  ".. no_pii:": "This model has no PII"
+openedx_catalog.CourseRun:
+  ".. no_pii:": "This model has no PII"
+organizations.HistoricalOrganization:
+  ".. no_pii:": "This model has no PII"
+organizations.HistoricalOrganizationCourse:
+  ".. no_pii:": "This model has no PII"

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openedx-plugin-sample
-Version: 3.1.0
+Version: 3.2.0
 Summary: A sample backend plugin for the Open edX Platform
 Author-email: Open edX Project <oscm@openedx.org>
 License-Expression: Apache-2.0
@@ -21,6 +21,7 @@ Requires-Dist: Django
 Requires-Dist: djangorestframework
 Requires-Dist: django-filter
 Requires-Dist: edx-opaque-keys
+Requires-Dist: openedx-core
 Requires-Dist: openedx-events
 Requires-Dist: openedx-filters
 Requires-Dist: openedx-atlas

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/pyproject.toml

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

openedx_plugin_sample-3.2.0/src/openedx_plugin_sample/admin.py

@@ -0,0 +1,55 @@
+"""
+Django admin configuration for openedx_plugin_sample.
+
+This module demonstrates how to expose plugin models in the Django admin
+site provided by Open edX (LMS and CMS each have their own admin under
+``/admin/``). Defining a ``ModelAdmin`` for each model gives operators a
+ready-made UI to inspect and manage plugin data without needing custom
+tooling.
+
+Django Documentation:
+- ModelAdmin: https://docs.djangoproject.com/en/stable/ref/contrib/admin/
+"""
+
+from django.contrib import admin
+
+from openedx_plugin_sample.models import CourseArchiveStatus
+
+
+@admin.register(CourseArchiveStatus)
+class CourseArchiveStatusAdmin(admin.ModelAdmin):
+    """
+    Admin configuration for the CourseArchiveStatus model.
+    """
+
+    list_display = (
+        "course_key",
+        "user",
+        "is_archived",
+        "archive_date",
+        "updated_at",
+    )
+    list_filter = ("is_archived",)
+    # Search by the related CourseRun's course_key and the user's username/email.
+    search_fields = (
+        "course_run__course_key",
+        "user__username",
+        "user__email",
+    )
+    # FKs use raw id widgets (lookup popup) rather than a <select>, since the
+    # CourseRun and User tables can have many thousands of rows on a real
+    # Open edX deployment.
+    raw_id_fields = ("course_run", "user")
+    readonly_fields = ("created_at", "updated_at")
+    ordering = ("-updated_at",)
+
+    @admin.display(description="Course key", ordering="course_run__course_key")
+    def course_key(self, obj: CourseArchiveStatus) -> str:
+        """
+        Show the course's course_key string in list_display.
+
+        We never expose CourseRun's internal integer PK in the admin; the
+        course_key (e.g. "course-v1:edX+DemoX+Demo_Course") is the identifier
+        operators recognize.
+        """
+        return str(obj.course_run.course_key)

openedx_plugin_sample-3.2.0/src/openedx_plugin_sample/migrations/0001_initial.py

@@ -0,0 +1,36 @@
+# 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
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('openedx_catalog', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CourseArchiveStatus',
+            fields=[
+                ('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'],
+                'constraints': [models.UniqueConstraint(fields=('course_run', 'user'), name='unique_user_course_archive_status')],
+            },
+        ),
+    ]

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample/models.py

@@ -4,7 +4,7 @@ Database models for openedx_plugin_sample.
 
 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 @@ class CourseArchiveStatus(models.Model):
         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 CourseArchiveStatus(models.Model):
         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"
             )
         ]

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample/pipeline.py

@@ -35,7 +35,7 @@ Common Use Cases:
 - Data transformation and validation
 - Integration with external systems
 - Custom business logic implementation
-"""  # pylint: disable=line-too-long
+"""
 
 import logging
 
@@ -78,7 +78,8 @@ class AddArchiveStatusToLearnerHomeCourseRun(PipelineStep):
             return serialized_courserun
         try:
             is_archived_by_learner = CourseArchiveStatus.objects.get(
-                user=request.user, course_id=serialized_courserun["courseId"]
+                user=request.user,
+                course_run__course_key=serialized_courserun["courseId"],
             ).is_archived
         except CourseArchiveStatus.DoesNotExist:
             is_archived_by_learner = False

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample/serializers.py

@@ -3,6 +3,7 @@ Serializers for the openedx_plugin_sample app.
 """
 
 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 CourseArchiveStatusSerializer(serializers.ModelSerializer):
             "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

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample/signals.py

@@ -54,7 +54,7 @@ def unarchive_on_verified_upgrade(
 
     updated = CourseArchiveStatus.objects.filter(
         user_id=enrollment.user.id,
-        course_id=enrollment.course.course_key,
+        course_run__course_key=enrollment.course.course_key,
         is_archived=True,
     ).update(is_archived=False, archive_date=None)
 

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample/views.py

@@ -5,6 +5,7 @@ Views for the openedx_plugin_sample app.
 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 @@ class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
         # 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 @@ class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
         # 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 @@ class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
         # 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 @@ class CourseArchiveStatusViewSet(viewsets.ModelViewSet):
         # 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,
         )

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openedx-plugin-sample
-Version: 3.1.0
+Version: 3.2.0
 Summary: A sample backend plugin for the Open edX Platform
 Author-email: Open edX Project <oscm@openedx.org>
 License-Expression: Apache-2.0
@@ -21,6 +21,7 @@ Requires-Dist: Django
 Requires-Dist: djangorestframework
 Requires-Dist: django-filter
 Requires-Dist: edx-opaque-keys
+Requires-Dist: openedx-core
 Requires-Dist: openedx-events
 Requires-Dist: openedx-filters
 Requires-Dist: openedx-atlas

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ docs/how-tos/index.rst
 docs/quickstarts/index.rst
 docs/references/index.rst
 src/openedx_plugin_sample/__init__.py
+src/openedx_plugin_sample/admin.py
 src/openedx_plugin_sample/apps.py
 src/openedx_plugin_sample/models.py
 src/openedx_plugin_sample/pipeline.py

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/src/openedx_plugin_sample.egg-info/requires.txt

@@ -2,6 +2,7 @@ Django
 djangorestframework
 django-filter
 edx-opaque-keys
+openedx-core
 openedx-events
 openedx-filters
 openedx-atlas

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/test_settings.py

@@ -47,6 +47,8 @@ INSTALLED_APPS = [
     "django_filters",
     "edx_django_utils.plugins",
     "django_extensions",
+    "organizations",
+    "openedx_catalog",
 ]
 
 # Dynamically add plugin apps - only using the LMS context for simplicity

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/tests/test_api.py

@@ -8,6 +8,7 @@ import pytest
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 from opaque_keys.edx.keys import CourseKey
+from openedx_catalog.api import create_course_run_for_modulestore_course_with
 from rest_framework import status
 from rest_framework.test import APIClient
 
@@ -70,12 +71,24 @@ def course_key():
 
 
 @pytest.fixture
-def course_archive_status(user, course_key):
+def course_run(course_key):
+    """
+    Create and return a test CourseRun (plus its Organization and CatalogCourse)
+    matching the `course_key` fixture, so that API requests that POST/PATCH the
+    public `course_id` string can resolve it to this CourseRun.
+    """
+    return create_course_run_for_modulestore_course_with(
+        course_key, title="Demo Course"
+    )
+
+
+@pytest.fixture
+def course_archive_status(user, course_run):
     """
     Create and return a test course archive status.
     """
     return CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=False
+        course_run=course_run, user=user, is_archived=False
     )
 
 
@@ -93,7 +106,7 @@ def test_list_course_archive_status_authenticated(
     assert response.status_code == status.HTTP_200_OK
     assert response.data["count"] == 1
     assert response.data["results"][0]["course_id"] == str(
-        course_archive_status.course_id
+        course_archive_status.course_run.course_key
     )
     assert response.data["results"][0]["user"] == user.id
     assert (
@@ -114,17 +127,23 @@ def test_list_course_archive_status_unauthenticated(api_client):
 
 @pytest.mark.django_db
 def test_list_course_archive_status_staff_can_see_all(
-    api_client, staff_user, user, another_user, course_key
+    api_client, staff_user, user, another_user, course_run
 ):
     """
     Test that a staff user can list all course archive statuses.
     """
+    # A second CourseRun (with its own CatalogCourse/Organization) for the second status.
+    course_run_2 = create_course_run_for_modulestore_course_with(
+        CourseKey.from_string("course-v1:edX+DemoX+Demo_Course2"),
+        title="Demo Course 2",
+    )
+
     # Create archive statuses for both users
     CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=False
+        course_run=course_run, user=user, is_archived=False
     )
     CourseArchiveStatus.objects.create(
-        course_id=CourseKey.from_string("course-v1:edX+DemoX+Demo_Course2"),
+        course_run=course_run_2,
         user=another_user,
         is_archived=True,
     )
@@ -138,7 +157,7 @@ def test_list_course_archive_status_staff_can_see_all(
 
 
 @pytest.mark.django_db
-def test_create_course_archive_status(api_client, user, course_key):
+def test_create_course_archive_status(api_client, user, course_key, course_run):
     """
     Test that a user can create a course archive status.
     """
@@ -159,13 +178,14 @@ def test_create_course_archive_status(api_client, user, course_key):
 
     # Verify in database
     course_archive_status = CourseArchiveStatus.objects.get(
-        course_id=course_key, user=user
+        course_run=course_run, user=user
     )
     assert course_archive_status.is_archived is True
     assert course_archive_status.archive_date is not None
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures("course_run")
 def test_create_course_archive_status_for_another_user(
     api_client, user, another_user, course_key
 ):
@@ -185,6 +205,7 @@ def test_create_course_archive_status_for_another_user(
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures("course_run")
 def test_staff_create_course_archive_status_for_another_user(
     api_client, staff_user, user, course_key
 ):
@@ -281,7 +302,9 @@ def test_staff_can_update_other_user_course_archive_status(
 
 # New tests for optional user field behavior
 @pytest.mark.django_db
-def test_create_course_archive_status_without_user_field(api_client, user, course_key):
+def test_create_course_archive_status_without_user_field(
+    api_client, user, course_key, course_run
+):
     """
     Test that a user can create a course archive status without specifying user field.
     The user field should default to the current user.
@@ -307,7 +330,7 @@ def test_create_course_archive_status_without_user_field(api_client, user, cours
 
     # Verify in database
     course_archive_status = CourseArchiveStatus.objects.get(
-        course_id=course_key, user=user
+        course_run=course_run, user=user
     )
     assert course_archive_status.is_archived is True
     assert course_archive_status.user == user
@@ -340,7 +363,7 @@ def test_update_course_archive_status_without_user_field(api_client, user, cours
 
 @pytest.mark.django_db
 def test_staff_create_with_explicit_user_override(
-    api_client, staff_user, user, course_key
+    api_client, staff_user, user, course_key, course_run
 ):
     """
     Test that staff can explicitly set user field to override default behavior.
@@ -361,7 +384,7 @@ def test_staff_create_with_explicit_user_override(
 
     # Verify in database
     course_archive_status = CourseArchiveStatus.objects.get(
-        course_id=course_key, user=user
+        course_run=course_run, user=user
     )
     assert course_archive_status.user == user
     assert course_archive_status.user != staff_user
@@ -369,14 +392,14 @@ def test_staff_create_with_explicit_user_override(
 
 @pytest.mark.django_db
 def test_staff_update_with_explicit_user_override(
-    api_client, staff_user, user, another_user, course_key
+    api_client, staff_user, user, another_user, course_run
 ):
     """
     Test that staff can explicitly change user field when updating.
     """
     # Create initial record for user
     initial_status = CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=False
+        course_run=course_run, user=user, is_archived=False
     )
 
     api_client.force_authenticate(user=staff_user)
@@ -400,6 +423,7 @@ def test_staff_update_with_explicit_user_override(
 
 
 @pytest.mark.django_db
+@pytest.mark.usefixtures("course_run")
 def test_regular_user_cannot_override_user_field_create(
     api_client, user, another_user, course_key
 ):
@@ -420,7 +444,7 @@ def test_regular_user_cannot_override_user_field_create(
 
 @pytest.mark.django_db
 def test_staff_create_without_user_field_defaults_to_current_user(
-    api_client, staff_user, course_key
+    api_client, staff_user, course_key, course_run
 ):
     """
     Test that even staff users get records created for themselves when no user specified.
@@ -441,6 +465,6 @@ def test_staff_create_without_user_field_defaults_to_current_user(
 
     # Verify in database
     course_archive_status = CourseArchiveStatus.objects.get(
-        course_id=course_key, user=staff_user
+        course_run=course_run, user=staff_user
     )
     assert course_archive_status.user == staff_user

{openedx_plugin_sample-3.1.0 → openedx_plugin_sample-3.2.0}/tests/test_models.py

@@ -8,6 +8,7 @@ import pytest
 from django.contrib.auth import get_user_model
 from django.db.utils import IntegrityError
 from opaque_keys.edx.keys import CourseKey
+from openedx_catalog.api import create_course_run_for_modulestore_course_with
 
 from openedx_plugin_sample.models import CourseArchiveStatus
 
@@ -38,24 +39,27 @@ def staff_user():
 
 
 @pytest.fixture
-def course_key():
+def course_run():
     """
-    Create and return a test course key.
+    Create and return a test CourseRun (plus its Organization and CatalogCourse).
     """
-    return CourseKey.from_string("course-v1:edX+DemoX+Demo_Course")
+    return create_course_run_for_modulestore_course_with(
+        CourseKey.from_string("course-v1:edX+DemoX+Demo_Course"),
+        title="Demo Course",
+    )
 
 
 @pytest.mark.django_db
-def test_course_archive_status_creation(user, course_key):
+def test_course_archive_status_creation(user, course_run):
     """
     Test that a CourseArchiveStatus can be created with valid data.
     """
     course_archive_status = CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=False
+        course_run=course_run, user=user, is_archived=False
     )
 
     assert course_archive_status.pk is not None
-    assert course_archive_status.course_id == course_key
+    assert course_archive_status.course_run == course_run
     assert course_archive_status.user == user
     assert course_archive_status.is_archived is False
     assert course_archive_status.archive_date is None
@@ -64,35 +68,35 @@ def test_course_archive_status_creation(user, course_key):
 
 
 @pytest.mark.django_db
-def test_course_archive_status_uniqueness(user, course_key):
+def test_course_archive_status_uniqueness(user, course_run):
     """
-    Test that a CourseArchiveStatus must be unique per user and course_id.
+    Test that a CourseArchiveStatus must be unique per user and course_run.
     """
     CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=False
+        course_run=course_run, user=user, is_archived=False
     )
 
-    # Creating another with same user and course_id should raise an IntegrityError
+    # Creating another with same user and course_run should raise an IntegrityError
     with pytest.raises(IntegrityError):
         CourseArchiveStatus.objects.create(
-            course_id=course_key, user=user, is_archived=True
+            course_run=course_run, user=user, is_archived=True
         )
 
 
 @pytest.mark.django_db
-def test_course_archive_status_str_method(user, course_key):
+def test_course_archive_status_str_method(user, course_run):
     """
     Test the string representation of CourseArchiveStatus.
     """
     course_archive_status = CourseArchiveStatus.objects.create(
-        course_id=course_key, user=user, is_archived=True
+        course_run=course_run, user=user, is_archived=True
     )
 
-    expected_str = f"{course_key} - {user.username} - Archived"
+    expected_str = f"{course_run.course_key} - {user.username} - Archived"
     assert str(course_archive_status) == expected_str
 
     course_archive_status.is_archived = False
     course_archive_status.save()
 
-    expected_str = f"{course_key} - {user.username} - Not Archived"
+    expected_str = f"{course_run.course_key} - {user.username} - Not Archived"
     assert str(course_archive_status) == expected_str