diff --git a/backend/api/views.py b/backend/api/views.py index e99404f..668ca75 100644 --- a/backend/api/views.py +++ b/backend/api/views.py @@ -18,12 +18,12 @@ class FlavorViewSet(viewsets.ModelViewSet): permission_classes = [permissions.IsAuthenticatedOrReadOnly] def get_queryset(self): - return Flavor.objects.select_related('category').annotate(average_rating=Avg('ratings__score')).order_by('-average_rating') + return Flavor.objects.select_related('category').annotate(average_rating=Avg('ratings__score')).order_by('-average_rating').distinct() @action(detail=False, methods=['get'], permission_classes=[permissions.AllowAny]) def search(self, request): # Unpaginated list of all flavors for the search autocomplete - flavors = Flavor.objects.select_related('category').order_by('name') + flavors = Flavor.objects.select_related('category').order_by('name').distinct() data = [ { 'id': f.id, diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 6c14ba5..046db02 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -88,7 +88,10 @@ const GlobalSearch = () => { freeSolo size="small" options={options} - getOptionLabel={(option) => typeof option === 'string' ? option : (option.name || '')} + getOptionLabel={(option) => { + if (typeof option === 'string') return option; + return option.category_name ? `${option.name} (${option.category_name})` : (option.name || ''); + }} inputValue={query} onInputChange={(_, newValue) => setQuery(typeof newValue === 'string' ? newValue : '')} onChange={(_, newValue) => {