sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

added myqueue wrapper to teams.py

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-31 11:18:14 +01:00
parent 8c31f5b778
commit 2939accbf2
2 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/tasks.py
View File

@@ -381,7 +381,7 @@ def handle_otwsetpower(f1, boattype, weightvalue,
workoutid, email,
first_name,
last_name, btvalues=btvalues.to_json())
except OperationalError:
except:
pass
# send email
@@ -402,7 +402,7 @@ def handle_otwsetpower(f1, boattype, weightvalue,
send_mail(subject, message,
'Rowsandall Physics Department <info@rowsandall.com>',
[fullemail])
except OperationalError:
except:
return 0
return 1

68
rowers/teams.py
View File

@@ -9,6 +9,7 @@ from django.db import IntegrityError
import uuid
from django.conf import settings
from utils import myqueue
import django_rq
queue = django_rq.get_queue('default')
@@ -289,11 +290,9 @@ def send_invite_email(id):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite.delay(email,name,code,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite,
email,name,code,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_invite,
email,name,code,teamname,manager)
return (1,'Invitation email sent')
@@ -303,11 +302,9 @@ def send_team_delete_mail(t,rower):
email = u.email
name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG:
res = handle_sendemail_team_removed.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_team_removed,
email,name,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_team_removed,
email,name,teamname,manager)
return (1,'Team delete email sent')
@@ -319,11 +316,8 @@ def send_email_member_dropped(teamid,rower):
name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG:
res = handle_sendemail_member_dropped.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_member_dropped,
email,name,teamname,manager)
res = myqueue(queuehigh,handle_sendemail_member_dropped,
email,name,teamname,manager)
return (1,'Member dropped email sent')
@@ -334,12 +328,9 @@ def send_request_accept_email(rekwest):
teamname = rekwest.team.name
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_request_accept.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_request_accept,
email,name,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_request_accept,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -350,12 +341,10 @@ def send_request_reject_email(rekwest):
email = rekwest.user.email
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_request_reject.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_request_reject,
email,name,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_request_reject,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -371,11 +360,9 @@ def send_invite_reject_email(invitation):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite_reject.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite_reject,
email,name,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_invite_reject,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -391,11 +378,9 @@ def send_invite_accept_email(invitation):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite_accept.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite_accept,
email,name,teamname,manager)
res = myqueue(queuehigh,
handle_sendemail_invite_accept,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -409,12 +394,9 @@ def send_request_email(rekwest):
teamname = rekwest.team.name
requestor = rekwest.user.first_name+' '+rekwest.user.last_name
if settings.DEBUG:
res = handle_sendemail_request.delay(email,name,code,teamname,
requestor,id)
else:
res = queuehigh.enqueue(handle_sendemail_request,
email,name,code,teamname,requestor,id)
res = myqueue(queuehigh,
handle_sendemail_request,
email,name,code,teamname,requestor,id)
return (1,'Invitation email sent')