Renommage des relations entre tables.

Suppression du paramètre teamid dans l'url pour récupérer tout ce qui est lié aux courses
This commit is contained in:
2019-01-16 23:21:21 +01:00
parent 4cc49e4e9f
commit da5582ed19
23 changed files with 347 additions and 414 deletions

Binary file not shown.

View File

@ -54,7 +54,7 @@ class EngagedPilot(models.Model):
# Foreign keys to the team pilot and race
team = models.ForeignKey(Team, related_name='team', on_delete=models.CASCADE)
pilot = models.ForeignKey(Driver, related_name='pilot', on_delete=models.CASCADE)
race = models.ForeignKey(Race, related_name='race', on_delete=models.CASCADE)
race = models.ForeignKey(Race, related_name='engagedpilots', on_delete=models.CASCADE)
order = models.IntegerField(default=None, blank=True, null=True)

Binary file not shown.

View File

@ -32,14 +32,14 @@ class EngagedPilotSerializer(serializers.ModelSerializer):
fields = ('order','team','pilot','race')
class EngagedPilotsSerializer(serializers.ModelSerializer):
relaysv2 = RelaySerializer(many=True)
relays = RelaySerializer(many=True)
class Meta:
model = EngagedPilot
fields = ('order','team','pilot','race', 'relaysv2')
fields = ('order','team','pilot','race', 'relays')
class ListRelaysByRaceAndTeamSerializer(serializers.ModelSerializer):
racev2 = EngagedPilotsSerializer(many=True)
engagedpilots = EngagedPilotsSerializer(many=True)
class Meta:
model = Race
fields = ('name','start_date','end_date','duration', 'comment','fk_rules', 'racev2')
fields = ('name','start_date','end_date','duration', 'comment','fk_rules', 'engagedpilots')

View File

@ -9,5 +9,5 @@ urlpatterns = [
path('rules/', ListRulesView.as_view()),
path('teams/', ListTeamView.as_view()),
path('engagedpilots/', ListEngagedPilotView.as_view()),
url('race/(?P<raceid>\d+)/team/(?P<teamid>\d+)/relays', ListRelaysByRaceAndTeamView.as_view()),
url('race/(?P<raceid>\d+)', ListRelaysByRaceAndTeamView.as_view()),
]

View File

@ -40,7 +40,6 @@ class ListRelaysByRaceAndTeamView(generics.ListAPIView):
serializer_class = ListRelaysByRaceAndTeamSerializer
def get_queryset(self):
raceid = self.kwargs['raceid']
teamid = self.kwargs['teamid']
return Race.objects.filter(id=raceid)
"""