Make sure we always have a copy of the domain model in the cache

Author: pboers1988

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.4
+current_version = 2.7.5
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

orchestrator/__init__.py

@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "2.7.4"
+__version__ = "2.7.5"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

orchestrator/workflows/utils.py

@@ -32,7 +32,6 @@
 from orchestrator.workflows.steps import (
     cache_domain_models,
     refresh_subscription_search_index,
-    remove_domain_model_from_cache,
     resync,
     set_status,
     store_process_subscription,
@@ -248,8 +247,8 @@ def _modify_workflow(f: Callable[[], StepList]) -> Workflow:
         steplist = (
             init
             >> store_process_subscription(Target.MODIFY)
-            >> push_domain_models(remove_domain_model_from_cache)
             >> unsync
+            >> push_domain_models(cache_domain_models)
             >> f()
             >> (additional_steps or StepList())
             >> resync
@@ -286,8 +285,8 @@ def _terminate_workflow(f: Callable[[], StepList]) -> Workflow:
         steplist = (
             init
             >> store_process_subscription(Target.TERMINATE)
-            >> push_domain_models(remove_domain_model_from_cache)
             >> unsync
+            >> push_domain_models(cache_domain_models)
             >> f()
             >> (additional_steps or StepList())
             >> set_status(SubscriptionLifecycle.TERMINATED)
@@ -320,8 +319,8 @@ def _validate_workflow(f: Callable[[], StepList]) -> Workflow:
         steplist = (
             init
             >> store_process_subscription(Target.SYSTEM)
-            >> push_subscriptions(remove_domain_model_from_cache)
             >> unsync_unchecked
+            >> push_subscriptions(cache_domain_models)
             >> f()
             >> resync
             >> push_subscriptions(cache_domain_models)