From ec7fb9492a6b82b45992d6cfa7cabfcdedd5035e Mon Sep 17 00:00:00 2001 From: James Turk Date: Sun, 27 May 2012 20:13:16 -0400 Subject: [PATCH] increase separation between fantasy and... wrestling --- fowl/game/models.py | 11 ++++------- fowl/game/tests.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/fowl/game/models.py b/fowl/game/models.py index e63ba5d..aa317ff 100644 --- a/fowl/game/models.py +++ b/fowl/game/models.py @@ -34,9 +34,6 @@ class Star(models.Model): tag_partner.title = title tag_partner.save() - def drafted(self, league): - return self.teams.filter(league=league).count() >= 1 - def __unicode__(self): return self.name @@ -221,11 +218,11 @@ class Team(models.Model): stars = models.ManyToManyField(Star, related_name='teams') def add_star(self, pk): - member = Star.objects.get(pk=pk) - if member.drafted(self.league): + star = Star.objects.get(pk=pk) + if self.league.teams.filter(stars=star).count() >= 1: raise ValueError('cannot add {0}, already drafted in {1}'.format( - member, self.league)) - self.stars.add(member) + star, self.league)) + self.stars.add(star) def drop_star(self, pk): member = Star.objects.get(pk=pk) diff --git a/fowl/game/tests.py b/fowl/game/tests.py index 6786e87..ff5480b 100644 --- a/fowl/game/tests.py +++ b/fowl/game/tests.py @@ -7,7 +7,7 @@ def _give_belt(star, belt): Star.objects.get(pk=star).win_title(belt) class StarTest(TestCase): - def test_win_belt(self): + def test_win_title(self): cmpunk = Star.objects.create(pk='cmpunk', name='CM Punk', title='wwe') dbry = Star.objects.create(pk='danielbryan', name='Daniel Bryan') kofi = Star.objects.create(pk='kofi', name='Kofi Kingston',