passing tests again - now with coachinggroups

rowers/teams.py

@@ -17,7 +17,8 @@ queuelow = django_rq.get_queue('low')
 queuehigh = django_rq.get_queue('low')
 
 from rowers.models import (
-    Rower, Workout, Team, TeamInvite,User,TeamRequest, CoachRequest, CoachOffer
+    Rower, Workout, Team, TeamInvite,User,TeamRequest, CoachRequest, CoachOffer,
+    CoachingGroup
     )
 
 from rowers.tasks import (
@@ -105,15 +106,14 @@ def remove_team(id):
 
 def add_coach(coach,rower):
     # get coaching group
-    try:
-        coachgroup = coach.mycoachgroup
-    except CoachingGroup.DoesNotExist:
-        coachgroup = CoachingGroup()
+    coachgroup = coach.mycoachgroup
+    if coachgroup is None:
+        coachgroup = CoachingGroup(name=coach.user.first_name)
         coachgroup.save()
         coach.mycoachgroup = coachgroup
         coach.save()
         
-    rower.coachinggroups.add(coach)
+    rower.coachinggroups.add(coach.mycoachgroup)
 
     return (1,"Added Coach")
 
@@ -159,7 +159,7 @@ def remove_coach(coach,rower):
 
 def rower_get_coaches(rower):
     coaches = []
-    for group in rower.coachinggroups:
+    for group in rower.coachinggroups.all():
         coach = Rower.objects.get(mycoachgroup=group)
         coaches.append(coach)
 
@@ -167,7 +167,7 @@ def rower_get_coaches(rower):
     
 
 def coach_getcoachees(coach):
-    return Rower.objects.filter(coachinggroups__in=[coach.mycoachgroup])
+    return Rower.objects.filter(coachinggroups__in=[coach.mycoachgroup]).distinct()
 
 def coach_remove_athlete(coach,rower):
     try: