Make the static segments work with match_any and fix bug in visit count

src/wagtail_personalisation/adapters.py

@@ -144,7 +144,7 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
 
     def get_visit_count(self, page=None):
         """Return the number of visits on the current request or given page"""
-        path = page.path if page else self.request.path
+        path = page.url_path if page else self.request.path
         visit_count = self.request.session.setdefault('visit_count', [])
         for visit in visit_count:
             if visit['path'] == path:

src/wagtail_personalisation/forms.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals
+
 from importlib import import_module
 
 from django.conf import settings
@@ -11,6 +13,7 @@ from django.utils.lru_cache import lru_cache
 from wagtail.wagtailadmin.forms import WagtailAdminModelForm
 
 
+
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
 
 
@@ -43,15 +46,21 @@ class SegmentAdminForm(WagtailAdminModelForm):
         instance = super(SegmentAdminForm, self).save(*args, **kwargs)
 
         if instance.can_populate:
+            from .adapters import get_segment_adapter
+
             request = RequestFactory().get('/')
+            request.session = SessionStore()
+            adapter = get_segment_adapter(request)
+
+            rules = [rule for rule in instance.get_rules() if rule.static]
 
             for session in Session.objects.filter(expire_date__gt=timezone.now()).iterator():
                 session_data = session.get_decoded()
                 user = user_from_data(session_data.get('_auth_id'))
                 request.user = user
                 request.session = SessionStore(session_key=session.session_key)
-                all_pass = all(rule.test_user(request) for rule in instance.get_rules() if rule.static)
+                passes = adapter._test_rules(rules, request, instance.match_any)
-                if all_pass:
+                if passes:
                     instance.sessions.add(session)
 
         instance.frozen = True

src/wagtail_personalisation/rules.py

@@ -229,7 +229,7 @@ class VisitCountRule(AbstractBaseRule):
 
         adapter = get_segment_adapter(request)
 
-        visit_count = adapter.get_visit_count()
+        visit_count = adapter.get_visit_count(self.counted_page)
         if visit_count and operator == "more_than":
             if visit_count > segment_count:
                 return True

tests/unit/test_static_dynamic_segments.py

@@ -3,16 +3,17 @@ from __future__ import absolute_import, unicode_literals
 import datetime
 
 from django.forms.models import model_to_dict
-from tests.factories.segment import SegmentFactory
+from django.contrib.sessions.backends.db import SessionStore
-
 import pytest
 from wagtail_personalisation.forms import SegmentAdminForm
 from wagtail_personalisation.models import Segment
 from wagtail_personalisation.rules import TimeRule, VisitCountRule
 
+from tests.factories.segment import SegmentFactory
+
 
 def form_with_data(segment, *rules):
-    model_fields = ['type', 'status', 'count', 'name']
+    model_fields = ['type', 'status', 'count', 'name', 'match_any']
 
     class TestSegmentAdminForm(SegmentAdminForm):
         class Meta:
@@ -22,13 +23,15 @@ def form_with_data(segment, *rules):
     data = model_to_dict(segment, model_fields)
     for formset in TestSegmentAdminForm().formsets.values():
         rule_data = {}
+        count = 0
         for rule in rules:
             if isinstance(rule, formset.model):
                 rule_data = model_to_dict(rule)
                 for key, value in rule_data.items():
-                    data['{}-0-{}'.format(formset.prefix, key)] = value
+                    data['{}-{}-{}'.format(formset.prefix, count, key)] = value
+                count += 1
         data['{}-INITIAL_FORMS'.format(formset.prefix)] = 0
-        data['{}-TOTAL_FORMS'.format(formset.prefix)] = 1 if rule_data else 0
+        data['{}-TOTAL_FORMS'.format(formset.prefix)] = count
     return TestSegmentAdminForm(data)
 
 
@@ -47,6 +50,28 @@ def test_session_added_to_static_segment_at_creation(site, client):
     assert session.session_key in instance.sessions.values_list('session_key', flat=True)
 
 
+@pytest.mark.django_db
+def test_match_any_correct_populates(site, client):
+    session = client.session
+    client.get(site.root_page.url)
+
+    client.cookies.clear()
+    second_session = client.session
+    other_page = site.root_page.get_last_child()
+    client.get(other_page.url)
+
+    segment = SegmentFactory.build(type=Segment.TYPE_STATIC, match_any=True)
+    rule_1 = VisitCountRule(counted_page=site.root_page)
+    rule_2 = VisitCountRule(counted_page=other_page)
+    form = form_with_data(segment, rule_1, rule_2)
+    instance = form.save()
+
+    assert instance.frozen
+    assert session.session_key != second_session.session_key
+    assert session.session_key in instance.sessions.values_list('session_key', flat=True)
+    assert second_session.session_key in instance.sessions.values_list('session_key', flat=True)
+
+
 @pytest.mark.django_db
 def test_mixed_static_dynamic_session_doesnt_generate_at_creation(site, client):
     session = client.session
@@ -107,13 +132,12 @@ def test_session_not_added_to_static_segment_after_full(site, client):
     assert instance.sessions.count() == 0
 
     session = client.session
-    session.save()
     client.get(site.root_page.url)
 
     assert instance.sessions.count() == 1
 
+    client.cookies.clear()
     second_session = client.session
-    second_session.create()
     client.get(site.root_page.url)
 
     assert session.session_key != second_session.session_key