app: use joined eager loading for objects in source.collection

Suggested by @rmol in private conversation to replace the expire_all
freedomofpress · Mar 16, 2020 · 11f55ae · 11f55ae
1 parent eb76a2b
commit 11f55ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/securedrop_client/db.py b/securedrop_client/db.py
@@ -108,7 +108,8 @@ class Message(Base):
     source_id = Column(Integer, ForeignKey('sources.id'), nullable=False)
     source = relationship("Source",
                           backref=backref("messages", order_by=id,
-                                          cascade="delete"))
+                                          cascade="delete"),
+                          lazy="joined")
 
     def __init__(self, **kwargs: Any) -> None:
         if 'file_counter' in kwargs:
@@ -174,7 +175,8 @@ class File(Base):
     source_id = Column(Integer, ForeignKey('sources.id'), nullable=False)
     source = relationship("Source",
                           backref=backref("files", order_by=id,
-                                          cascade="delete"))
+                                          cascade="delete"),
+                          lazy="joined")
 
     def __init__(self, **kwargs: Any) -> None:
         if 'file_counter' in kwargs:
@@ -221,7 +223,8 @@ class Reply(Base):
     source_id = Column(Integer, ForeignKey('sources.id'), nullable=False)
     source = relationship("Source",
                           backref=backref("replies", order_by=id,
-                                          cascade="delete"))
+                                          cascade="delete"),
+                          lazy="joined")
 
     journalist_id = Column(Integer, ForeignKey('users.id'))
     journalist = relationship(
@@ -291,7 +294,8 @@ class DraftReply(Base):
     source_id = Column(Integer, ForeignKey('sources.id'), nullable=False)
     source = relationship("Source",
                           backref=backref("draftreplies", order_by=id,
-                                          cascade="delete"))
+                                          cascade="delete"),
+                          lazy="joined")
     journalist_id = Column(Integer, ForeignKey('users.id'))
     journalist = relationship(
         "User", backref=backref('draftreplies', order_by=id))

diff --git a/securedrop_client/gui/widgets.py b/securedrop_client/gui/widgets.py
@@ -707,7 +707,7 @@ def on_source_changed(self):
         if not source:
             return
 
-        self.controller.session.expire_all()
+        self.controller.session.refresh(source)
         # Try to get the SourceConversationWrapper from the persistent dict,
         # else we create it.
         try: