fix #640 double email when registered participant is also a follower
This commit is contained in:
@@ -69,6 +69,15 @@ class ChallengesTest(TestCase):
|
|||||||
gdproptindate=timezone.now(),
|
gdproptindate=timezone.now(),
|
||||||
rowerplan='basic')
|
rowerplan='basic')
|
||||||
|
|
||||||
|
self.u3 = UserFactory()
|
||||||
|
self.follower = Rower.objects.create(user=self.u3,
|
||||||
|
birthdate=datetime.datetime.now()-datetime.timedelta(days=28*365),
|
||||||
|
gdproptin=True,surveydone=True,
|
||||||
|
gdproptindate=timezone.now(),
|
||||||
|
rowerplan='basic')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.c = Client()
|
self.c = Client()
|
||||||
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
|
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
|
||||||
self.factory = RequestFactory()
|
self.factory = RequestFactory()
|
||||||
@@ -160,6 +169,10 @@ class ChallengesTest(TestCase):
|
|||||||
)
|
)
|
||||||
self.SpeedOrder.save()
|
self.SpeedOrder.save()
|
||||||
|
|
||||||
|
flw = VirtualRaceFollower.objects.create(race=self.SpeedOrder,
|
||||||
|
user=self.u3,
|
||||||
|
emailaddress='bla@bla.com')
|
||||||
|
|
||||||
self.result = VirtualRaceResult(
|
self.result = VirtualRaceResult(
|
||||||
userid = self.u2.id,
|
userid = self.u2.id,
|
||||||
username = self.u2.username,
|
username = self.u2.username,
|
||||||
|
|||||||
@@ -1873,6 +1873,8 @@ def virtualevent_addboat_view(request, id=0):
|
|||||||
otherrecords = resultobj.objects.filter(
|
otherrecords = resultobj.objects.filter(
|
||||||
race=race).exclude(userid=r.id)
|
race=race).exclude(userid=r.id)
|
||||||
|
|
||||||
|
registereduserids = [otherrecord.userid for otherrecord in otherrecords]
|
||||||
|
|
||||||
for otherrecord in otherrecords:
|
for otherrecord in otherrecords:
|
||||||
try:
|
try:
|
||||||
otheruser = Rower.objects.get(id=otherrecord.userid)
|
otheruser = Rower.objects.get(id=otherrecord.userid)
|
||||||
@@ -1892,13 +1894,14 @@ def virtualevent_addboat_view(request, id=0):
|
|||||||
|
|
||||||
followers = VirtualRaceFollower.objects.filter(race=race)
|
followers = VirtualRaceFollower.objects.filter(race=race)
|
||||||
|
|
||||||
for follower in followers: # pragma: no cover
|
for follower in followers:
|
||||||
othername = ''
|
othername = ''
|
||||||
if follower.user:
|
if follower.user:
|
||||||
othername = follower.user.first_name+' '+follower.user.last_name
|
othername = follower.user.first_name+' '+follower.user.last_name
|
||||||
|
|
||||||
registeredname = r.user.first_name+' '+r.user.last_name
|
registeredname = r.user.first_name+' '+r.user.last_name
|
||||||
email = follower.emailaddress
|
email = follower.emailaddress
|
||||||
|
if follower.user.id not in registereduserids:
|
||||||
_ = myqueue(
|
_ = myqueue(
|
||||||
queue,
|
queue,
|
||||||
handle_sendemail_raceregistration,
|
handle_sendemail_raceregistration,
|
||||||
|
|||||||
Reference in New Issue
Block a user