Skip to content

Fix bitmask filtering by multiple labels for AND rather than OR #4233

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
merged 1 commit into from
Jul 19, 2023
Merged

Fix bitmask filtering by multiple labels for AND rather than OR #4233

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
10 changes: 9 additions & 1 deletion contentcuration/kolibri_public/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ def has_all_labels(self, field_name, labels):
annotations = {}
for bitmask_fieldname, bits in bits.items():
annotation_fieldname = "{}_{}".format(bitmask_fieldname, "masked")
filters[annotation_fieldname + "__gt"] = 0
# To get the correct result, i.e. an AND that all the labels are present,
# we need to check that the aggregated value is euqal to the bits.
# If we wanted an OR (which would check for any being present),
# we would have to use GREATER THAN 0 here.
filters[annotation_fieldname] = bits
# This ensures that the annotated value is the result of the AND operation
# so if all the values are present, the result will be the same as the bits
# but if any are missing, it will not be equal to the bits, but will only be
# 0 if none of the bits are present.
annotations[annotation_fieldname] = F(bitmask_fieldname).bitand(bits)

return self.annotate(**annotations).filter(**filters)
Expand Down