Fixed failed test

Author: hinashi

CHANGELOG.md

@@ -3,9 +3,9 @@
 ## In development
 
 ### Added
-* Added exclude entity parama in search_entries_for_simple.
+* Added exclude entity parameter in search_entries_for_simple.
   Contributed by @hinashi
-* Added exclude entity parama in get_referred_objects.
+* Added exclude entity parameter in get_referred_objects.
   Contributed by @hinashi
 
 ### Changed

airone/tests/test_elasticsearch.py

@@ -201,7 +201,7 @@ def test_make_query(self):
         )
 
     def test_make_query_for_simple(self):
-        query = elasticsearch.make_query_for_simple("hoge|fuga&1", None, 0)
+        query = elasticsearch.make_query_for_simple("hoge|fuga&1", None, [], 0)
         self.assertEqual(
             query,
             {
@@ -296,14 +296,21 @@ def test_make_query_for_simple(self):
         )
 
         # set hint_entity_name
-        query = elasticsearch.make_query_for_simple("hoge", "fuga", 0)
+        query = elasticsearch.make_query_for_simple("hoge", "fuga", [], 0)
         self.assertEqual(
             query["query"]["bool"]["must"][1],
             {"nested": {"path": "entity", "query": {"term": {"entity.name": "fuga"}}}},
         )
 
+        # set exclude_entity_names
+        query = elasticsearch.make_query_for_simple("hoge", None, ["fuga"], 0)
+        self.assertEqual(
+            query["query"]["bool"]["must_not"][0],
+            {"nested": {"path": "entity", "query": {"term": {"entity.name": "fuga"}}}},
+        )
+
         # set offset
-        query = elasticsearch.make_query_for_simple("hoge", "fuga", 100)
+        query = elasticsearch.make_query_for_simple("hoge", "fuga", [], 100)
         self.assertEqual(query["from"], 100)
 
     def test_make_search_results(self):

api_v1/entry/views.py

@@ -103,6 +103,8 @@ def get(self, request):
         if param_entity:
             query &= Q(schema__name=param_entity)
 
+        filter_entities = [param_target_entity] if param_target_entity else []
+
         ret_data = []
         for entry in Entry.objects.filter(query):
             ret_data.append(
@@ -117,7 +119,7 @@ def get(self, request):
                             if param_quiet
                             else {"id": x.schema.id, "name": x.schema.name},
                         }
-                        for x in entry.get_referred_objects(filter_entities=[param_target_entity])
+                        for x in entry.get_referred_objects(filter_entities=filter_entities)
                     ],
                 }
             )