Merge eeee457 into e07c8a3

RasaHQ · Nov 25, 2019 · d198002 · d198002
2 parents e07c8a3 + eeee457
commit d198002
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/rasa/core/tracker_store.py b/rasa/core/tracker_store.py
@@ -785,12 +785,23 @@ def __init__(
                 in the primary tracker store.
         """
 
-        super().__init__(tracker_store.domain, tracker_store.event_broker)
-
         self._fallback_tracker_store: Optional[TrackerStore] = fallback_tracker_store
         self._tracker_store = tracker_store
         self._on_tracker_store_error = on_tracker_store_error
 
+        super().__init__(tracker_store.domain, tracker_store.event_broker)
+
+    @property
+    def domain(self) -> Optional[Domain]:
+        return self._tracker_store.domain
+
+    @domain.setter
+    def domain(self, domain: Optional[Domain]) -> None:
+        self._tracker_store.domain = domain
+
+        if self._fallback_tracker_store:
+            self._fallback_tracker_store.domain = domain
+
     @property
     def fallback_tracker_store(self) -> TrackerStore:
         if not self._fallback_tracker_store:

diff --git a/tests/core/test_tracker_stores.py b/tests/core/test_tracker_stores.py
@@ -368,3 +368,14 @@ def test_fail_safe_tracker_store_with_retrieve_error():
 
     assert tracker_store.retrieve("sender_id") is None
     on_error_callback.assert_called_once()
+
+
+def test_set_fail_safe_tracker_store_domain(default_domain: Domain):
+    tracker_store = InMemoryTrackerStore(domain)
+    fallback_tracker_store = InMemoryTrackerStore(None)
+    failsafe_store = FailSafeTrackerStore(tracker_store, None, fallback_tracker_store)
+
+    failsafe_store.domain = default_domain
+    assert failsafe_store.domain is default_domain
+    assert tracker_store.domain is failsafe_store.domain
+    assert fallback_tracker_store.domain is failsafe_store.domain