Use custom built in intent file if defined

Author: stephenrob

lib/BotManager/client.rb

@@ -211,20 +211,43 @@ def register_bots_with_lex
 
           next unless @lex_valid_amazon_intents.include? builtin_intent[:type]
 
-          intent_name = generate_lex_full_name builtin_intent[:name]
+          if @builtin_intents[builtin_intent[:type]].nil?
 
-          lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
+            intent_name = generate_lex_full_name builtin_intent[:name]
 
-          fulfillment_activity = builtin_intent[:fulfillment_activity]
+            lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
 
-          if !fulfillment_activity.nil? && !fulfillment_activity.empty?
-            lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
-            lex_intent.set_fulfillment_activity lex_fulfillment_activity
-          end
+            fulfillment_activity = builtin_intent[:fulfillment_activity]
+
+            if !fulfillment_activity.nil? && !fulfillment_activity.empty?
+              lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
+              lex_intent.set_fulfillment_activity lex_fulfillment_activity
+            end
+
+            version = @lex_manager.register_intent lex_intent
 
-          version = @lex_manager.register_intent lex_intent
+            lex_bot.register_intent intent_name, version
 
-          lex_bot.register_intent intent_name, version
+          else
+
+            custom_builtin_intent = @builtin_intents[builtin_intent[:type]]
+
+            intent_name = generate_lex_full_name custom_builtin_intent.name
+
+            lex_intent = Lex::BuiltInIntent.new builtin_intent[:type], intent_name
+
+            fulfillment_activity = custom_builtin_intent.lex[:fulfillment_activity]
+
+            if !fulfillment_activity.nil? && !fulfillment_activity.empty?
+              lex_fulfillment_activity = Lex::CodeHookFulfillmentActivity.new fulfillment_activity[:uri]
+              lex_intent.set_fulfillment_activity lex_fulfillment_activity
+            end
+
+            version = @lex_manager.register_intent lex_intent
+
+            lex_bot.register_intent intent_name, version
+
+          end
 
         end
 
@@ -603,6 +626,15 @@ def register_interaction_model_with_alexa
 
         language_intent = BotManager::Alexa::LanguageModel::Intent.new intent_name
 
+        if !@builtin_intents[intent_name].nil?
+
+          custom_builtin_intent = @builtin_intents[intent_name]
+
+          custom_builtin_intent.sample_utterances.each do |utterance|
+            language_intent.add_sample utterance
+          end
+        end
+
         language_intents[intent_name] = language_intent
 
       end