Merge pull request #876 from 1AhmedYasser/adding-project-layer-to-repos

Adding project layer to repos

Author: varmoh

DSL/CronManager/health.yml

@@ -2,4 +2,4 @@ get_health:
   trigger: "0 22 8 * * ?"
   type: http
   method: GET
-  url: http://localhost:8080/healthz
+  url: http://localhost:8080/training/healthz

DSL/DMapper/hbs/check_value_exists.handlebars renamed to DSL/DMapper/training/hbs/check_value_exists.handlebars

@@ -1,7 +1,7 @@
 #!/bin/bash
 # to run it - ./init_with_mocks.sh <url:port>
 
-MOCK=../DMapper/locations
+MOCK=../DMapper/training/locations
 
 PIPELINES=${1:-"localhost:3010"}
 

DSL/DMapper/hbs/csv_examples_to_array.handlebars renamed to DSL/DMapper/training/hbs/csv_examples_to_array.handlebars

@@ -0,0 +1,2 @@
+-- This is a empty sql for Buerokratt DSL delivery method
+SELECT current_date;

DSL/DMapper/hbs/delete_entity.handlebars renamed to DSL/DMapper/training/hbs/delete_entity.handlebars

@@ -0,0 +1,2 @@
+-- This is a empty sql for Buerokratt DSL delivery method
+SELECT current_date;

DSL/DMapper/hbs/delete_rule.handlebars renamed to DSL/DMapper/training/hbs/delete_rule.handlebars

@@ -0,0 +1,2 @@
+-- This is a empty sql for Buerokratt DSL delivery method
+SELECT current_date;

DSL/DMapper/hbs/delete_story.handlebars renamed to DSL/DMapper/training/hbs/delete_story.handlebars

@@ -35,7 +35,7 @@ check_nonce:
   next: guard_success
 
 authenticate:
-  template: check-user-authority
+  template: "[#TRAINING_PROJECT_LAYER]/check-user-authority"
   requestType: templates
   headers:
     cookie: ${incoming.headers.cookie}

DSL/DMapper/hbs/execute_command.handlebars renamed to DSL/DMapper/training/hbs/execute_command.handlebars

@@ -0,0 +1,22 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Decription placeholder for 'RETURN-FILE-LOCATIONS'"
+  method: get
+  accepts: json
+  returns: json
+  namespace: training
+
+assign_step:
+  assign:
+    locations:
+      rules_location: '/DMapper/training/locations/data/rules.yml'
+      stories_location: '/DMapper/training/locations/data/stories.yml'
+      domain_location: '/DMapper/training/locations/data/domain.yml'
+      test_stories_location: '/DMapper/training/locations/tests/test_stories.yml'
+      intents_location: '/DMapper/training/locations/data/nlu/'
+      regex_location: '/DMapper/training/locations/data/regex/'
+      training_result_location: '/DMapper/training/locations/results'
+      config_location: '/DMapper/training/locations/data/config.yml'
+return_value:
+  return: ${locations}

DSL/DMapper/hbs/extract_slot_keys.handlebars renamed to DSL/DMapper/training/hbs/extract_slot_keys.handlebars

@@ -33,7 +33,7 @@ getEntities:
 mapEntitiesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_entities"
+    url: "[#TRAINING_DMAPPER_HBS]/get_entities"
     headers:
       type: "json"
     body:
@@ -44,7 +44,7 @@ mapEntitiesData:
 sortEntities:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/sort_entities"
+    url: "[#TRAINING_DMAPPER_HBS]/sort_entities"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/filter.handlebars renamed to DSL/DMapper/training/hbs/filter.handlebars

@@ -16,7 +16,7 @@ getIntents:
 mapIntentsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_intent_and_id"
+    url: "[#TRAINING_DMAPPER_HBS]/get_intent_and_id"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_cron_file.handlebars renamed to DSL/DMapper/training/hbs/get_cron_file.handlebars

@@ -16,7 +16,7 @@ getIntents:
 mapIntentsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_intents"
+    url: "[#TRAINING_DMAPPER_HBS]/get_intents"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_cron_shell_execution_file.handlebars renamed to DSL/DMapper/training/hbs/get_cron_shell_execution_file.handlebars

