Skip to content

Fix mark incomplete command for topics #2915

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

Merged
rtibbles merged 1 commit into from
Feb 8, 2021
Merged

Fix mark incomplete command for topics #2915

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
24 changes: 17 additions & 7 deletions contentcuration/contentcuration/management/commands/mark_incomplete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,33 @@ def handle(self, *args, **options):
# Mark invalid licenses
licensestart = time.time()
logging.info('Marking blank licenses...')
count = ContentNode.objects.exclude(complete=False, kind_id=content_kinds.TOPIC).filter(license__isnull=True).order_by().update(complete=False)
count = ContentNode.objects.exclude(kind_id=content_kinds.TOPIC) \
.exclude(complete=False) \
.filter(license__isnull=True) \
.order_by() \
.update(complete=False)
logging.info('Marked {} invalid licenses (finished in {})'.format(count, time.time() - licensestart))

licensestart = time.time()
logging.info('Marking blank license descriptions...')
custom_licenses = list(License.objects.filter(is_custom=True).values_list("pk", flat=True))
count = ContentNode.objects.exclude(complete=False, kind_id=content_kinds.TOPIC)\
.filter(license_id__in=custom_licenses).filter(Q(license_description__isnull=True) | Q(license_description=''))\
.order_by().update(complete=False)
count = ContentNode.objects.exclude(kind_id=content_kinds.TOPIC) \
.exclude(complete=False) \
.filter(license_id__in=custom_licenses) \
.filter(Q(license_description__isnull=True) | Q(license_description='')) \
.order_by() \
.update(complete=False)
logging.info('Marked {} invalid license descriptions (finished in {})'.format(count, time.time() - licensestart))

licensestart = time.time()
logging.info('Marking blank copyright holders...')
copyright_licenses = list(License.objects.filter(copyright_holder_required=True).values_list("pk", flat=True))
count = ContentNode.objects.exclude(complete=False, kind_id=content_kinds.TOPIC)\
.filter(license_id__in=copyright_licenses).filter(Q(copyright_holder__isnull=True) | Q(copyright_holder=''))\
.order_by().update(complete=False)
count = ContentNode.objects.exclude(kind_id=content_kinds.TOPIC) \
.exclude(complete=False) \
.filter(license_id__in=copyright_licenses) \
.filter(Q(copyright_holder__isnull=True) | Q(copyright_holder=''))\
.order_by() \
.update(complete=False)
logging.info('Marked {} invalid copyright holders (finished in {})'.format(count, time.time() - licensestart))

# Mark invalid file resources
Expand Down