From b5b2969ef8473077b0a16749f3cc49030f62c0b0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 7 Oct 2020 18:06:36 +0200 Subject: [PATCH] should now process alternative email addresses --- rowers/management/commands/processemail.py | 4 ++++ rowers/views/workoutviews.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 96e39eb8..7f566e6b 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -235,6 +235,10 @@ class Command(BaseCommand): rowers = [ r for r in Rower.objects.all() if r.user.email.lower() == from_address ] + rowers2 = [ + r for r in Rower.objects.all() if from_address in r.emailalternatives + ] + rowers = rowers+rowers2 except IOError: rowers = [] except Message.DoesNotExist: diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 16ee013e..bf620b2a 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4691,8 +4691,12 @@ def workout_upload_api(request): u = us[0] r = getrower(u) else: - message = {'status':'false','message':'could not find user'} - return JSONResponse(status=400,data=message) + rs = [r for r in Rower.objects.all() if from_address in r.emailalternatives] + if len(rs): + r = rs[0] + else: + message = {'status':'false','message':'could not find user'} + return JSONResponse(status=400,data=message) else: message = {'status':'false','message':'invalid user'} return JSONResponse(status=400,data=message)