From 96663bb17b10bae16cc50349fa29bebbe15fc75b Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Sat, 17 Aug 2024 08:07:50 -0400 Subject: [PATCH 1/2] Fix duplicate visited regions --- backend/server/worldtravel/models.py | 6 ++++++ backend/server/worldtravel/views.py | 2 ++ frontend/src/routes/worldtravel/[id]/+page.svelte | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/backend/server/worldtravel/models.py b/backend/server/worldtravel/models.py index 25fd544..086706c 100644 --- a/backend/server/worldtravel/models.py +++ b/backend/server/worldtravel/models.py @@ -1,5 +1,6 @@ from django.db import models from django.contrib.auth import get_user_model +from django.core.exceptions import ValidationError User = get_user_model() @@ -57,3 +58,8 @@ class VisitedRegion(models.Model): def __str__(self): return f'{self.region.name} ({self.region.country.country_code}) visited by: {self.user_id.username}' + + def save(self, *args, **kwargs): + if VisitedRegion.objects.filter(user_id=self.user_id, region=self.region).exists(): + raise ValidationError("Region already visited by user.") + super().save(*args, **kwargs) diff --git a/backend/server/worldtravel/views.py b/backend/server/worldtravel/views.py index 0b1c7bb..1db5674 100644 --- a/backend/server/worldtravel/views.py +++ b/backend/server/worldtravel/views.py @@ -51,6 +51,8 @@ class VisitedRegionViewSet(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): request.data['user_id'] = request.user + if VisitedRegion.objects.filter(user_id=request.user.id, region=request.data['region']).exists(): + return Response({"error": "Region already visited by user."}, status=400) serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) self.perform_create(serializer) diff --git a/frontend/src/routes/worldtravel/[id]/+page.svelte b/frontend/src/routes/worldtravel/[id]/+page.svelte index 29e2090..2b4cf33 100644 --- a/frontend/src/routes/worldtravel/[id]/+page.svelte +++ b/frontend/src/routes/worldtravel/[id]/+page.svelte @@ -9,6 +9,11 @@ console.log(data); let numRegions: number = regions.length; + + visitedRegions = visitedRegions.filter( + (visitedRegion, index, self) => + index === self.findIndex((t) => t.region === visitedRegion.region) + ); let numVisitedRegions: number = visitedRegions.length; From 4d193bc44da06e10fd8fcdb98bcc8375e7d0f55d Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Sat, 17 Aug 2024 08:08:46 -0400 Subject: [PATCH 2/2] Fix duplicate visited regions --- frontend/src/lib/components/RegionCard.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/lib/components/RegionCard.svelte b/frontend/src/lib/components/RegionCard.svelte index d044e94..9e36de8 100644 --- a/frontend/src/lib/components/RegionCard.svelte +++ b/frontend/src/lib/components/RegionCard.svelte @@ -35,6 +35,7 @@ } } else { console.error('Failed to mark region as visited'); + addToast('error', `Failed to mark visit to ${region.name}`); } } async function removeVisit() {