test: search_by_course_id tests fixed

Author: marslanabdulrauf

notesapi/v1/tests/test_views.py

@@ -958,8 +958,9 @@ def test_search_by_course_id(self, is_es_disabled):
         Tests searching with `course_id` provided
         """
 
-        self._create_annotation(text='First one. I am a simple note.', course_id="u'edX/DemoX/Demo_Course'")
-        self._create_annotation(text='Second note. I am a simple note.', course_id="u'edX/DemoX/Demo_Course'")
+        self._create_annotation(text='First one. I am a simple note.', course_id="edX/DemoX/Demo_Course")
+        self._create_annotation(text='Second note. I am a simple note.', course_id="edX/DemoX/Demo_Course")
+        self._create_annotation(text='Second note. I am a simple note.', course_id="edX/DemoX-v1:Demo+Demo_Course")
         self._create_annotation(text='Third note. I am a simple note.', course_id='b')
         self._create_annotation(text='Fourth note. I am a simple note.', course_id='c')
 
@@ -968,8 +969,10 @@ def verify_course_id_search():
             """
             Verify search results based on course id operation.
             """
-            results = self._get_search_results(course_id="u'edX/DemoX/Demo_Course'", text='I am a simple note')
+            results = self._get_search_results(course_id="edX/DemoX/Demo_Course", text='I am a simple note')
             self.assertEqual(results['total'], 2)
+            results = self._get_search_results(course_id="edX/DemoX-v1:Demo+Demo_Course", text='I am a simple note')
+            self.assertEqual(results['total'], 1)
 
             results = self._get_search_results(course_id="b", text='I am a simple note')
             self.assertEqual(results['total'], 1)

notesapi/v1/views/elasticsearch.py

@@ -34,7 +34,7 @@ class AnnotationSearchView(BaseAnnotationSearchView):
 
     # https://django-elasticsearch-dsl-drf.readthedocs.io/en/latest/advanced_usage_examples.html
     filter_fields = {
-        "course_id": "course_id.keywords",
+        "course_id": "course_id.keyword",
         "user": "user",
         "usage_id": {
             "field": "usage_id",