Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix tests
Roland Geider40e10ac5e68d
diff --git a/wger/nutrition/api/filtersets.py b/wger/nutrition/api/filtersets.pyindex c3d56da85..526a96405 100644--- a/wger/nutrition/api/filtersets.py+++ b/wger/nutrition/api/filtersets.py@@ -18,7 +18,6 @@ import logging# Djangofrom django.contrib.postgres.search import TrigramSimilarity-# Third Partyfrom django_filters import rest_framework as filters@@ -30,7 +29,6 @@ from wger.nutrition.models import (from wger.utils.db import is_postgres_dbfrom wger.utils.language import load_language-logger = logging.getLogger(__name__)@@ -47,11 +45,11 @@ class LogItemFilterSet(filters.FilterSet):class IngredientFilterSet(filters.FilterSet):- code = filters.CharFilter(method='search_code')+ code = filters.CharFilter(method='search_barcode')name__search = filters.CharFilter(method='search_name_fulltext')language__code = filters.CharFilter(method='search_languagecode')- def search_code(self, queryset, name, value):+ def search_barcode(self, queryset, name, value):"""'exact' search for the barcode.@@ -63,7 +61,7 @@ class IngredientFilterSet(filters.FilterSet):queryset = queryset.filter(code=value)if queryset.count() == 0:- logger.debug('code not found locally, fetching code from off')+ logger.debug('barcode not found locally, trying to fetch ingredient from OFF')Ingredient.fetch_ingredient_from_off(value)return queryset@@ -86,10 +84,10 @@ class IngredientFilterSet(filters.FilterSet):"""Filter based on language codes, not IDs- Also accepts a comma separated list of codes. Unknown codes are ignored+ Also accepts a comma-separated list of codes. Unknown codes are ignored+ and duplicates removed."""-- languages = [load_language(l) for l in value.split(',')]+ languages = [load_language(l) for l in set(value.split(','))]if languages:queryset = queryset.filter(language__in=languages)diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex aab26eb2e..f50e0a710 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -22,7 +22,6 @@ from unittest.mock import patch# Djangofrom django.core.exceptions import ValidationErrorfrom django.urls import reverse-# Third Partyfrom rest_framework import status@@ -244,33 +243,59 @@ class IngredientSearchTestCase(WgerTestCase):Tests the ingredient search functions"""- def search_ingredient(self, fail=True):+ def search_ingredient_en(self):"""- Helper function+ Helper function - Searches in English"""- response = self.client.get(reverse('ingredient-search'), {'term': 'test'})+ response = self.client.get(+ reverse('api-ingredient-list'),+ {'name__search': 'test', 'language__code': 'en'},+ )self.assertEqual(response.status_code, 200)result = json.loads(response.content.decode('utf8'))- self.assertEqual(len(result['suggestions']), 2)- self.assertEqual(result['suggestions'][0]['value'], 'Ingredient, test, 2, organic, raw')- self.assertEqual(result['suggestions'][0]['data']['id'], 2)- suggestion_0_name = 'Ingredient, test, 2, organic, raw'- self.assertEqual(result['suggestions'][0]['data']['name'], suggestion_0_name)- self.assertEqual(result['suggestions'][0]['data']['image'], None)- self.assertEqual(result['suggestions'][0]['data']['image_thumbnail'], None)- self.assertEqual(result['suggestions'][1]['value'], 'Test ingredient 1')- self.assertEqual(result['suggestions'][1]['data']['id'], 1)- self.assertEqual(result['suggestions'][1]['data']['name'], 'Test ingredient 1')- self.assertEqual(result['suggestions'][1]['data']['image'], None)- self.assertEqual(result['suggestions'][1]['data']['image_thumbnail'], None)++ self.assertEqual(result['count'], 2)++ ingredient_1 = result['results'][0]+ self.assertEqual(ingredient_1['id'], 2)+ self.assertEqual(ingredient_1['name'], 'Ingredient, test, 2, organic, raw')+ self.assertEqual(ingredient_1['uuid'], '44dc5966-73a2-4df7-8b15-f6d37a8990d9')+ self.assertEqual(ingredient_1['language'], 2)++ ingredient_2 = result['results'][1]+ self.assertEqual(ingredient_2['id'], 1)+ self.assertEqual(ingredient_2['name'], 'Test ingredient 1')+ self.assertEqual(ingredient_2['uuid'], '7908c204-907f-4b1e-ad4e-f482e9769ade')+ self.assertEqual(ingredient_2['language'], 2)++ def search_ingredient_de(self):+ """+ Helper function - Searches in German+ """++ response = self.client.get(+ reverse('api-ingredient-list'),+ {'name__search': 'test', 'language__code': 'de'},+ )+ self.assertEqual(response.status_code, 200)+ result = json.loads(response.content.decode('utf8'))++ self.assertEqual(result['count'], 1)++ ingredient_1 = result['results'][0]+ self.assertEqual(ingredient_1['id'], 6)+ self.assertEqual(ingredient_1['name'], 'Testzutat 123')+ self.assertEqual(ingredient_1['uuid'], 'dfc5c622-027b-4f17-8141-dadd1ce7e3f1')+ self.assertEqual(ingredient_1['language'], 1)def test_search_ingredient_anonymous(self):"""Test searching for an ingredient by an anonymous user"""- self.search_ingredient()+ self.search_ingredient_en()+ self.search_ingredient_de()def test_search_ingredient_logged_in(self):"""@@ -278,7 +303,8 @@ class IngredientSearchTestCase(WgerTestCase):"""self.user_login('test')- self.search_ingredient()+ self.search_ingredient_en()+ self.search_ingredient_de()class IngredientValuesTestCase(WgerTestCase):