openedx-learning 0.11.3__tar.gz → 0.11.5__tar.gz

{openedx_learning-0.11.3/openedx_learning.egg-info → openedx_learning-0.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.11.3
+Version: 0.11.5
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -9,7 +9,7 @@ License: AGPL 3.0
 Keywords: Python edx
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Natural Language :: English
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
+Requires-Dist: celery
 Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
-Requires-Dist: edx-drf-extensions
 Requires-Dist: attrs
+Requires-Dist: djangorestframework<4.0
 Requires-Dist: rules<4.0
-Requires-Dist: celery
+Requires-Dist: edx-drf-extensions
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning/__init__.py

@@ -1,4 +1,4 @@
 """
 Open edX Learning ("Learning Core").
 """
-__version__ = "0.11.3"
+__version__ = "0.11.5"

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning/apps/authoring/collections/api.py

@@ -30,6 +30,8 @@ __all__ = [
 
 def create_collection(
     learning_package_id: int,
+    key: str,
+    *,
     title: str,
     created_by: int | None,
     description: str = "",
@@ -40,6 +42,7 @@ def create_collection(
     """
     collection = Collection.objects.create(
         learning_package_id=learning_package_id,
+        key=key,
         title=title,
         created_by_id=created_by,
         description=description,
@@ -48,22 +51,24 @@ def create_collection(
     return collection
 
 
-def get_collection(collection_id: int) -> Collection:
+def get_collection(learning_package_id: int, collection_key: str) -> Collection:
     """
     Get a Collection by ID
     """
-    return Collection.objects.get(id=collection_id)
+    return Collection.objects.get_by_key(learning_package_id, collection_key)
 
 
 def update_collection(
-    collection_id: int,
+    learning_package_id: int,
+    key: str,
+    *,
     title: str | None = None,
     description: str | None = None,
 ) -> Collection:
     """
-    Update a Collection
+    Update a Collection identified by the learning_package_id + key.
     """
-    collection = Collection.objects.get(id=collection_id)
+    collection = get_collection(learning_package_id, key)
 
     # If no changes were requested, there's nothing to update, so just return
     # the Collection as-is
@@ -80,7 +85,8 @@ def update_collection(
 
 
 def add_to_collection(
-    collection_id: int,
+    learning_package_id: int,
+    key: str,
     entities_qset: QuerySet[PublishableEntity],
     created_by: int | None = None,
 ) -> Collection:
@@ -95,17 +101,15 @@ def add_to_collection(
 
     Returns the updated Collection object.
     """
-    collection = get_collection(collection_id)
-    learning_package_id = collection.learning_package_id
-
     # Disallow adding entities outside the collection's learning package
     invalid_entity = entities_qset.exclude(learning_package_id=learning_package_id).first()
     if invalid_entity:
         raise ValidationError(
             f"Cannot add entity {invalid_entity.pk} in learning package {invalid_entity.learning_package_id} "
-            f"to collection {collection_id} in learning package {learning_package_id}."
+            f"to collection {key} in learning package {learning_package_id}."
         )
 
+    collection = get_collection(learning_package_id, key)
     collection.entities.add(
         *entities_qset.all(),
         through_defaults={"created_by_id": created_by},
@@ -117,7 +121,8 @@ def add_to_collection(
 
 
 def remove_from_collection(
-    collection_id: int,
+    learning_package_id: int,
+    key: str,
     entities_qset: QuerySet[PublishableEntity],
 ) -> Collection:
     """
@@ -129,7 +134,7 @@ def remove_from_collection(
 
     Returns the updated Collection.
     """
-    collection = get_collection(collection_id)
+    collection = get_collection(learning_package_id, key)
 
     collection.entities.remove(*entities_qset.all())
     collection.modified = datetime.now(tz=timezone.utc)

openedx_learning-0.11.5/openedx_learning/apps/authoring/collections/migrations/0004_collection_key.py

@@ -0,0 +1,57 @@
+# Generated by Django 4.2.15 on 2024-09-04 23:15
+
+from django.db import migrations, models
+from django.utils.crypto import get_random_string
+
+import openedx_learning.lib.fields
+
+
+def generate_keys(apps, schema_editor):
+    """
+    Generates a random strings to initialize the key field where NULL.
+    """
+    length = 50
+    Collection = apps.get_model("oel_collections", "Collection")
+    for collection in Collection.objects.filter(key=None):
+        # Keep generating keys until we get a unique one
+        key = get_random_string(length)
+        while Collection.objects.filter(key=key).exists():
+            key = get_random_string(length)
+
+        collection.key = key
+        collection.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oel_collections', '0003_collection_entities'),
+    ]
+
+    operations = [
+        # 1. Temporarily add this field with null=True, blank=True
+        migrations.AddField(
+            model_name='collection',
+            name='key',
+            field=openedx_learning.lib.fields.MultiCollationCharField(
+                db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'},
+                db_column='_key', max_length=500, null=True, blank=True),
+            preserve_default=False,
+        ),
+        # 2. Populate the null keys
+        migrations.RunPython(generate_keys),
+        # 3. Add null=False, blank=False to disallow NULL values
+        migrations.AlterField(
+            model_name='collection',
+            name='key',
+            field=openedx_learning.lib.fields.MultiCollationCharField(
+                db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'},
+                db_column='_key', max_length=500, null=False, blank=False),
+            preserve_default=False,
+        ),
+        # 4. Enforce unique constraint
+        migrations.AddConstraint(
+            model_name='collection',
+            constraint=models.UniqueConstraint(fields=('learning_package', 'key'), name='oel_coll_uniq_lp_key'),
+        ),
+    ]

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning/apps/authoring/collections/models.py

@@ -70,8 +70,9 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from ....lib.fields import MultiCollationTextField, case_insensitive_char_field
-from ....lib.validators import validate_utc_datetime
+from openedx_learning.lib.fields import MultiCollationTextField, case_insensitive_char_field, key_field
+from openedx_learning.lib.validators import validate_utc_datetime
+
 from ..publishing.models import LearningPackage, PublishableEntity
 
 __all__ = [
@@ -80,16 +81,35 @@ __all__ = [
 ]
 
 
+class CollectionManager(models.Manager):
+    """
+    Custom manager for Collection class.
+    """
+    def get_by_key(self, learning_package_id: int, key: str):
+        """
+        Get the Collection for the given Learning Package + key.
+        """
+        return self.select_related('learning_package') \
+                   .get(learning_package_id=learning_package_id, key=key)
+
+
 class Collection(models.Model):
     """
     Represents a collection of library components
     """
+    objects: CollectionManager[Collection] = CollectionManager()
 
     id = models.AutoField(primary_key=True)
 
     # Each collection belongs to a learning package
     learning_package = models.ForeignKey(LearningPackage, on_delete=models.CASCADE)
 
+    # Every collection is uniquely and permanently identified within its learning package
+    # by a 'key' that is set during creation. Both will appear in the
+    # collection's opaque key:
+    # e.g. "lib-collection:lib:key" is the opaque key for a library collection.
+    key = key_field(db_column='_key')
+
     title = case_insensitive_char_field(
         null=False,
         blank=False,
@@ -151,6 +171,16 @@ class Collection(models.Model):
 
     class Meta:
         verbose_name_plural = "Collections"
+        constraints = [
+            # Keys are unique within a given LearningPackage.
+            models.UniqueConstraint(
+                fields=[
+                    "learning_package",
+                    "key",
+                ],
+                name="oel_coll_uniq_lp_key",
+            ),
+        ]
         indexes = [
             models.Index(fields=["learning_package", "title"]),
         ]
@@ -165,7 +195,7 @@ class Collection(models.Model):
         """
         User-facing string representation of a Collection.
         """
-        return f"<{self.__class__.__name__}> ({self.id}:{self.title})"
+        return f"<{self.__class__.__name__}> (lp:{self.learning_package_id} {self.key}:{self.title})"
 
 
 class CollectionPublishableEntity(models.Model):

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning/apps/authoring/publishing/model_mixins.py

@@ -60,6 +60,10 @@ class PublishableEntityMixin(models.Model):
     def created(self):
         return self.publishable_entity.created
 
+    @property
+    def created_by(self):
+        return self.publishable_entity.created_by
+
     class Meta:
         abstract = True
 

{openedx_learning-0.11.3 → openedx_learning-0.11.5/openedx_learning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.11.3
+Version: 0.11.5
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -9,7 +9,7 @@ License: AGPL 3.0
 Keywords: Python edx
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Natural Language :: English
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
+Requires-Dist: celery
 Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
-Requires-Dist: edx-drf-extensions
 Requires-Dist: attrs
+Requires-Dist: djangorestframework<4.0
 Requires-Dist: rules<4.0
-Requires-Dist: celery
+Requires-Dist: edx-drf-extensions
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ openedx_learning/apps/authoring/collections/models.py
 openedx_learning/apps/authoring/collections/migrations/0001_initial.py
 openedx_learning/apps/authoring/collections/migrations/0002_remove_collection_name_collection_created_by_and_more.py
 openedx_learning/apps/authoring/collections/migrations/0003_collection_entities.py
+openedx_learning/apps/authoring/collections/migrations/0004_collection_key.py
 openedx_learning/apps/authoring/collections/migrations/__init__.py
 openedx_learning/apps/authoring/components/__init__.py
 openedx_learning/apps/authoring/components/admin.py

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/setup.py

@@ -85,7 +85,7 @@ setup(
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Natural Language :: English',

{openedx_learning-0.11.3 → openedx_learning-0.11.5}/openedx_learning.egg-info/requires.txt

@@ -1,6 +1,6 @@
+celery
 Django<5.0
-djangorestframework<4.0
-edx-drf-extensions
 attrs
+djangorestframework<4.0
 rules<4.0
-celery
+edx-drf-extensions