@@ -70,7 +70,7 @@ assignResults:
 mapIntentData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_intent_by_id"
+    url: "[#TRAINING_DMAPPER_HBS]/get_intent_by_id"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_csv.handlebars renamed to DSL/DMapper/training/hbs/get_csv.handlebars

@@ -41,7 +41,7 @@ getDomainFile:
 getIntentsNames:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_intent_names_from_example_counts"
+    url: "[#TRAINING_DMAPPER_HBS]/get_intent_names_from_example_counts"
     headers:
       type: "json"
     body:
@@ -75,7 +75,7 @@ getIntentListLastChanged:
 mapIntentsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_intents_with_examples_count"
+    url: "[#TRAINING_DMAPPER_HBS]/get_intents_with_examples_count"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_entities.handlebars renamed to DSL/DMapper/training/hbs/get_entities.handlebars

@@ -15,7 +15,7 @@ declaration:
 assignValue:
   assign:
     fileName: ${incoming.params.fileName}
-    modelPath: "/DSL/DMapper/locations/models/"
+    modelPath: "/DSL/DMapper/training/locations/models/"
 
 validateName:
   switch:

DSL/DMapper/hbs/get_entities_with_examples.handlebars renamed to DSL/DMapper/training/hbs/get_entities_with_examples.handlebars

@@ -22,7 +22,7 @@ validateDbRecords:
 checkEntity:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/checkV"
+    url: "[#TRAINING_DMAPPER_HBS]/checkV"
     headers:
       type: 'json'
     body:
@@ -32,7 +32,7 @@ checkEntity:
 mapModels:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_models"
+    url: "[#TRAINING_DMAPPER_HBS]/get_models"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_entity_with_name.handlebars renamed to DSL/DMapper/training/hbs/get_entity_with_name.handlebars

@@ -29,7 +29,7 @@ getRegexes:
 mapRegexesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_regexes"
+    url: "[#TRAINING_DMAPPER_HBS]/get_regexes"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_examples.handlebars renamed to DSL/DMapper/training/hbs/get_examples.handlebars

@@ -29,7 +29,7 @@ getResponsesWithNameAndText:
 mapResponsesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_response_by_intent_id"
+    url: "[#TRAINING_DMAPPER_HBS]/get_response_by_intent_id"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_form.handlebars renamed to DSL/DMapper/training/hbs/get_form.handlebars

@@ -16,7 +16,7 @@ getRules:
 mapRulesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_rule_names"
+    url: "[#TRAINING_DMAPPER_HBS]/get_rule_names"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_form_details.handlebars renamed to DSL/DMapper/training/hbs/get_form_details.handlebars

@@ -29,7 +29,7 @@ getRules:
 mapRulesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_rule_ids"
+    url: "[#TRAINING_DMAPPER_HBS]/get_rule_ids"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_form_responses.handlebars renamed to DSL/DMapper/training/hbs/get_form_responses.handlebars

@@ -30,7 +30,7 @@ getResponses:
 mapSlotsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_slots_with_response"
+    url: "[#TRAINING_DMAPPER_HBS]/get_slots_with_response"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_forms.handlebars renamed to DSL/DMapper/training/hbs/get_forms.handlebars

@@ -16,7 +16,7 @@ getStories:
 mapStoriesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_story_names"
+    url: "[#TRAINING_DMAPPER_HBS]/get_story_names"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_forms_search_slots.handlebars renamed to DSL/DMapper/training/hbs/get_forms_search_slots.handlebars

@@ -16,7 +16,7 @@ getTestStories:
 mapTestStoriesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_test_stories"
+    url: "[#TRAINING_DMAPPER_HBS]/get_test_stories"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intent_and_id.handlebars renamed to DSL/DMapper/training/hbs/get_intent_and_id.handlebars

@@ -28,7 +28,7 @@ getTestStories:
 mapLinksData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_links"
+    url: "[#TRAINING_DMAPPER_HBS]/get_links"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intent_by_id.handlebars renamed to DSL/DMapper/training/hbs/get_intent_by_id.handlebars

