fixes #950 story context not loaded: story builder regression

Signed-off-by: Julien Buret <jburet@voyages-sncf.com>

Author: vsct-jburet

bot/engine/src/main/kotlin/definition/BotDefinition.kt

@@ -130,6 +130,11 @@ interface BotDefinition : I18nKeyProvider {
         }
     }
 
+    /**
+     * Search story by storyId.
+     */
+    fun findStoryDefinitionById(storyId: String): StoryDefinition = stories.find { it.id == storyId } ?: unknownStory
+
     /**
      * Finds a [StoryDefinition] from an intent name.
      *

bot/engine/src/main/kotlin/engine/ConnectorController.kt

@@ -117,5 +117,7 @@ interface ConnectorController {
     /**
      * Return a story definition provider for this controller.
      */
-    fun storyDefinitionLoader(): (String) -> StoryDefinition = { botDefinition.findStoryDefinition(it) }
+    fun storyDefinitionLoader(): (String) -> StoryDefinition = {
+        botDefinition.findStoryDefinitionById(it)
+    }
 }

bot/engine/src/main/kotlin/engine/config/BotDefinitionWrapper.kt

@@ -40,6 +40,9 @@ internal class BotDefinitionWrapper(val botDefinition: BotDefinition) : BotDefin
     @Volatile
     private var configuredStories: Map<String, List<ConfiguredStoryDefinition>> = emptyMap()
 
+    @Volatile
+    private var allStoriesById: Map<String, StoryDefinition> = botDefinition.stories.associateBy { it.id }
+
     //all stories
     @Volatile
     private var allStories: List<StoryDefinition> = botDefinition.stories
@@ -80,6 +83,8 @@ internal class BotDefinitionWrapper(val botDefinition: BotDefinition) : BotDefin
                             .groupBy { it.id }
                 )
             .values.flatten()
+
+        this.allStoriesById = allStories.associateBy { it.id }
     }
 
     override val stories: List<StoryDefinition>
@@ -160,6 +165,9 @@ internal class BotDefinitionWrapper(val botDefinition: BotDefinition) : BotDefin
             }
         }
 
+    override fun findStoryDefinitionById(storyId: String): StoryDefinition =
+        allStoriesById[storyId] ?: builtInStoriesMap[storyId] ?: findStoryDefinition(storyId)
+
     override fun toString(): String {
         return "Wrapper($botDefinition)"
     }

bot/engine/src/test/kotlin/definition/BotDefinitionTest.kt

@@ -34,7 +34,6 @@ import java.util.Locale
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
-import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 /**
@@ -44,12 +43,6 @@ class BotDefinitionTest {
 
     private val botDef = BotDefinitionTest()
 
-    /**
-     * Finds a [StoryDefinition] from a story [id]
-     */
-    private fun BotDefinition.findStoryDefinitionById(id: String): StoryDefinition? =
-        stories.find { it.id == id || (it as? ConfiguredStoryDefinition)?.configuration?.storyId == id }
-
     @Test
     fun `i18nTranslator() returns an I18nTranslator that use BotDefinition#i18nKeyFromLabel`() {
         val result = botDef.i18nTranslator(Locale.ENGLISH, ConnectorType.none).i18n("test")
@@ -82,27 +75,24 @@ class BotDefinitionTest {
     @Test
     fun `GIVEN stories containing configured story with specific id WHEN findStoryDefinitionById THEN story is found`() {
         // Given
-        val storyConfiguration = ConfiguredStoryDefinition(
-            BotDefinitionWrapper(botDef),
-            StoryDefinitionConfiguration(
-                botDefinition = botDef,
-                storyDefinition = SimpleStoryDefinition(
-                    id = "disable_bot",
-                    storyHandler = StoryHandlerTest,
-                    starterIntents = setOf(Intent("starter_intent"))
-                ),
-                configurationName = "toto"
+        val wrap = BotDefinitionWrapper(botDef)
+
+        wrap.updateStories(
+            listOf(
+                StoryDefinitionConfiguration(
+                    botDefinition = botDef,
+                    storyDefinition = SimpleStoryDefinition(
+                        id = "disable_bot",
+                        storyHandler = StoryHandlerTest,
+                        starterIntents = setOf(Intent("starter_intent"))
+                    ),
+                    configurationName = "toto"
+                )
             )
         )
 
-        val botDef = BotDefinitionBase(
-            botId = "test",
-            namespace = "namespace",
-            stories = listOf(storyConfiguration)
-        )
-
         // When
-        val result = botDef.findStoryDefinitionById("disable_bot")
+        val result = wrap.findStoryDefinitionById("disable_bot")
 
         // Then
         assertNotNull(result)
@@ -143,7 +133,7 @@ class BotDefinitionTest {
         val result = botDef.findStoryDefinitionById("disable_bot")
 
         // Then
-        assertNull(result)
+        assertEquals(botDef.unknownStory, result)
     }
 
     @Test
@@ -178,7 +168,7 @@ class BotDefinitionTest {
         val result = botDef.findStoryDefinitionById("should_not_find_id")
 
         // Then
-        assertNull(result)
+        assertEquals(botDef.unknownStory, result)
     }
 
     @Test