passing checks with django 2.1.7

rowers/middleware.py

@@ -9,6 +9,7 @@ queuelow = django_rq.get_queue('low')
 from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired
 from rowers.mytypes import otwtypes
 from django.contrib import messages
+from django.http import HttpResponse
 
 def getrower(user):
     try:
@@ -70,11 +71,18 @@ def do_update(user,mode='rower',days=42):
 
 
 class PowerTimeFitnessMetricMiddleWare(object):
-    def process_request(self, request):
+    def __init__(self, get_response):
+        self.get_response = get_response
+        
+    def __call__(self, request):
         # Code to be executed before the view is called
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             result = do_update(request.user,mode='rower')
             result = do_update(request.user,mode='water')
+
+        response = self.get_response(request)
+
+        return response
         
 from django.shortcuts import redirect
 
@@ -93,8 +101,11 @@ allowed_paths = [
 ]
 
 class GDPRMiddleWare(object):
-    def process_request(self, request):
-        if request.user.is_authenticated() and request.path not in allowed_paths:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.user.is_authenticated and request.path not in allowed_paths:
             r = getrower(request.user)
             nexturl = request.path
             if 'optin' in nexturl:
@@ -104,9 +115,16 @@ class GDPRMiddleWare(object):
                     '/rowers/me/gdpr-optin/?next=%s' % nexturl
                 )
 
+        response = self.get_response(request)
+
+        return response
+
 class RowerPlanMiddleWare(object):
-    def process_request(self, request):
-        if request.user.is_authenticated() and request.user.rower.rowerplan != 'basic':
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.user.is_authenticated and request.user.rower.rowerplan != 'basic':
             if request.user.rower.paymenttype == 'single':
                 if request.user.rower.planexpires < timezone.now().date():
                     messg = 'Your paid plan has expired. We have reset you to a free basic plan.'
@@ -122,3 +140,6 @@ class RowerPlanMiddleWare(object):
                                   r.user.last_name,
                                   str(r.planexpires))
 
+        response = self.get_response(request)
+
+        return response