@@ -5,7 +5,7 @@ check_for_cookie:
   next: authenticate
 
 authenticate:
-  template: check-user-authority
+  template: "[#TRAINING_PROJECT_LAYER]/check-user-authority"
   requestType: templates
   headers:
     cookie: ${incoming.headers.cookie}

DSL/DMapper/hbs/get_intent_csv.handlebars renamed to DSL/DMapper/training/hbs/get_intent_csv.handlebars

@@ -27,7 +27,7 @@ check_for_required_parameters:
 get_csv:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_csv"
+    url: "[#TRAINING_DMAPPER_HBS]/get_csv"
     headers:
       type: 'csv'
     body:

DSL/DMapper/hbs/get_intent_examples.handlebars renamed to DSL/DMapper/training/hbs/get_intent_examples.handlebars

@@ -67,7 +67,7 @@ generateCronExpression:
 createCronJson:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_cron_shell_execution_file"
+    url: "[#TRAINING_DMAPPER_HBS]/get_cron_shell_execution_file"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_intent_file.handlebars renamed to DSL/DMapper/training/hbs/get_intent_file.handlebars

@@ -35,7 +35,7 @@ check_nonce:
   next: guard_success
 
 authenticate:
-  template: check-user-authority
+  template: "[#TRAINING_PROJECT_LAYER]/check-user-authority"
   requestType: templates
   headers:
     cookie: ${incoming.headers.cookie}

DSL/DMapper/hbs/get_intent_ids.handlebars renamed to DSL/DMapper/training/hbs/get_intent_ids.handlebars

@@ -23,7 +23,7 @@ getEntitiesWithName:
 mapEntitiesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_entity_with_name"
+    url: "[#TRAINING_DMAPPER_HBS]/get_entity_with_name"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intent_last_changed.handlebars renamed to DSL/DMapper/training/hbs/get_intent_last_changed.handlebars

@@ -87,7 +87,7 @@ validateIntentEntities:
 deleteEntity:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/delete_entity"
+    url: "[#TRAINING_DMAPPER_HBS]/delete_entity"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intent_names_from_example_counts.handlebars renamed to DSL/DMapper/training/hbs/get_intent_names_from_example_counts.handlebars

@@ -28,7 +28,7 @@ getEntitiesWithExamples:
 mapEntitiesData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_entities_with_examples"
+    url: "[#TRAINING_DMAPPER_HBS]/get_entities_with_examples"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intent_with_name.handlebars renamed to DSL/DMapper/training/hbs/get_intent_with_name.handlebars

@@ -46,7 +46,7 @@ validateForms:
 mapForm:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_form"
+    url: "[#TRAINING_DMAPPER_HBS]/get_form"
     headers:
       type: "json"
     body:
@@ -65,7 +65,7 @@ mergeForms:
 convertResponseInput:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_form_responses"
+    url: "[#TRAINING_DMAPPER_HBS]/get_form_responses"
     headers:
       type: "json"
     body:

DSL/DMapper/hbs/get_intents.handlebars renamed to DSL/DMapper/training/hbs/get_intents.handlebars

@@ -61,7 +61,7 @@ gatherFormDetails:
 mapFormsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_form_details"
+    url: "[#TRAINING_DMAPPER_HBS]/get_form_details"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_intents_with_examples_count.handlebars renamed to DSL/DMapper/training/hbs/get_intents_with_examples_count.handlebars

@@ -24,7 +24,7 @@ getFormsSlots:
 mapFormsSlotsData:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_forms_search_slots"
+    url: "[#TRAINING_DMAPPER_HBS]/get_forms_search_slots"
     headers:
       type: 'json'
     body:

DSL/DMapper/hbs/get_links.handlebars renamed to DSL/DMapper/training/hbs/get_links.handlebars

@@ -55,7 +55,7 @@ updateFormData:
 convertResponseInput:
   call: http.post
   args:
-    url: "[#TRAINING_DMAPPER]/hbs/training/get_form_responses"
+    url: "[#TRAINING_DMAPPER_HBS]/get_form_responses"
     headers:
       type: "json"
     body: