Import from other channels search optimized

contentcuration/contentcuration/dev_settings.py

@@ -6,3 +6,14 @@
 ROOT_URLCONF = "contentcuration.dev_urls"
 
 INSTALLED_APPS += ("drf_yasg",)
+
+REST_FRAMEWORK = {
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    ),
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.BasicAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+    )
+}

contentcuration/contentcuration/tests/testdata.py

@@ -195,21 +195,23 @@ def node(data, parent=None):
     return new_node
 
 
-def tree(parent=None):
+def tree(parent=None, tree_data=None):
     # Read from json fixture
-    filepath = os.path.sep.join([os.path.dirname(__file__), "fixtures", "tree.json"])
-    with open(filepath, "rb") as jsonfile:
-        data = json.load(jsonfile)
+    if tree_data is None:
+        filepath = os.path.sep.join([os.path.dirname(__file__), "fixtures", "tree.json"])
+        with open(filepath, "rb") as jsonfile:
+            tree_data = json.load(jsonfile)
 
-    return node(data, parent)
+    return node(tree_data, parent)
 
 
-def channel(name="testchannel"):
+def channel(name="testchannel", create_main_tree=True, main_tree_data=None):
     channel = cc.Channel.objects.create(name=name)
     channel.save()
 
-    channel.main_tree = tree()
-    channel.save()
+    if create_main_tree:
+        channel.main_tree = tree(tree_data=main_tree_data)
+        channel.save()
 
     return channel
 

contentcuration/contentcuration/viewsets/contentnode.py

@@ -610,7 +610,8 @@ def delete_from_changes(self, changes):
 
 
 def dict_if_none(obj, field_name=None):
-    return obj[field_name] if obj[field_name] else {}
+    value = obj.get(field_name)
+    return value if value else {}
 
 
 # Apply mixin first to override ValuesViewset

contentcuration/search/tests.py

@@ -29,3 +29,58 @@ def test_filter_channels_by_edit(self):
         )
         self.assertEqual(response.status_code, 200, response.content)
         self.assertNotEqual(response.data["results"], [])
+
+    def test_search_result(self):
+        # Create two users
+        user_a = testdata.user(email="a@a.com")
+        user_b = testdata.user(email="b@b.com")
+
+        # Create two channels with two editors
+        test_tree_data = {
+            "node_id": "00000000000000000000000000000000",
+            "title": "Root topic node",
+            "kind_id": "topic",
+            "children": [
+                {
+                    "node_id": "00000000000000000000000000000001",
+                    "title": "Kolibri video",
+                    "kind_id": "video",
+                },
+            ]
+        }
+
+        channel_a = testdata.channel(name="user_a_channel", main_tree_data=test_tree_data)
+        channel_a.editors.add(user_a)
+
+        channel_b = testdata.channel(name="user_b_channel", create_main_tree=False)
+        channel_b.editors.add(user_b)
+
+        # Publish channel_a
+        channel_a.main_tree.publishing = False
+        channel_a.main_tree.changed = False
+        channel_a.main_tree.published = True
+        channel_a.main_tree.save()
+        channel_a.public = True
+        channel_a.save()
+
+        # Import resources from channel_a to channel_b
+        channel_a.main_tree.copy_to(channel_b.main_tree, batch_size=1)
+        channel_b.main_tree.refresh_from_db()
+
+        # Send request from user_b to the search endpoint
+        self.client.force_authenticate(user=user_b)
+        response = self.client.get(
+            reverse("search-list"),
+            data={
+                "channel_list": "public",
+                "keywords": "video"
+            },
+            format="json",
+        )
+
+        # Assert whether the location_ids are of accessible nodes or not
+        kolibri_video_node = channel_b.main_tree.get_descendants().filter(title="Kolibri video").first()
+
+        # The ids in location_ids should be of channel_b's ContentNode only
+        self.assertEqual(len(response.data["results"][0]["location_ids"]), 1)
+        self.assertEqual(response.data["results"][0]["location_ids"][0], kolibri_video_node.cloned_source_id)

contentcuration/search/viewsets/contentnode.py

@@ -162,7 +162,7 @@ def annotate_queryset(self, queryset):
         2. Annotate lists of content node and channel pks
         """
         # Get accessible content nodes that match the content id
-        content_id_query = ContentNode.filter_view_queryset(ContentNode.objects.all(), self.request.user).filter(
+        content_id_query = queryset.filter(
             content_id=OuterRef("content_id")
         )