Search by department id instead of name

mbertrand · mbertrand · commit bc71b04a579d · 2023-11-14T15:06:50.000-05:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,7 +34,6 @@ services:
     image: opensearchproject/opensearch:1.3.11
     container_name: opensearch-node-mitopen
     environment:
-      - http.max_content_length=10mb
       - cluster.name=opensearch-cluster
       - node.name=opensearch-node-mitopen
       - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
diff --git a/learning_resources_search/api.py b/learning_resources_search/api.py
@@ -97,7 +97,11 @@ def generate_sort_clause(search_params):
                     "filter": {
                         "bool": {
                             "should": [
-                                {"term": {f"{path}.department.name": department}}
+                                {
+                                    "term": {
+                                        f"{path}.department.department_id": department
+                                    }
+                                }
                                 for department in departments
                             ]
                         }
diff --git a/learning_resources_search/api_test.py b/learning_resources_search/api_test.py
@@ -36,10 +36,10 @@ def test_relevant_indexes(resourse_types, aggregations, result):
     ("sort_param", "departments", "result"),
     [
         ("id", None, "id"),
-        ("-id", ["Biology"], "-id"),
+        ("-id", ["7"], "-id"),
         (
             "start_date",
-            ["Chemistry"],
+            ["5"],
             {"runs.start_date": {"order": "asc", "nested": {"path": "runs"}}},
         ),
         (
@@ -62,7 +62,7 @@ def test_relevant_indexes(resourse_types, aggregations, result):
         ),
         (
             "mitcoursenumber",
-            ["Biology", "Chemistry"],
+            ["7", "5"],
             {
                 "course.course_numbers.sort_coursenum": {
                     "order": "asc",
@@ -73,15 +73,15 @@ def test_relevant_indexes(resourse_types, aggregations, result):
                                 "should": [
                                     {
                                         "term": {
-                                            "course.course_numbers.department.name": (
-                                                "Biology"
+                                            "course.course_numbers.department.department_id": (
+                                                "7"
                                             )
                                         }
                                     },
                                     {
                                         "term": {
-                                            "course.course_numbers.department.name": (
-                                                "Chemistry"
+                                            "course.course_numbers.department.department_id": (
+                                                "5"
                                             )
                                         }
                                     },
@@ -141,7 +141,9 @@ def test_generate_learning_resources_text_clause():
                                             "query": {
                                                 "multi_match": {
                                                     "query": "math",
-                                                    "fields": ["departments.name"],
+                                                    "fields": [
+                                                        "departments.department_id"
+                                                    ],
                                                 }
                                             },
                                         }
@@ -256,7 +258,7 @@ def test_generate_learning_resources_text_clause():
                         "query": {
                             "multi_match": {
                                 "query": "math",
-                                "fields": ["departments.name"],
+                                "fields": ["departments.department_id"],
                             }
                         },
                     }
@@ -371,7 +373,9 @@ def test_generate_learning_resources_text_clause():
                                             "query": {
                                                 "query_string": {
                                                     "query": '"math"',
-                                                    "fields": ["departments.name"],
+                                                    "fields": [
+                                                        "departments.department_id"
+                                                    ],
                                                 }
                                             },
                                         }
@@ -489,7 +493,7 @@ def test_generate_learning_resources_text_clause():
                         "query": {
                             "query_string": {
                                 "query": '"math"',
-                                "fields": ["departments.name"],
+                                "fields": ["departments.department_id"],
                             }
                         },
                     }
@@ -593,7 +597,9 @@ def test_generate_content_file_text_clause():
                                             "query": {
                                                 "multi_match": {
                                                     "query": "math",
-                                                    "fields": ["departments.name"],
+                                                    "fields": [
+                                                        "departments.department_id"
+                                                    ],
                                                 }
                                             },
                                         }
@@ -622,7 +628,7 @@ def test_generate_content_file_text_clause():
                         "query": {
                             "multi_match": {
                                 "query": "math",
-                                "fields": ["departments.name"],
+                                "fields": ["departments.department_id"],
                             }
                         },
                     }
@@ -655,7 +661,9 @@ def test_generate_content_file_text_clause():
                                             "query": {
                                                 "query_string": {
                                                     "query": '"math"',
-                                                    "fields": ["departments.name"],
+                                                    "fields": [
+                                                        "departments.department_id"
+                                                    ],
                                                 }
                                             },
                                         }
@@ -684,7 +692,7 @@ def test_generate_content_file_text_clause():
                         "query": {
                             "query_string": {
                                 "query": '"math"',
-                                "fields": ["departments.name"],
+                                "fields": ["departments.department_id"],
                             }
                         },
                     }
@@ -905,7 +913,7 @@ def test_execute_learn_search(opensearch):
                                                                     "multi_match": {
                                                                         "query": "math",
                                                                         "fields": [
-                                                                            "departments.name"
+                                                                            "departments.department_id"
                                                                         ],
                                                                     }
                                                                 },
