Set annos as hidden in Elasticsearch based in moderation status

Author: acelaya

h/presenters/annotation_searchindex.py

@@ -32,30 +32,18 @@ def asdict(self):
             "target": self.annotation.target,
             "document": docpresenter.asdict(),
             "thread_ids": self.annotation.thread_ids,
+            "hidden": self.annotation.is_hidden,
         }
 
         result["target"][0]["scope"] = [self.annotation.target_uri_normalized]
 
         if self.annotation.references:
             result["references"] = self.annotation.references
 
-        self._add_hidden(result)
         self._add_nipsa(result, self.annotation.userid)
 
         return result
 
-    def _add_hidden(self, result):
-        # Mark an annotation as hidden if it and all of it's children have been
-        # moderated and hidden.
-        parents_and_replies = [self.annotation.id] + self.annotation.thread_ids  # noqa: RUF005
-
-        ann_mod_svc = self.request.find_service(name="annotation_moderation")
-        is_hidden = len(ann_mod_svc.all_hidden(parents_and_replies)) == len(
-            parents_and_replies
-        )
-
-        result["hidden"] = is_hidden
-
     def _add_nipsa(self, result, user_id):
         nipsa_service = self.request.find_service(name="nipsa")
         if nipsa_service.is_flagged(user_id):

tests/unit/h/presenters/annotation_searchindex_test.py

@@ -1,6 +1,7 @@
 import pytest
 from h_matchers import Any
 
+from h.models import ModerationStatus
 from h.presenters.annotation_searchindex import AnnotationSearchIndexPresenter
 from h.util.datetime import utc_iso8601
 
@@ -43,33 +44,32 @@ def test_asdict(self, DocumentSearchIndexPresenter, pyramid_request, factories):
             "hidden": False,
         }
 
-    @pytest.mark.parametrize("is_moderated", [True, False])
-    @pytest.mark.parametrize("replies_moderated", [True, False])
+    @pytest.mark.parametrize(
+        "moderation_status,should_be_hidden",
+        [
+            (None, False),
+            (ModerationStatus.APPROVED, False),
+            (ModerationStatus.PENDING, True),
+            (ModerationStatus.DENIED, True),
+            (ModerationStatus.SPAM, True),
+        ],
+    )
     def test_it_marks_annotation_hidden_correctly(
         self,
         pyramid_request,
-        moderation_service,
-        is_moderated,
-        replies_moderated,
+        moderation_status,
+        should_be_hidden,
         factories,
     ):
         annotation = factories.Annotation()
-        replies = factories.Annotation.create_batch(2, references=[annotation.id])
-
-        # Configure moderation return value
-        moderated_ids = []
-        if is_moderated:
-            moderated_ids.append(annotation.id)
-        if replies_moderated:
-            moderated_ids.extend([reply.id for reply in replies])
-        moderation_service.all_hidden.return_value = moderated_ids
+        annotation.moderation_status = moderation_status
 
         annotation_dict = AnnotationSearchIndexPresenter(
             annotation, pyramid_request
         ).asdict()
 
         # We are hidden if both we, and all of our replies are moderated
-        assert annotation_dict["hidden"] == bool(is_moderated and replies_moderated)
+        assert annotation_dict["hidden"] == should_be_hidden
 
     @pytest.mark.parametrize("is_nipsaed", [True, False])
     def test_it_marks_annotation_nipsad_correctly(