Cavemanon/cavemanon-wagtail-personalisation
Archived
7
Fork 0
Code Issues Pull Requests Activity

Only loop through users once when saving static segments

Browse Source 
When saving a new static segment we count the matching users and
populate the segment from the database. Each of these requires us
to loop through all of the users, so it's better to do them at the
same time.
This commit is contained in:
Kaitlyn Crawford
2018-02-25 15:33:25 +02:00
parent 37243365a7
commit db2f82967e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/wagtail_personalisation/forms.py
View File

@ -87,7 +87,7 @@ class SegmentAdminForm(WagtailAdminModelForm):
if not self.instance.is_static: if not self.instance.is_static:
self.instance.count = 0 self.instance.count = 0
if is_new: if is_new and self.instance.is_static and not self.instance.all_rules_static:
rules = [ rules = [
form.instance for formset in self.formsets.values() form.instance for formset in self.formsets.values()
for form in formset for form in formset
@ -113,18 +113,20 @@ class SegmentAdminForm(WagtailAdminModelForm):
User = get_user_model() User = get_user_model()
users = User.objects.filter(is_active=True, is_staff=False) users = User.objects.filter(is_active=True, is_staff=False)
take_user = takewhile( matched_count = 0
lambda x: instance.count == 0 or len(users_to_add) <= instance.count, for user in users.iterator():
users
)
for user in take_user:
request.user = user request.user = user
passes = adapter._test_rules(instance.get_rules(), request, instance.match_any) passes = adapter._test_rules(instance.get_rules(), request, instance.match_any)
if passes and instance.randomise_into_segment(): if passes:
users_to_add.append(user) matched_count += 1
elif passes: if len(users_to_add) <= instance.count:
users_to_exclude.append(user) if instance.randomise_into_segment():
users_to_add.append(user)
else:
users_to_exclude.append(user)
instance.matched_users_count = matched_count
instance.matched_count_updated_at = datetime.now()
instance.static_users.add(*users_to_add) instance.static_users.add(*users_to_add)
instance.excluded_users.add(*users_to_exclude) instance.excluded_users.add(*users_to_exclude)