TD-834: Fixes cascade with user interaction transiency in session (#112)

Author: nanodirijabl

apps/hellgate/src/hg_cascade.erl

@@ -42,20 +42,16 @@ handle_trigger_check(negative_trigger) ->
 
 is_user_interaction_triggered(undefined, _, _) ->
     not_triggered;
-is_user_interaction_triggered(
-    #domain_CascadeWhenNoUI{}, Route, Sessions
-) ->
+is_user_interaction_triggered(#domain_CascadeWhenNoUI{}, Route, Sessions) ->
     is_user_interaction_triggered_(Route, Sessions).
 
 is_user_interaction_triggered_(Route, Sessions) ->
     lists:foldl(
-        fun(Session, Status) ->
-            case Session of
-                #{route := Route, interaction := Interaction} when Interaction =/= undefined ->
-                    negative_trigger;
-                _ ->
-                    Status
-            end
+        fun
+            (#{route := SessionRoute, ui_occurred := true}, _Status) when SessionRoute =:= Route ->
+                negative_trigger;
+            (_Session, Status) ->
+                Status
         end,
         triggered,
         Sessions

apps/hellgate/src/hg_session.erl

@@ -17,6 +17,7 @@
     result => session_result(),
     proxy_state => proxy_state(),
     interaction => interaction(),
+    ui_occurred => boolean(),
     timings => timings(),
     repair_scenario => repair_scenario()
 }.
@@ -413,7 +414,7 @@ apply_event(?proxy_st_changed(ProxyState), Session, _Context) ->
 apply_event(?interaction_changed(UserInteraction, Status), Session, _Context) ->
     case genlib:define(Status, ?interaction_requested) of
         ?interaction_requested ->
-            Session#{interaction => UserInteraction};
+            Session#{interaction => UserInteraction, ui_occurred => true};
         ?interaction_completed ->
             {UserInteraction, Session1} = maps:take(interaction, Session),
             Session1