From 97ddab0da8ebf00d79c227024bf200e08f3a9789 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Thu, 16 Nov 2023 09:16:59 -0500 Subject: [PATCH] fix: cannot rename perform-search to clearer name, breaks tests platform does not use this, but platform tests do, so the clarity is not worth the trouble and upgrade risk --- edxsearch/__init__.py | 2 +- search/api.py | 2 +- search/tests/test_engines.py | 4 ++-- search/views.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/edxsearch/__init__.py b/edxsearch/__init__.py index 3af5eb5f..0f6ce6a7 100644 --- a/edxsearch/__init__.py +++ b/edxsearch/__init__.py @@ -1,3 +1,3 @@ """ Container module for testing / demoing search """ -__version__ = '3.7.0' +__version__ = '3.7.1' diff --git a/search/api.py b/search/api.py index 177e909a..893dacce 100644 --- a/search/api.py +++ b/search/api.py @@ -41,7 +41,7 @@ class NoSearchEngineError(Exception): """ -def perform_course_search( +def perform_search( search_term, user=None, size=10, diff --git a/search/tests/test_engines.py b/search/tests/test_engines.py index 3340340d..659d4cc9 100644 --- a/search/tests/test_engines.py +++ b/search/tests/test_engines.py @@ -13,7 +13,7 @@ from django.test.utils import override_settings from elasticsearch import exceptions from elasticsearch.helpers import BulkIndexError -from search.api import NoSearchEngineError, perform_course_search +from search.api import NoSearchEngineError, perform_search from search.elastic import RESERVED_CHARACTERS from search.tests.mock_search_engine import (MockSearchEngine, json_date_to_datetime) @@ -238,7 +238,7 @@ class TestNone(TestCase): def test_perform_search(self): """ search opertaion should yeild an exception with no search engine """ with self.assertRaises(NoSearchEngineError): - perform_course_search("abc test") + perform_search("abc test") @override_settings(SEARCH_ENGINE="search.elastic.ElasticSearchEngine") diff --git a/search/views.py b/search/views.py index 0c30d426..c59f7463 100644 --- a/search/views.py +++ b/search/views.py @@ -10,7 +10,7 @@ from django.views.decorators.http import require_POST from eventtracking import tracker as track -from .api import perform_course_search, course_discovery_search, course_discovery_filter_fields +from .api import perform_search, course_discovery_search, course_discovery_filter_fields from .initializer import SearchInitializer # log appears to be standard name used for logger @@ -96,7 +96,7 @@ def do_search(request, course_id=None): } ) - results = perform_course_search( + results = perform_search( search_term, user=request.user, size=size,