Add TestMentionService

h/presenters/mention_json.py

@@ -12,7 +12,7 @@ def __init__(self, mention: Mention):
     def asdict(self) -> dict[str, Any]:
         return {
             "userid": self._mention.user.userid,
-            "username": self._mention.user.username,
+            "username": self._mention.username,
             "display_name": self._mention.user.display_name,
             "link": self._mention.user.uri,
         }

tests/common/fixtures/services.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from h.services import MentionService
 from h.services.analytics import AnalyticsService
 from h.services.annotation_delete import AnnotationDeleteService
 from h.services.annotation_json import AnnotationJSONService
@@ -84,6 +85,7 @@
     "user_signup_service",
     "user_unique_service",
     "user_update_service",
+    "mention_service",
 )
 
 
@@ -306,3 +308,8 @@ def user_unique_service(mock_service):
 @pytest.fixture
 def user_update_service(mock_service):
     return mock_service(UserUpdateService, name="user_update")
+
+
+@pytest.fixture
+def mention_service(mock_service):
+    return mock_service(MentionService)

tests/unit/h/presenters/mention_json_test.py

@@ -0,0 +1,26 @@
+import pytest
+
+from h.models import Mention
+from h.presenters.mention_json import MentionJSONPresenter
+
+
+class TestMentionJSONPresenter:
+    def test_as_dict(self, user, annotation):
+        mention = Mention(annotation=annotation, user=user, username=user.username)
+
+        data = MentionJSONPresenter(mention).asdict()
+
+        assert data == {
+            "userid": user.userid,
+            "username": user.username,
+            "display_name": user.display_name,
+            "link": user.uri,
+        }
+
+    @pytest.fixture
+    def user(self, factories):
+        return factories.User.build()
+
+    @pytest.fixture
+    def annotation(self, factories):
+        return factories.Annotation.build()

tests/unit/h/services/annotation_json_test.py

@@ -188,7 +188,12 @@ def test_present_all_for_user(
 
         annotation_read_service.get_annotations_by_id.assert_called_once_with(
             ids=sentinel.annotation_ids,
-            eager_load=[Annotation.document, Annotation.moderation, Annotation.group],
+            eager_load=[
+                Annotation.document,
+                Annotation.moderation,
+                Annotation.group,
+                Annotation.mentions,
+            ],
         )
         flag_service.all_flagged.assert_called_once_with(user, sentinel.annotation_ids)
         flag_service.flag_counts.assert_called_once_with(sentinel.annotation_ids)
@@ -201,13 +206,19 @@ def test_present_all_for_user(
 
     @pytest.fixture
     def service(
-        self, annotation_read_service, links_service, flag_service, user_service
+        self,
+        annotation_read_service,
+        links_service,
+        flag_service,
+        user_service,
+        mention_service,
     ):
         return AnnotationJSONService(
             annotation_read_service=annotation_read_service,
             links_service=links_service,
             flag_service=flag_service,
             user_service=user_service,
+            mention_service=mention_service,
         )
 
     @pytest.fixture
@@ -246,6 +257,7 @@ def test_it(
         flag_service,
         links_service,
         user_service,
+        mention_service,
     ):
         service = factory(sentinel.context, pyramid_request)
 
@@ -254,6 +266,7 @@ def test_it(
             links_service=links_service,
             flag_service=flag_service,
             user_service=user_service,
+            mention_service=mention_service,
         )
         assert service == AnnotationJSONService.return_value
 

tests/unit/h/services/annotation_write_test.py

@@ -279,13 +279,15 @@ def svc(
         queue_service,
         annotation_read_service,
         annotation_metadata_service,
+        mention_service,
     ):
         return AnnotationWriteService(
             db_session=db_session,
             has_permission=has_permission,
             queue_service=queue_service,
             annotation_read_service=annotation_read_service,
             annotation_metadata_service=annotation_metadata_service,
+            mention_service=mention_service,
         )
 
     @pytest.fixture
@@ -321,6 +323,7 @@ def test_it(
         queue_service,
         annotation_read_service,
         annotation_metadata_service,
+        mention_service,
     ):
         svc = service_factory(sentinel.context, pyramid_request)
 
@@ -330,6 +333,7 @@ def test_it(
             queue_service=queue_service,
             annotation_read_service=annotation_read_service,
             annotation_metadata_service=annotation_metadata_service,
+            mention_service=mention_service,
         )
         assert svc == AnnotationWriteService.return_value
 

tests/unit/h/services/mention_test.py

@@ -0,0 +1,29 @@
+import pytest
+
+from h.services import MentionService
+
+
+class TestMentionService:
+    def test_update_mentions(
+        self, db_session, mention_service, user_service, annotation, user
+    ):
+        annotation.text = f'Hello <a data-hyp-mention data-userid="{user.userid}">@{user.display_name}</a>'
+        user_service.fetch_all.return_value = [user]
+
+        mention_service.update_mentions(annotation)
+
+        assert len(annotation.mentions) == 1
+        assert annotation.mentions[0].user == user
+
+    @pytest.fixture
+    def annotation(self, factories):
+        return factories.Annotation()
+
+    @pytest.fixture
+    def user(self, factories):
+        return factories.User()
+
+
+@pytest.fixture
+def mention_service(db_session, user_service):
+    return MentionService(db_session, user_service)