@@ -1027,7 +1035,7 @@ def test_execute_learn_search(opensearch):
                                         "query": {
                                             "multi_match": {
                                                 "query": "math",
-                                                "fields": ["departments.name"],
+                                                "fields": ["departments.department_id"],
                                             }
                                         },
                                     }
diff --git a/learning_resources_search/constants.py b/learning_resources_search/constants.py
@@ -58,7 +58,7 @@ class IndexestoUpdate(Enum):
 SEARCH_NESTED_FILTERS = {
     "topic": "topics.name",
     "level": "runs.level",
-    "department": "departments.name",
+    "department": "departments.department_id",
 }
 
 ENGLISH_TEXT_FIELD = {
@@ -214,7 +214,7 @@ class IndexestoUpdate(Enum):
 ]
 
 TOPICS_QUERY_FIELDS = ["topics.name"]
-DEPARTMENT_QUERY_FIELDS = ["departments.name"]
+DEPARTMENT_QUERY_FIELDS = ["departments.department_id"]
 
 COURSE_QUERY_FIELDS = [
     "course.course_numbers.value",
diff --git a/learning_resources_search/serializers_test.py b/learning_resources_search/serializers_test.py
@@ -199,7 +199,7 @@ def test_learning_resources_search_request_serializer():
         "offered_by": "xpro,ocw",
         "platform": "xpro,edx,ocw",
         "topic": "Math",
-        "department": "mathematics,chemistry",
+        "department": "18,5",
         "level": "Undergraduate",
         "resource_content_tags": "Lecture Videos",
         "aggregations": "resource_type,platform,level",
@@ -217,7 +217,7 @@ def test_learning_resources_search_request_serializer():
         "offered_by": ["xpro", "ocw"],
         "platform": ["xpro", "edx", "ocw"],
         "topic": ["Math"],
-        "department": ["mathematics", "chemistry"],
+        "department": ["18", "5"],
         "level": ["Undergraduate"],
         "resource_content_tags": ["Lecture Videos"],
         "aggregations": ["resource_type", "platform", "level"],

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,11 @@ def generate_sort_clause(search_params):`
`97`	`97`	`"filter": {`
`98`	`98`	`"bool": {`
`99`	`99`	`"should": [`
`100`		`- {"term": {f"{path}.department.name": department}}`
	`100`	`+ {`
	`101`	`+ "term": {`
	`102`	`+ f"{path}.department.department_id": department`
	`103`	`+ }`
	`104`	`+ }`
`101`	`105`	`for department in departments`
`102`	`106`	`]`
`103`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ def test_relevant_indexes(resourse_types, aggregations, result):`
`36`	`36`	`("sort_param", "departments", "result"),`
`37`	`37`	`[`
`38`	`38`	`("id", None, "id"),`
`39`		`- ("-id", ["Biology"], "-id"),`
	`39`	`+ ("-id", ["7"], "-id"),`
`40`	`40`	`(`
`41`	`41`	`"start_date",`
`42`		`- ["Chemistry"],`
	`42`	`+ ["5"],`
`43`	`43`	`{"runs.start_date": {"order": "asc", "nested": {"path": "runs"}}},`
`44`	`44`	`),`
`45`	`45`	`(`
`@@ -62,7 +62,7 @@ def test_relevant_indexes(resourse_types, aggregations, result):`
`62`	`62`	`),`
`63`	`63`	`(`
`64`	`64`	`"mitcoursenumber",`
`65`		`- ["Biology", "Chemistry"],`
	`65`	`+ ["7", "5"],`
`66`	`66`	`{`
`67`	`67`	`"course.course_numbers.sort_coursenum": {`
`68`	`68`	`"order": "asc",`
`@@ -73,15 +73,15 @@ def test_relevant_indexes(resourse_types, aggregations, result):`
`73`	`73`	`"should": [`
`74`	`74`	`{`
`75`	`75`	`"term": {`
`76`		`- "course.course_numbers.department.name": (`
`77`		`- "Biology"`
	`76`	`+ "course.course_numbers.department.department_id": (`
	`77`	`+ "7"`
`78`	`78`	`)`
`79`	`79`	`}`
`80`	`80`	`},`
`81`	`81`	`{`
`82`	`82`	`"term": {`
`83`		`- "course.course_numbers.department.name": (`
`84`		`- "Chemistry"`
	`83`	`+ "course.course_numbers.department.department_id": (`
	`84`	`+ "5"`
`85`	`85`	`)`
`86`	`86`	`}`
`87`	`87`	`},`
`@@ -141,7 +141,9 @@ def test_generate_learning_resources_text_clause():`
`141`	`141`	`"query": {`
`142`	`142`	`"multi_match": {`
`143`	`143`	`"query": "math",`
`144`		`- "fields": ["departments.name"],`
	`144`	`+ "fields": [`
	`145`	`+ "departments.department_id"`
	`146`	`+ ],`
`145`	`147`	`}`
`146`	`148`	`},`
`147`	`149`	`}`
`@@ -256,7 +258,7 @@ def test_generate_learning_resources_text_clause():`
`256`	`258`	`"query": {`
`257`	`259`	`"multi_match": {`
`258`	`260`	`"query": "math",`
`259`		`- "fields": ["departments.name"],`
	`261`	`+ "fields": ["departments.department_id"],`
`260`	`262`	`}`
`261`	`263`	`},`
`262`	`264`	`}`
`@@ -371,7 +373,9 @@ def test_generate_learning_resources_text_clause():`
`371`	`373`	`"query": {`
`372`	`374`	`"query_string": {`
`373`	`375`	`"query": '"math"',`
`374`		`- "fields": ["departments.name"],`
	`376`	`+ "fields": [`
	`377`	`+ "departments.department_id"`
	`378`	`+ ],`
`375`	`379`	`}`
`376`	`380`	`},`
`377`	`381`	`}`
`@@ -489,7 +493,7 @@ def test_generate_learning_resources_text_clause():`
`489`	`493`	`"query": {`
`490`	`494`	`"query_string": {`
`491`	`495`	`"query": '"math"',`
`492`		`- "fields": ["departments.name"],`
	`496`	`+ "fields": ["departments.department_id"],`
`493`	`497`	`}`
`494`	`498`	`},`
`495`	`499`	`}`
`@@ -593,7 +597,9 @@ def test_generate_content_file_text_clause():`
`593`	`597`	`"query": {`
`594`	`598`	`"multi_match": {`
`595`	`599`	`"query": "math",`
`596`		`- "fields": ["departments.name"],`
	`600`	`+ "fields": [`
	`601`	`+ "departments.department_id"`
	`602`	`+ ],`
`597`	`603`	`}`
`598`	`604`	`},`
`599`	`605`	`}`
`@@ -622,7 +628,7 @@ def test_generate_content_file_text_clause():`
`622`	`628`	`"query": {`
`623`	`629`	`"multi_match": {`
`624`	`630`	`"query": "math",`
`625`		`- "fields": ["departments.name"],`
	`631`	`+ "fields": ["departments.department_id"],`
`626`	`632`	`}`
`627`	`633`	`},`
`628`	`634`	`}`
`@@ -655,7 +661,9 @@ def test_generate_content_file_text_clause():`
`655`	`661`	`"query": {`
`656`	`662`	`"query_string": {`
`657`	`663`	`"query": '"math"',`
`658`		`- "fields": ["departments.name"],`
	`664`	`+ "fields": [`
	`665`	`+ "departments.department_id"`
	`666`	`+ ],`
`659`	`667`	`}`
`660`	`668`	`},`
`661`	`669`	`}`
`@@ -684,7 +692,7 @@ def test_generate_content_file_text_clause():`
`684`	`692`	`"query": {`
`685`	`693`	`"query_string": {`
`686`	`694`	`"query": '"math"',`
`687`		`- "fields": ["departments.name"],`
	`695`	`+ "fields": ["departments.department_id"],`
`688`	`696`	`}`
`689`	`697`	`},`
`690`	`698`	`}`
`@@ -905,7 +913,7 @@ def test_execute_learn_search(opensearch):`
`905`	`913`	`"multi_match": {`
`906`	`914`	`"query": "math",`
`907`	`915`	`"fields": [`
`908`		`- "departments.name"`
	`916`	`+ "departments.department_id"`
`909`	`917`	`],`
`910`	`918`	`}`
`911`	`919`	`},`
`@@ -1027,7 +1035,7 @@ def test_execute_learn_search(opensearch):`
`1027`	`1035`	`"query": {`
`1028`	`1036`	`"multi_match": {`
`1029`	`1037`	`"query": "math",`
`1030`		`- "fields": ["departments.name"],`
	`1038`	`+ "fields": ["departments.department_id"],`
`1031`	`1039`	`}`
`1032`	`1040`	`},`
`1033`	`1041`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class IndexestoUpdate(Enum):`
`58`	`58`	`SEARCH_NESTED_FILTERS = {`
`59`	`59`	`"topic": "topics.name",`
`60`	`60`	`"level": "runs.level",`
`61`		`- "department": "departments.name",`
	`61`	`+ "department": "departments.department_id",`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`ENGLISH_TEXT_FIELD = {`
`@@ -214,7 +214,7 @@ class IndexestoUpdate(Enum):`
`214`	`214`	`]`
`215`	`215`
`216`	`216`	`TOPICS_QUERY_FIELDS = ["topics.name"]`
`217`		`-DEPARTMENT_QUERY_FIELDS = ["departments.name"]`
	`217`	`+DEPARTMENT_QUERY_FIELDS = ["departments.department_id"]`
`218`	`218`
`219`	`219`	`COURSE_QUERY_FIELDS = [`
`220`	`220`	`"course.course_numbers.value",`