Merge pull request #1648 from MTG/drop_solr451

Drop solr451
MTG · Jan 12, 2023 · dd70e73 · dd70e73
2 parents 417f641 + e619d06
commit dd70e73
Show file tree

Hide file tree

Showing 12 changed files with 429 additions and 1,506 deletions.
diff --git a/accounts/tests/test_profile.py b/accounts/tests/test_profile.py
@@ -35,7 +35,6 @@
 from django.utils.http import int_to_base36
 
 import accounts.models
-import utils.search.backends.solr451custom
 from accounts.management.commands.process_email_bounces import process_message, decode_idna_email
 from accounts.models import EmailPreferenceType, EmailBounce, UserEmailSetting
 from accounts.views import handle_uploaded_image
@@ -44,10 +43,6 @@
 from tags.models import TaggedItem
 from utils.mail import send_mail
 from utils.test_helpers import override_avatars_path_with_temp_directory, create_user_and_sounds
-# Below we import SolrResponseInterpreter because we're using them in the 
-# tests to process data returned from Solr. Ideally we should make this test agnostic of search backend and 
-# prepare fake search data as it would be afeter being processed by SolrResponseInterpreter.
-from utils.search.backends.solr451custom import SolrResponseInterpreter
 
 
 class ProfileGetUserTags(TestCase):

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,6 @@ version: "3.7"
 volumes:
     pgdata:
     m2home:
-    solrdata:
     solr5data:
     fswebhome:
 
@@ -46,6 +45,7 @@ services:
             - db
             - rabbitmq
             - redis
+            - search
 
     # Search server
     search:

diff --git a/docker/search/Dockerfile.search b/docker/search/Dockerfile.search
diff --git a/docker/search/pom.xml b/docker/search/pom.xml
diff --git a/forum/models.py b/forum/models.py
@@ -40,6 +40,7 @@
 from utils.cache import invalidate_template_cache
 from utils.search import SearchEngineException, get_search_engine
 from utils.search.search_forum import delete_posts_from_search_engine
+from utils.text import slugify
 
 web_logger = logging.getLogger('web')
 
@@ -79,6 +80,14 @@ def get_absolute_url(self):
         return reverse("forums-forum", args=[smart_text(self.name_slug)])
 
 
+@receiver(pre_save, sender=Forum)
+def forum_pre_save_set_slug(sender, instance, **kwargs):
+    """If a forum has a name set but not a slug, automatically generate the slug
+    """
+    if not instance.id and not instance.name_slug:
+        instance.name_slug = slugify(instance.name)
+
+
 class Thread(models.Model):
     forum = models.ForeignKey(Forum)
     author = models.ForeignKey(User)

diff --git a/freesound/settings.py b/freesound/settings.py
@@ -585,8 +585,6 @@
 }
 
 SEARCH_ENGINE_BACKEND_CLASS = 'utils.search.backends.solr555pysolr.Solr555PySolrSearchEngine'
-SOLR4_SOUNDS_URL = "http://search:8080/fs2/"
-SOLR4_FORUM_URL = "http://search:8080/forum/"
 SOLR5_SOUNDS_URL = "http://search:8983/solr/freesound/"
 SOLR5_FORUM_URL = "http://search:8983/solr/forum/"
 

diff --git a/freesound/test_settings.py b/freesound/test_settings.py
@@ -38,7 +38,7 @@
 
 SOLR_URL = "http://fakehost:8080/fs2/"  # Avoid making accidental queries to "real" search server if running
 SOLR_FORUM_URL = "http://fakehost:8080/forum/"  # Avoid making accidental requests to "real" search server if running
-SEARCH_ENGINE_BACKEND_CLASS = 'utils.search.backends.solr451custom.Solr451CustomSearchEngine' # Test with our own custom search engine functions
+SEARCH_ENGINE_BACKEND_CLASS = 'utils.search.backends.solr555pysolr.Solr555PySolrSearchEngine' # Test with our own custom search engine functions
 SIMILARITY_ADDRESS = 'fakehost' # Avoid making accidental requests to "real" similarity server if running
 TAGRECOMMENDATION_ADDRESS = 'fakehost'  # Avoid making accidental requests to "real" tag rec server if running
 

diff --git a/requirements.txt b/requirements.txt
@@ -45,7 +45,6 @@ PyJWT==1.4.2
 pyparsing==2.4.7
 pysolr==3.10.0b1
 pysndfile==1.4.4
-python-cjson==1.1.0
 pytz==2020.1
 PyYAML==5.4.1
 redis==3.2.0