Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove ingredient search endpoint

Roland Geider66504821d35a
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index c35f36703..674c1336e 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -153,68 +153,6 @@ class IngredientInfoViewSet(IngredientViewSet):
)
-@api_view(['GET'])
-def search(request):
- """
- NOTE: this endpoint is not used anymore and will be removed in the very
- near future, but is kept here for backwards compatibility. When that
- happens, SEARCH_ALL_LANGUAGES can be removed as well.
- """
- term = request.GET.get('term', None)
- language_codes = request.GET.get('language', ENGLISH_SHORT_NAME)
- results = []
- response = {}
-
- if not term:
- return Response(response)
-
- query = Ingredient.objects.all()
-
- # Filter the appropriate languages
- languages = [load_language(l) for l in language_codes.split(',')]
- if language_codes != SEARCH_ALL_LANGUAGES:
- query = query.filter(
- language__in=languages,
- )
-
- query = query.only('name')
-
- # Postgres uses a full-text search
- if is_postgres_db():
- query = (
- query.annotate(similarity=TrigramSimilarity('name', term))
- .filter(similarity__gt=0.15)
- .order_by('-similarity', 'name')
- )
- else:
- query = query.filter(name__icontains=term)
-
- for ingredient in query[:150]:
- if hasattr(ingredient, 'image'):
- image_obj = ingredient.image
- image = image_obj.image.url
- t = get_thumbnailer(image_obj.image)
- thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
- else:
- ingredient.get_image(request)
- image = None
- thumbnail = None
-
- ingredient_json = {
- 'value': ingredient.name,
- 'data': {
- 'id': ingredient.id,
- 'name': ingredient.name,
- 'image': image,
- 'image_thumbnail': thumbnail,
- },
- }
- results.append(ingredient_json)
- response['suggestions'] = results
-
- return Response(response)
-
-
class ImageViewSet(viewsets.ReadOnlyModelViewSet):
"""
API endpoint for ingredient images
diff --git a/wger/urls.py b/wger/urls.py
index de407d824..fbb9138c3 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -307,7 +307,6 @@ urlpatterns += [
exercises_api_views.ExerciseSubmissionViewSet.as_view(),
name='exercise-submission',
),
- path('api/v2/ingredient/search/', nutrition_api_views.search, name='ingredient-search'),
path('api/v2/check-language/', core_api_views.check_language, name='check-language'),
path('api/v2/', include(router.urls)),
# The api user login