refactor: model/views: Add method in model to access stream email.

Introduced a new method in the model to retrieve the stream email
address from the stream data, updating popups code to use it.

Tests added & updated.

Author: rsashank

tests/model/test_model.py

@@ -2,7 +2,7 @@
 import json
 from collections import OrderedDict
 from copy import deepcopy
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import pytest
 from pytest import param as case
@@ -563,6 +563,28 @@ def test_topics_in_stream(self, mocker, model, topics_index, fetched, stream_id=
         assert model.index["topics"][stream_id] == return_value
         assert model.index["topics"][stream_id] is not return_value
 
+    @pytest.mark.parametrize(
+        "email_address_stream_dict, expected_return_value",
+        [
+            ({"email_address": "[email protected]"}, "[email protected]"),
+            ({}, None),
+        ],
+        ids=[
+            "email_present_in_dict:ZFL<226",
+            "email_absent_from_dict:ZFL>=226",
+        ],
+    )
+    def test_get_stream_email_address(
+        self,
+        model: Any,
+        email_address_stream_dict: Dict[str, str],
+        expected_return_value: Optional[str],
+        stream_id: int = 1,
+    ) -> None:
+        model.stream_dict[stream_id] = email_address_stream_dict
+        result = model.get_stream_email_address(stream_id)
+        assert result == expected_return_value
+
     # pre server v3 provide user_id or id as a property within user key
     # post server v3 provide user_id as a property outside the user key
     @pytest.mark.parametrize("user_key", ["user_id", "id", None])

tests/ui_tools/test_popups.py

@@ -1436,6 +1436,7 @@ def test_stream_info_content__email_copy_text(
     ) -> None:
         if not stream_email_present:
             del general_stream["email_address"]
+            self.controller.model.get_stream_email_address.return_value = None
 
         model = self.controller.model
         stream_id = general_stream["stream_id"]

zulipterminal/model.py

@@ -906,6 +906,18 @@ def topics_in_stream(self, stream_id: int) -> List[str]:
 
         return list(self.index["topics"][stream_id])
 
+    def get_stream_email_address(self, stream_id: int) -> Optional[str]:
+        """
+        Returns the stream email address, or None if it is unavailable.
+        """
+        if stream_id not in self.stream_dict:
+            raise RuntimeError("Invalid stream id.")
+        stream = self.stream_dict[stream_id]
+        # FIXME: This field was removed from the subscription data in Zulip 7.5 / ZFL226
+        #   We should use the new /streams/{stream_id}/email_address endpoint instead
+        stream_email = stream.get("email_address", None)
+        return stream_email
+
     @staticmethod
     def exception_safe_result(future: "Future[str]") -> str:
         try:

zulipterminal/ui_tools/views.py

@@ -1405,9 +1405,7 @@ def __init__(self, controller: Any, stream_id: int) -> None:
         )
         member_keys = ", ".join(map(repr, display_keys_for_command("STREAM_MEMBERS")))
 
-        # FIXME: This field was removed from the subscription data in Zulip 7.5 / ZFL226
-        #   We should use the new /streams/{stream_id}/email_address endpoint instead
-        self._stream_email = stream.get("email_address", None)
+        self._stream_email = controller.model.get_stream_email_address(stream_id)
         if self._stream_email is None:
             stream_copy_text = "< Stream email is unavailable >"
         else: