Skip to content

Fix package_content conversion error when adding packages from PurlDB #472

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.

Sign up for GitHub

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

Open
Kaushik-Kumar-CEG wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

Fix package_content conversion error when adding packages from PurlDB #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion component_catalog/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2660,7 +2660,10 @@ def update_from_purldb(self, user):

if package_content := package_data.get("package_content"):
package_content_value = Package.get_package_content_value_from_label(package_content)
package_data["package_content"] = package_content_value
if package_content_value is not None:
package_data["package_content"] = package_content_value
else:
package_data.pop("package_content", None)

# Avoid raising an IntegrityError when the values in `package_data` for the
# identifier fields already exist on another Package instance.
Expand Down
3 changes: 2 additions & 1 deletion component_catalog/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,8 @@ def get_initial(self):

# Convert package_content string label to integer value
if content_label := purldb_entry.pop("package_content", None):
if content_value := Package.get_package_content_value_from_label(content_label):
content_value = Package.get_package_content_value_from_label(content_label)
if content_value is not None:
purldb_entry["package_content"] = content_value

model_fields = [field.name for field in Package._meta.get_fields()]
Expand Down