Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds Collection.key #223

Merged
merged 5 commits into from
Sep 10, 2024
Merged

Conversation

pomegranited
Copy link
Contributor

@pomegranited pomegranited commented Sep 3, 2024

Description

Adds a new required field to the Collection model: key (string), which uniquely identifies a Collection within a Learning Package.
Existing Collection keys are initialized with a random string.

Supporting information

Part of : openedx/modular-learning#226

Private-ref: FAL-3783

Testing instructions

See openedx/edx-platform#35321 for full testing instructions.

Testing migrations:

In an openedx-learning virtual environment, run:

  1. Create an openedx-learning virtual environment
  2. Install openedx-learning @ main, and run python3 manage.py migrate
  3. Create a collection python3 manage.py shell:
    import openedx_learning.api.authoring as api
    learning_package = api.create_learning_package("LP1", "Learning Package 1")
    for x in range(0, 11):
        api.create_collection(learning_package.id, title=f"Collection {x}", created_by=None)
        # <Collection> (1:Collection 1)
        # <Collection> (2:Collection 2)
        ...
        # <Collection> (10:Collection 10)
    
  4. Install openedx-learning @ open-craft/jill/collection-key
  5. Run python3 manage.py migrate
  6. Check that a key was generated for your collection python3 manage.py shell:
    import openedx_learning.api.authoring as api
    learning_package = api.get_learning_package_by_key("LP1")
    collections = api.get_collections(learning_package.id)
    for collection in collections.all():
        print(collection.key)
        # gy19KxxV9xrjEMmR4TRNeE2p8sEbQfetVjZPzKPUbHURAgAgJY
        # RNeE2p8sEbQfetVjZPzKPUbgy19KxxV9xrjEMmR4TRNeE2p8sEb
        ...
    

@openedx-webhooks
Copy link

openedx-webhooks commented Sep 3, 2024

Thanks for the pull request, @pomegranited!

What's next?

Please work through the following steps to get your changes ready for engineering review:

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.

🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

🔘 Let us know that your PR is ready for review:

Who will review my changes?

This repository is currently maintained by @axim-engineering. Tag them in a comment and let them know that your changes are ready for review.

Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Sep 3, 2024
which uniquely identifies a Collection within a Learning Package.

Existing Collection keys are initialized with a random string.
to identify Collections. We do this because the `key` will be used in
the Collection's opaque key (not the ID).
Copy link
Contributor

@rpenido rpenido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @pomegranited! This is looking good!

Only a few nits

openedx_learning/apps/authoring/collections/models.py Outdated Show resolved Hide resolved
@@ -165,7 +186,7 @@ def __str__(self) -> str:
"""
User-facing string representation of a Collection.
"""
return f"<{self.__class__.__name__}> ({self.id}:{self.title})"
return f"<{self.__class__.__name__}> ({self.key}:{self.title})"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would not be unique. Do you think we should add the library key here?

Copy link
Contributor Author

@pomegranited pomegranited Sep 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, see bdcb52b

collection_id: int,
learning_package_id: int,
key: str,
*,
title: str | None = None,
description: str | None = None,
Copy link
Contributor

@rpenido rpenido Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for not catching this before. 😞
I think we should be able to update the key here.

Suggested change
description: str | None = None,
description: str | None = None,
new_key: str,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. if we allow that, it'll change the Collection's opaque key, which will disconnect it from any applied tags.. so I think it should be immutable.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right! My bad!

Copy link
Contributor

@rpenido rpenido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍
Thank you for your work, @pomegranited!

I commented about adding a new parameter to allow the user to update the key. Other than that, everything is good on my end.

@pomegranited
Copy link
Contributor Author

Hi @ormsbee , this is a minor PR, but I'd appreciate your review if you have time?

Copy link
Contributor

@rpenido rpenido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the changes, @pomegranited!

LGTM 👍

@pomegranited pomegranited merged commit 6fa83ba into openedx:main Sep 10, 2024
9 checks passed
@pomegranited pomegranited deleted the jill/collection-key branch September 10, 2024 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants