Set the moderation status on annotation creation and edit

This only initializes non private annotations to approved, it doesn't consider
any status transitions.

Author: marcospri

h/services/annotation_moderation.py

@@ -32,11 +32,18 @@ def set_status(
                     annotation_id=annotation.id,
                     old_moderation_status=annotation.moderation_status,
                     new_moderation_status=status.value,
-                    user_id=user.id,
+                    moderator_id=user.id,
                 )
             )
             annotation.moderation_status = status
 
+    def update_status(self, annotation: Annotation) -> None:
+        if not annotation.moderation_status and annotation.shared:
+            # If an annotation is not private but doesn't have a moderation status
+            # it means that the moderation status hasn't been migrated yet.
+            # Set the default `APPROVED` status
+            annotation.moderation_status = ModerationStatus.APPROVED
+
 
 def annotation_moderation_service_factory(_context, request):
     return AnnotationModerationService(request.db)

h/services/annotation_write.py

@@ -80,6 +80,7 @@ def create_annotation(self, data: dict) -> Annotation:
             created=annotation.created,
             updated=annotation.updated,
         )
+        self._moderation_service.update_status(annotation)
 
         self._db.add(annotation)
         self.upsert_annotation_slim(annotation)
@@ -143,6 +144,7 @@ def update_annotation(
                 document.get("document_uri_dicts", {}),
                 updated=annotation.updated,
             )
+        self._moderation_service.update_status(annotation)
         self.upsert_annotation_slim(annotation)
 
         if annotation_metadata:

tests/unit/h/services/annotation_moderation_test.py

@@ -42,7 +42,7 @@ def test_set_status(self, svc, annotation, user):
 
         assert annotation.moderation_status is ModerationStatus.DENIED
         assert annotation.moderation_log[0].annotation_id == annotation.id
-        assert annotation.moderation_log[0].user_id == user.id
+        assert annotation.moderation_log[0].moderator_id == user.id
         assert (
             annotation.moderation_log[0].old_moderation_status
             == ModerationStatus.APPROVED
@@ -52,6 +52,21 @@ def test_set_status(self, svc, annotation, user):
             == ModerationStatus.DENIED
         )
 
+    @pytest.mark.parametrize("moderation_status", [None, ModerationStatus.APPROVED])
+    @pytest.mark.parametrize("shared", [False, True])
+    def test_update_status_initializes_moderation_status(
+        self, svc, annotation, moderation_status, shared
+    ):
+        annotation.moderation_status = moderation_status
+        annotation.shared = shared
+
+        svc.update_status(annotation)
+
+        if not moderation_status and shared:
+            assert annotation.moderation_status == ModerationStatus.APPROVED
+        else:
+            assert annotation.moderation_status == moderation_status
+
     @pytest.fixture(autouse=True)
     def mods(self, factories):
         return factories.AnnotationModeration.create_batch(3)

tests/unit/h/services/annotation_write_test.py

@@ -23,6 +23,7 @@ def test_create_annotation(
         mention_service,
         _validate_group,  # noqa: PT019
         db_session,
+        moderation_service,
     ):
         root_annotation = factories.Annotation()
         annotation_read_service.get_annotation_by_id.return_value = root_annotation
@@ -43,6 +44,7 @@ def test_create_annotation(
             schedule_in=60,
         )
         mention_service.update_mentions.assert_called_once_with(anno)
+        moderation_service.update_status.assert_called_once_with(anno)
 
         assert anno == Any.instance_of(Annotation).with_attrs(
             {