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

more pep

Browse Source
This commit is contained in:
Sander Roosendaal
2022-02-18 12:59:18 +01:00
parent f80dbdb4de
commit 508ebfd9a1
5 changed files with 87 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
rowers/teams.py
View File

@@ -88,7 +88,7 @@ def create_team(name, manager, private='open', notes='', viewing='allmembers'):
private=private, viewing=viewing)
t.save()
r = Rower.objects.get(user=manager)
res = add_member(t.id, r)
_ = add_member(t.id, r)
except IntegrityError:
return (0, 'Team name duplication')
return (t.id, 'Team created')
@@ -131,13 +131,13 @@ def add_member(id, rower):
# code to add all workouts
ws = Workout.objects.filter(user=rower)
res = handle_add_workouts_team(ws, t)
_ = handle_add_workouts_team(ws, t)
# code to add plannedsessions
plannedsessions = PlannedSession.objects.filter(
team=t, enddate__gte=timezone.now().date())
for ps in plannedsessions: # pragma: no cover
res = ps.rower.add(rower)
_ = ps.rower.add(rower)
# set_teamplanexpires(rower)
# code for Stuck At Home Team (temporary)
@@ -154,7 +154,7 @@ def remove_member(id, rower):
# remove the team from rower's workouts:
ws = Workout.objects.filter(user=rower, team=t)
res = handle_remove_workouts_team(ws, t)
_ = handle_remove_workouts_team(ws, t)
# set_teamplanexpires(rower)
return (id, 'Member removed')
@@ -270,9 +270,9 @@ def send_coachrequest_email(rekwest):
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coachrequest,
email, name, code, coachname)
_ = myqueue(queuehigh,
handle_sendemail_coachrequest,
email, name, code, coachname)
def send_coacheerequest_email(rekwest):
@@ -283,14 +283,13 @@ def send_coacheerequest_email(rekwest):
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coacheerequest,
email, name, code, coachname)
_ = myqueue(queuehigh,
handle_sendemail_coacheerequest,
email, name, code, coachname)
def create_request(team, user):
r2 = Rower.objects.get(user=user)
r = Rower.objects.get(user=team.manager)
if r2 in Rower.objects.filter(team=team): # pragma: no cover
return (0, 'Already a member of that team')
@@ -323,8 +322,6 @@ def get_coach_club_size(coach):
# request by coach to coach user
def create_coaching_offer(coach, user):
r = user.rower
if coach in rower_get_coaches(user.rower): # pragma: no cover
return (0, 'You are already coaching this person.')
@@ -348,7 +345,6 @@ def create_coaching_offer(coach, user):
def create_invite(team, manager, user=None, email=''):
r = Rower.objects.get(user=manager)
if not is_team_manager(manager, team):
return (0, 'Not the team manager')
if user:
@@ -359,7 +355,7 @@ def create_invite(team, manager, user=None, email=''):
return (0, 'Rower does not exist')
if r2 in Rower.objects.filter(team=team):
return (0, 'Already member of that team')
elif email == None or email == '': # pragma: no cover
elif email is None or email == '': # pragma: no cover
return (0, 'Invalid request - missing email or user')
else:
try:
@@ -390,13 +386,11 @@ def revoke_request(user, id):
except TeamRequest.DoesNotExist: # pragma: no cover
return (0, 'The request is invalid')
t = rekwest.team
if rekwest.user == user:
rekwest.delete()
return (1, 'Request revoked')
else: # pragma: no cover
return (0, 'You are not the requestor')
return (0, 'You are not the requestor') # pragma: no cover
def reject_revoke_coach_offer(user, id):
@@ -493,9 +487,9 @@ def send_invite_email(id):
manager = invitation.team.manager.first_name + \
' '+invitation.team.manager.last_name
res = myqueue(queuehigh,
handle_sendemail_invite,
email, name, code, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_invite,
email, name, code, teamname, manager)
return (1, 'Invitation email sent')
@@ -506,9 +500,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
res = myqueue(queuehigh,
handle_sendemail_team_removed,
email, name, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_team_removed,
email, name, teamname, manager)
return (1, 'Team delete email sent')
@@ -521,41 +515,38 @@ def send_email_member_dropped(teamid, rower):
name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name
res = myqueue(queuehigh, handle_sendemail_member_dropped,
email, name, teamname, manager)
_ = myqueue(queuehigh, handle_sendemail_member_dropped,
email, name, teamname, manager)
return (1, 'Member dropped email sent')
def send_request_accept_email(rekwest): # pragma: no cover
id = rekwest.id
email = rekwest.user.email
teamname = rekwest.team.name
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
res = myqueue(queuehigh,
handle_sendemail_request_accept,
email, name, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_request_accept,
email, name, teamname, manager)
return (1, 'Invitation email sent')
def send_request_reject_email(rekwest):
id = rekwest.id
teamname = rekwest.team.name
email = rekwest.user.email
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
res = myqueue(queuehigh,
handle_sendemail_request_reject,
email, name, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_request_reject,
email, name, teamname, manager)
return (1, 'Invitation email sent')
def send_invite_reject_email(invitation):
id = invitation.id
email = invitation.team.manager.email
if invitation.user:
name = invitation.user.first_name+' '+invitation.user.last_name
@@ -566,15 +557,14 @@ def send_invite_reject_email(invitation):
manager = invitation.team.manager.first_name + \
' '+invitation.team.manager.last_name
res = myqueue(queuehigh,
handle_sendemail_invite_reject,
email, name, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_invite_reject,
email, name, teamname, manager)
return (1, 'Invitation email sent')
def send_invite_accept_email(invitation): # pragma: no cover
id = invitation.id
email = invitation.team.manager.email
if invitation.user:
name = invitation.user.first_name+' '+invitation.user.last_name
@@ -585,9 +575,9 @@ def send_invite_accept_email(invitation): # pragma: no cover
manager = invitation.team.manager.first_name + \
' '+invitation.team.manager.last_name
res = myqueue(queuehigh,
handle_sendemail_invite_accept,
email, name, teamname, manager)
_ = myqueue(queuehigh,
handle_sendemail_invite_accept,
email, name, teamname, manager)
return (1, 'Invitation email sent')
@@ -598,9 +588,9 @@ def send_team_message(team, message): # pragma: no cover
for rower in rowers:
rowername = rower.user.first_name + " " + rower.user.last_name
res = myqueue(queuehigh,
handle_sendemail_message,
rower.user.email, team.manager.email, rowername, message, team.name, managername)
_ = myqueue(queuehigh,
handle_sendemail_message,
rower.user.email, team.manager.email, rowername, message, team.name, managername)
return (1, 'message sent')
@@ -613,9 +603,9 @@ def send_request_email(rekwest):
teamname = rekwest.team.name
requestor = rekwest.user.first_name+' '+rekwest.user.last_name
res = myqueue(queuehigh,
handle_sendemail_request,
email, name, code, teamname, requestor, id)
_ = myqueue(queuehigh,
handle_sendemail_request,
email, name, code, teamname, requestor, id)
return (1, 'Invitation email sent')
@@ -729,9 +719,9 @@ def send_coachoffer_rejected_email(rekwest):
name = rekwest.user.first_name + " " + rekwest.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coachoffer_rejected,
coachemail, coachname, name)
_ = myqueue(queuehigh,
handle_sendemail_coachoffer_rejected,
coachemail, coachname, name)
def send_coachrequest_rejected_email(rekwest):
@@ -740,9 +730,9 @@ def send_coachrequest_rejected_email(rekwest):
name = rekwest.user.first_name + " " + rekwest.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coachrequest_rejected,
email, coachname, name)
_ = myqueue(queuehigh,
handle_sendemail_coachrequest_rejected,
email, coachname, name)
def send_coachrequest_accepted_email(rekwest):
@@ -751,9 +741,9 @@ def send_coachrequest_accepted_email(rekwest):
name = rekwest.user.first_name + " " + rekwest.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coachrequest_accepted,
email, coachname, name)
_ = myqueue(queuehigh,
handle_sendemail_coachrequest_accepted,
email, coachname, name)
def send_coachoffer_accepted_email(rekwest):
@@ -762,6 +752,6 @@ def send_coachoffer_accepted_email(rekwest):
name = rekwest.user.first_name + " " + rekwest.user.last_name
res = myqueue(queuehigh,
handle_sendemail_coachoffer_accepted,
coachemail, coachname, name)
_ = myqueue(queuehigh,
handle_sendemail_coachoffer_accepted,
coachemail, coachname, name)