From fc2a60a4ba5d66d3e1e4b1d607804f60f866c738 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 11 Apr 2021 21:02:47 +0200
Subject: [PATCH] fixed postgres search

---
 .idea/recipes.iml                              |  2 +-
 cookbook/filters.py                            |  6 ++++--
 cookbook/migrations/0119_auto_20210411_2101.py | 15 +++++++++++++++
 recipes/settings.py                            |  5 +++--
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 cookbook/migrations/0119_auto_20210411_2101.py

diff --git a/.idea/recipes.iml b/.idea/recipes.iml
index e1dd70647..06582e143 100644
--- a/.idea/recipes.iml
+++ b/.idea/recipes.iml
@@ -6,7 +6,7 @@
         <option name="rootFolder" value="$MODULE_DIR$" />
         <option name="settingsModule" value="recipes/settings.py" />
         <option name="manageScript" value="$MODULE_DIR$/manage.py" />
-        <option name="environment" value="&lt;map/&gt;" />
+        <option name="environment" value="&lt;map&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;POSTGRES_USER&lt;/string&gt;&#10;    &lt;string&gt;postgres&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;POSTGRES_HOST&lt;/string&gt;&#10;    &lt;string&gt;localhost&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;DB_ENGINE&lt;/string&gt;&#10;    &lt;string&gt;django.db.backends.postgresql_psycopg2&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;POSTGRES_PORT&lt;/string&gt;&#10;    &lt;string&gt;5432&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;POSTGRES_PASSWORD&lt;/string&gt;&#10;    &lt;string&gt;Computer1234&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;  &lt;entry&gt;&#10;    &lt;string&gt;POSTGRES_DB&lt;/string&gt;&#10;    &lt;string&gt;recipes_db&lt;/string&gt;&#10;  &lt;/entry&gt;&#10;&lt;/map&gt;" />
         <option name="doNotUseTestRunner" value="false" />
         <option name="trackFilePattern" value="migrations" />
       </configuration>
diff --git a/cookbook/filters.py b/cookbook/filters.py
index 8a822abc7..b679a79fb 100644
--- a/cookbook/filters.py
+++ b/cookbook/filters.py
@@ -49,8 +49,10 @@ with scopes_disabled():
         def filter_name(queryset, name, value):
             if not name == 'name':
                 return queryset
-            if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
-                queryset = queryset.annotate(similarity=TrigramSimilarity('name', value), ).filter(Q(similarity__gt=0.1) | Q(name__unaccent__icontains=value)).order_by('-similarity')
+            if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
+                                                           'django.db.backends.postgresql']:
+                queryset = queryset.annotate(similarity=TrigramSimilarity('name', value), ).filter(
+                    Q(similarity__gt=0.1) | Q(name__unaccent__icontains=value)).order_by('-similarity')
             else:
                 queryset = queryset.filter(name__icontains=value)
             return queryset
diff --git a/cookbook/migrations/0119_auto_20210411_2101.py b/cookbook/migrations/0119_auto_20210411_2101.py
new file mode 100644
index 000000000..942adc6c1
--- /dev/null
+++ b/cookbook/migrations/0119_auto_20210411_2101.py
@@ -0,0 +1,15 @@
+# Generated by Django 3.2 on 2021-04-11 19:01
+from django.contrib.postgres.operations import UnaccentExtension, TrigramExtension
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0118_auto_20210406_1805'),
+    ]
+
+    operations = [
+        TrigramExtension(),
+        UnaccentExtension(),
+    ]
diff --git a/recipes/settings.py b/recipes/settings.py
index e7310a91b..eb46736ea 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -29,7 +29,6 @@ DEMO = bool(int(os.getenv('DEMO', False)))
 SOCIAL_DEFAULT_ACCESS = bool(int(os.getenv('SOCIAL_DEFAULT_ACCESS', False)))
 SOCIAL_DEFAULT_GROUP = os.getenv('SOCIAL_DEFAULT_GROUP', 'guest')
 
-
 INTERNAL_IPS = os.getenv('INTERNAL_IPS').split(',') if os.getenv('INTERNAL_IPS') else ['127.0.0.1']
 
 # allow djangos wsgi server to server mediafiles
@@ -75,6 +74,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.sites',
     'django.contrib.staticfiles',
+    'django.contrib.postgres',
     'django_tables2',
     'django_filters',
     'crispy_forms',
@@ -93,7 +93,8 @@ INSTALLED_APPS = [
 SOCIAL_PROVIDERS = os.getenv('SOCIAL_PROVIDERS').split(',') if os.getenv('SOCIAL_PROVIDERS') else []
 INSTALLED_APPS = INSTALLED_APPS + SOCIAL_PROVIDERS
 
-SOCIALACCOUNT_PROVIDERS = ast.literal_eval(os.getenv('SOCIALACCOUNT_PROVIDERS') if os.getenv('SOCIALACCOUNT_PROVIDERS') else '{}')
+SOCIALACCOUNT_PROVIDERS = ast.literal_eval(
+    os.getenv('SOCIALACCOUNT_PROVIDERS') if os.getenv('SOCIALACCOUNT_PROVIDERS') else '{}')
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',