more emails tests, removing middleware
This commit is contained in:
@@ -19,86 +19,9 @@ def getrower(user):
|
||||
|
||||
return r
|
||||
|
||||
def do_update(user,mode='rower',days=42):
|
||||
r = getrower(user)
|
||||
|
||||
startdate = timezone.now()-datetime.timedelta(days=days)
|
||||
|
||||
# test if not something already done
|
||||
now_date = timezone.now().strftime('%Y-%m-%d')
|
||||
ms = PowerTimeFitnessMetric.objects.filter(
|
||||
user=user,
|
||||
workoutmode=mode).order_by("-date")
|
||||
|
||||
if len(ms) == 0:
|
||||
max_workout_id = 0
|
||||
last_update_date = '1972-01-01'
|
||||
else:
|
||||
max_workout_id = max([m.last_workout for m in ms])
|
||||
last_update_date = ms[0].date.strftime('%Y-%m-%d')
|
||||
|
||||
#last_update_date = max([m.date.strftime('%Y-%m-%d') for m in ms])
|
||||
|
||||
|
||||
|
||||
if mode == 'rower':
|
||||
workouts = Workout.objects.filter(
|
||||
user=r,
|
||||
workouttype__in=['rower','dynamic','slides'],
|
||||
startdatetime__gte=startdate)
|
||||
else:
|
||||
workouts = Workout.objects.filter(
|
||||
user=r,
|
||||
workouttype__in=otwtypes,
|
||||
startdatetime__gte=startdate)
|
||||
|
||||
theids = [int(w.id) for w in workouts]
|
||||
try:
|
||||
max_id = max(theids)
|
||||
except ValueError:
|
||||
max_id = 0
|
||||
|
||||
if last_update_date < now_date and max_workout_id < max_id:
|
||||
job = myqueue(queuelow,
|
||||
handle_updatefitnessmetric,
|
||||
user.id,mode,theids,
|
||||
)
|
||||
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
class PowerTimeFitnessMetricMiddleWare(object):
|
||||
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:
|
||||
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
|
||||
|
||||
|
||||
allowed_paths = [
|
||||
'/rowers/me/delete',
|
||||
'/',
|
||||
'/logout',
|
||||
'/logout/',
|
||||
'/rowers/me/gdpr-optin/',
|
||||
'/rowers/me/gdpr-optin-confirm/',
|
||||
'/rowers/me/gdpr-optin',
|
||||
'/rowers/me/gdpr-optin-confirm'
|
||||
'/rowers/exportallworkouts/',
|
||||
'/rowers/exportallworkouts',
|
||||
'/rowers/survey/'
|
||||
]
|
||||
|
||||
class SurveyMiddleWare(object):
|
||||
def __init__(self, get_response):
|
||||
self.get_response = get_response
|
||||
|
||||
Reference in New Issue
Block a user