Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-22 22:39:36 +02:00
Code Issues Releases Activity

Valid types fixing

Browse source
This commit is contained in:
Sean Morley 2024-09-23 18:19:25 -04:00
parent 0fdc119028
commit 9a672e51cd
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/server/adventures/migrations/0008_remove_date_field.py
View file

@ -9,6 +9,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('adventures', 'migrate_visits_categories'), ('adventures', 'migrate_visits_categories'),
('adventures', 'migrate_images'),
] ]
operations = [ operations = [

6
backend/server/adventures/views.py
View file

@ -5,7 +5,7 @@ from rest_framework.decorators import action
from rest_framework import viewsets from rest_framework import viewsets
from django.db.models.functions import Lower from django.db.models.functions import Lower
from rest_framework.response import Response from rest_framework.response import Response
from .models import Adventure, Checklist, Collection, Transportation, Note, AdventureImage from .models import Adventure, Checklist, Collection, Transportation, Note, AdventureImage, ADVENTURE_TYPES
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from worldtravel.models import VisitedRegion, Region, Country from worldtravel.models import VisitedRegion, Region, Country
from .serializers import AdventureImageSerializer, AdventureSerializer, CollectionSerializer, NoteSerializer, TransportationSerializer, ChecklistSerializer from .serializers import AdventureImageSerializer, AdventureSerializer, CollectionSerializer, NoteSerializer, TransportationSerializer, ChecklistSerializer
@ -105,7 +105,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
@action(detail=False, methods=['get']) @action(detail=False, methods=['get'])
def filtered(self, request): def filtered(self, request):
types = request.query_params.get('types', '').split(',') types = request.query_params.get('types', '').split(',')
valid_types = ['visited', 'planned'] valid_types = [t[0] for t in ADVENTURE_TYPES]
types = [t for t in types if t in valid_types] types = [t for t in types if t in valid_types]
if not types: if not types:
@ -114,7 +114,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
queryset = Adventure.objects.none() queryset = Adventure.objects.none()
for adventure_type in types: for adventure_type in types:
if adventure_type in ['visited', 'planned']: if adventure_type in valid_types:
queryset |= Adventure.objects.filter( queryset |= Adventure.objects.filter(
type=adventure_type, user_id=request.user.id) type=adventure_type, user_id=request.user.id)