Self hosted FLOSS fitness/workout, nutrition and weight tracker
Start implementing full text search
Roland Geider65579f6fa07d
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex fb12cd1e4..d8244bfd9 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -147,16 +147,16 @@ def search(request):This format is currently used by the ingredient search autocompleter"""term = request.GET.get('term', None)- requested_language = request.GET.get('language', None)results = []json_response = {}if not term:return Response(json_response)+ requested_language = request.GET.get('language', None)language = load_language(requested_language)ingredients = Ingredient.objects.filter(- name__icontains=term,+ search_column=term,language=language,status=Ingredient.STATUS_ACCEPTED,)diff --git a/wger/nutrition/migrations/0012_auto_20221207_2031.py b/wger/nutrition/migrations/0012_auto_20221207_2031.pynew file mode 100644index 000000000..80776acc3--- /dev/null+++ b/wger/nutrition/migrations/0012_auto_20221207_2031.py@@ -0,0 +1,42 @@+# Generated by Django 3.2.15 on 2022-12-07 19:31++import django.contrib.postgres.indexes+import django.contrib.postgres.search+from django.db import migrations+++class Migration(migrations.Migration):+ dependencies = [+ ('nutrition', '0011_alter_logitem_datetime'),+ ]++ operations = [+ migrations.AddField(+ model_name='ingredient',+ name='search_column',+ field=django.contrib.postgres.search.SearchVectorField(null=True),+ ),+ migrations.AddIndex(+ model_name='ingredient',+ index=django.contrib.postgres.indexes.GinIndex(+ fields=['search_column'], name='nutrition_i_search__f274b7_gin'+ ),+ ),+ migrations.RunSQL(+ sql='''+ CREATE TRIGGER ingredient_search_column_trigger+ BEFORE INSERT OR UPDATE OF name, search_column+ ON nutrition_ingredient+ FOR EACH ROW EXECUTE PROCEDURE+ tsvector_update_trigger(+ search_column, 'pg_catalog.english', name+ );++ UPDATE nutrition_ingredient SET search_column = NULL;+ ''',+ reverse_sql='''+ DROP TRIGGER IF EXISTS ingredient_search_column_trigger+ ON film;+ '''+ ),+ ]diff --git a/wger/nutrition/models/ingredient.py b/wger/nutrition/models/ingredient.pyindex 0d60fcd7c..1185d5e3d 100644--- a/wger/nutrition/models/ingredient.py+++ b/wger/nutrition/models/ingredient.py@@ -21,6 +21,8 @@ from decimal import Decimal# Djangofrom django.conf import settingsfrom django.contrib.auth.models import User+from django.contrib.postgres.indexes import GinIndex+from django.contrib.postgres.search import SearchVectorFieldfrom django.contrib.sites.models import Sitefrom django.core import mailfrom django.core.cache import cache@@ -51,7 +53,6 @@ from wger.utils.models import (from ..consts import ENERGY_FACTORfrom .ingredient_category import IngredientCategory-logger = logging.getLogger(__name__)@@ -68,13 +69,6 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):energy amount given (in percent)."""- # Metaclass to set some other properties- class Meta:- ordering = [- "name",- ]-- # Meta datalanguage = models.ForeignKey(Language,verbose_name=_('Language'),@@ -97,7 +91,10 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):validators=[MinLengthValidator(3)],)- energy = models.IntegerField(verbose_name=_('Energy'), help_text=_('In kcal per 100g'))+ energy = models.IntegerField(+ verbose_name=_('Energy'),+ help_text=_('In kcal per 100g'),+ )protein = models.DecimalField(decimal_places=3,@@ -214,6 +211,16 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):blank=True,)+ search_column = SearchVectorField(null=True)+ """Column used for full text search"""++ # Metaclass to set some other properties+ class Meta:+ ordering = [+ "name",+ ]+ indexes = (GinIndex(fields=["search_column"]),)+## Django methods#