add seen_by field to draftreplies

freedomofpress · Nov 13, 2020 · c589dd9 · c589dd9
1 parent f53052a
commit c589dd9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/securedrop_client/db.py b/securedrop_client/db.py
@@ -490,6 +490,12 @@ def seen(self) -> bool:
         """
         return True
 
+    def seen_by(self, journalist_id: int) -> bool:
+        """
+        A draft reply is considered seen by everyone (we don't track who sees draft replies).
+        """
+        return True
+
 
 class ReplySendStatus(Base):
 

diff --git a/tests/factory.py b/tests/factory.py
@@ -101,11 +101,11 @@ def DraftReply(**attrs):
     global DRAFT_REPLY_COUNT
     DRAFT_REPLY_COUNT += 1
     defaults = dict(
+        uuid="draft-reply-uuid-{}".format(DRAFT_REPLY_COUNT),
         timestamp=datetime.utcnow(),
         source_id=1,
         journalist_id=1,
         file_counter=1,
-        uuid="draft-reply-uuid-{}".format(REPLY_COUNT),
         content="content",
         send_status_id=1,
     )

diff --git a/tests/gui/test_widgets.py b/tests/gui/test_widgets.py
@@ -1253,6 +1253,13 @@ def test_SourceWidget_init_for_seen_source(mocker, session):
     session.add(seen_message_for_another_user)
     session.add(seen_reply_for_another_user)
 
+    draft_reply_from_current_user = factory.DraftReply(
+        source=source, journalist_id=controller.authenticated_user.id
+    )
+    draft_reply_from_another_user = factory.DraftReply(source=source, journalist_id=666)
+    session.add(draft_reply_from_current_user)
+    session.add(draft_reply_from_another_user)
+
     session.commit()
 
     session.add(db.SeenFile(file_id=seen_file.id, journalist_id=controller.authenticated_user.id))
@@ -1304,6 +1311,13 @@ def test_SourceWidget_init_for_unseen_source(mocker, session):
     session.add(unseen_message)
     session.add(unseen_reply)
 
+    draft_reply_from_current_user = factory.DraftReply(
+        source=source, journalist_id=controller.authenticated_user.id
+    )
+    draft_reply_from_another_user = factory.DraftReply(source=source, journalist_id=666)
+    session.add(draft_reply_from_current_user)
+    session.add(draft_reply_from_another_user)
+
     session.commit()
 
     session.add(db.SeenFile(file_id=seen_file.id, journalist_id=controller.authenticated_user.id))
@@ -1345,7 +1359,7 @@ def test_SourceWidget_html_init(mocker):
     sw.name.setText.assert_called_once_with("foo <b>bar</b> baz")
 
 
-def test_test_SourceWidget_update_styles_to_read(mocker):
+def test_SourceWidget_update_styles_to_read(mocker):
     """
     Ensure styles are updated so that the source widget appears read when seen is True.
     """
@@ -1419,6 +1433,7 @@ def test_SourceWidget__on_mark_seen(mocker, session):
     unseen_file = factory.File(source=source)
     unseen_message = factory.Message(source=source)
     unseen_reply = factory.Reply(source=source)
+
     session.add(unseen_file)
     session.add(unseen_message)
     session.add(unseen_reply)
@@ -1437,6 +1452,13 @@ def test_SourceWidget__on_mark_seen(mocker, session):
     session.add(unseen_message_for_current_user)
     session.add(unseen_reply_for_current_user)
 
+    draft_reply_from_current_user = factory.DraftReply(
+        source=source, journalist_id=controller.authenticated_user.id
+    )
+    draft_reply_from_another_user = factory.DraftReply(source=source, journalist_id=666)
+    session.add(draft_reply_from_current_user)
+    session.add(draft_reply_from_another_user)
+
     session.commit()
 
     session.add(db.SeenFile(file_id=seen_file.id, journalist_id=controller.authenticated_user.id))