fix: patch cache paths in concurrency tests and reuse nocache builders

Author: clean6378-max-it

services/workspace_db.py

@@ -440,12 +440,12 @@ def build_composer_id_to_workspace_id_cached(
         nocache_enabled,
     )
 
-    if nocache_enabled(request_nocache=nocache):
-        return build_composer_id_to_workspace_id(workspace_path, workspace_entries)
-
     def build() -> dict[str, str]:
         return build_composer_id_to_workspace_id(workspace_path, workspace_entries)
 
+    if nocache_enabled(request_nocache=nocache):
+        return build()
+
     return get_or_build_cached_composer_id_to_ws(
         workspace_path,
         workspace_entries,

services/workspace_tabs.py

@@ -526,16 +526,15 @@ def list_workspace_tab_summaries(
         but ``tabs`` entries carry no ``bubbles`` field.
     """
     workspace_entries = collect_workspace_entries(workspace_path)
-    if nocache_enabled(request_nocache=nocache):
-        return _build_workspace_tab_summaries_uncached(
-            workspace_id, workspace_path, rules, workspace_entries, nocache=nocache,
-        )
 
     def build() -> tuple[dict[str, Any], int]:
         return _build_workspace_tab_summaries_uncached(
             workspace_id, workspace_path, rules, workspace_entries, nocache=nocache,
         )
 
+    if nocache_enabled(request_nocache=nocache):
+        return build()
+
     return get_or_build_cached_tab_summaries(
         workspace_path,
         workspace_entries,

tests/test_summary_cache_concurrency.py

@@ -42,18 +42,21 @@ def _make_workspace_fixture(root: str) -> tuple[str, list[dict[str, object]]]:
 class TestSummaryCacheConcurrency(unittest.TestCase):
     def setUp(self):
         self.tmp = tempfile.TemporaryDirectory()
-        self.cache_patch = patch.object(summary_cache, "CACHE_DIR", Path(self.tmp.name))
-        self.cache_patch.start()
-        summary_cache.PROJECTS_CACHE_FILE = Path(self.tmp.name) / "projects.json"
-        summary_cache.COMPOSER_MAP_CACHE_FILE = (
-            Path(self.tmp.name) / "composer-id-to-ws.json"
-        )
-        summary_cache.INVALID_WORKSPACE_ALIASES_CACHE_FILE = (
-            Path(self.tmp.name) / "invalid-workspace-aliases.json"
-        )
+        cache_dir = Path(self.tmp.name)
+        self._patches = [
+            patch.object(summary_cache, "CACHE_DIR", cache_dir),
+            patch.object(
+                summary_cache,
+                "PROJECTS_CACHE_FILE",
+                cache_dir / "projects.json",
+            ),
+        ]
+        for patcher in self._patches:
+            patcher.start()
 
     def tearDown(self):
-        self.cache_patch.stop()
+        for patcher in reversed(self._patches):
+            patcher.stop()
         self.tmp.cleanup()
 
     def test_blocked_build_recheck_returns_peer_cache(self):