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

Make visit count session retrieval seperate method

Browse Source
This commit is contained in:
Kaitlyn Crawford
2018-02-21 19:07:35 +02:00
parent 330557be8d
commit 12b0cd9231
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/wagtail_personalisation/rules.py
View File

@ -226,6 +226,14 @@ class VisitCountRule(AbstractBaseRule):
class Meta: class Meta:
verbose_name = _('Visit count Rule') verbose_name = _('Visit count Rule')
def _get_user_session(self, user):
sessions = Session.objects.iterator()
for session in sessions:
session_data = session.get_decoded()
if session_data.get('_auth_user_id') == str(user.id):
return SessionStore(session_key=session.session_key)
return SessionStore()
def test_user(self, request, user=None): def test_user(self, request, user=None):
# Local import for cyclic import # Local import for cyclic import
from wagtail_personalisation.adapters import ( from wagtail_personalisation.adapters import (
@ -234,19 +242,14 @@ class VisitCountRule(AbstractBaseRule):
if user: if user:
# Create a fake request so we can use the adapter # Create a fake request so we can use the adapter
request = RequestFactory().get('/') request = RequestFactory().get('/')
request.session = SessionStore() request.user = user
# If we're using the session adapter check for an active session # If we're using the session adapter check for an active session
if SEGMENT_ADAPTER_CLASS == SessionSegmentsAdapter: if SEGMENT_ADAPTER_CLASS == SessionSegmentsAdapter:
sessions = Session.objects.iterator() request.session = self._get_user_session(user)
for session in sessions: else:
session_data = session.get_decoded() request.session = SessionStore()
if session_data.get('_auth_user_id') == str(user.id):
request.session = SessionStore(
session_key=session.session_key)
break
request.user = user
elif not request: elif not request:
# Return false if we don't have a user or a request # Return false if we don't have a user or a request
return False return False