#28 29 fixed merging errors

models/de-DE.json

@@ -34,8 +34,13 @@
                     ]
                 },
                 {
-                    "name": "SelectRecipeByFavoritsIntent",
-                    "slots": [],
+                    "name": "SelectRecipeByFavoritsStartIntent",
+                    "slots": [
+                        {
+                            "name": "FavoritRecipe",
+                            "type": "FavoritRecipes"
+                        }
+                    ],
                     "samples": [
                         "ich moechte meine Favoriten vorlesen lassen",
                         "welche Favoriten kann ich waehlen",
@@ -83,7 +88,7 @@
                 },
                 {
                     "name": "SetNumberOfPeopleIntent",
-                    "slots": [
+                     "slots": [
                         {
                             "name": "Number",
                             "type": "NUMBER_OF_PEOPLE"
@@ -95,12 +100,26 @@
                         "Sage mir das Rezept fuer {Number} Personen",
                         "Sage mir das Rezept fuer {Number} Person",
                         "Ich möchte das Rezept fuer {Number} alleine kochen"
+                   	]
+                 },
+                 {
+                    "name": "SaveRecipeToFavoriteIntent",
+                    "slots": [
+                        {
+                            "name": "FavoritRecipe",
+                            "type": "FavoritRecipes"
+                        }
+                    ],
+                    "samples": [
+                        "Ich moechte ein neues Rezept zu den Favoriten hinzufuegen",
+                        "Neuen Favoriten anlegen"
                     ]
                 },
                 {
                     "name": "TellRecipeStepsIntent",
                     "slots": [],
                     "samples": [
+                        "weiter",
                         "kannst du mir die Rezeptschritte sagen",
                         "welche Schritte muss ich befolge",
                         "was fuer Schritte sind wichtig"
@@ -116,8 +135,29 @@
                     ]
                 },
                 {
-                    "name": "SelectRecipeByFavoritsIntentHandlerSelector",
-                    "slots": [],
+                    "name": "ModifyRecipeByUnitsIntent",
+                    "slots": [
+                        {
+                            "name": "Ingredient",
+                            "type": "AMAZON.NUMBER",
+                            "samples": [
+                                "Bitte sage mir die neue Menge dieser Zutat"
+                            ]
+                        }
+                    ],
+                    "samples": [
+                        "{Ingredient} anpassen",
+                        "kann ich ein Rezept nach Zutaten aendern"
+                    ]
+                },
+                {
+                    "name": "SelectRecipeByFavoritsSelectorIntent",
+                    "slots": [
+                        {
+                            "name": "FavoritRecipe",
+                            "type": "FavoritRecipes"
+                        }
+                    ],
                     "samples": [
                         "ich moechte einen Favoriten auswaehlen",
                         "ich waehle einen Favoriten aus der Liste",
@@ -212,9 +252,60 @@
                         		"value": "sechs"
                         	}
                         }
+                   ]
+               },
+               {
+                    "name": "FavoritRecipes",
+                    "values": [
+                        {
+                            "name": {
+                                "value": "schnitzel"
+                            }
+                        }
+                    ]
+                }
+            ]
+        },
+        "dialog": {
+            "intents": [
+                {
+                    "name": "ModifyRecipeByUnitsIntent",
+                    "confirmationRequired": false,
+                    "prompts": {},
+                    "slots": [
+                        {
+                            "name": "Ingredient",
+                            "type": "AMAZON.NUMBER",
+                            "confirmationRequired": true,
+                            "elicitationRequired": true,
+                            "prompts": {
+                                "confirmation": "Confirm.Slot.170099915505.1240512610375",
+                                "elicitation": "Elicit.Slot.170099915505.1240512610375"
+                            }
+                        }
                     ]
                 }
             ]
-        }
+        },
+        "prompts": [
+            {
+                "id": "Elicit.Slot.170099915505.1240512610375",
+                "variations": [
+                    {
+                        "type": "PlainText",
+                        "value": "Bitte sage mir die neue Menge dieser Zutat"
+                    }
+                ]
+            },
+            {
+                "id": "Confirm.Slot.170099915505.1240512610375",
+                "variations": [
+                    {
+                        "type": "PlainText",
+                        "value": "Ist {Ingredient} richtig?"
+                    }
+                ]
+            }
+        ]
     }
 }

pom.xml

@@ -45,11 +45,6 @@
   			<artifactId>mockito-core</artifactId>
   			<version>2.23.4</version>
   		</dependency>
-		<dependency>
-    		<groupId>com.amazon.alexa</groupId>
-    		<artifactId>alexa-skills-kit</artifactId>
-    		<version>1.8.1</version>
-		</dependency>
 	</dependencies>
 
 	<build>

sprint_ressources/sprint2/SetNumberOfPeopleIntentHandler.xml

@@ -0,0 +1 @@
+<mxfile modified="2018-12-09T23:35:58.022Z" host="www.draw.io" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36" version="9.5.9" etag="fvp_in4YlbGoSGNIhrJg" type="device"><diagram id="bcb13173-9494-129e-c73b-83b3c3b45b11" name="Page-1">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</diagram></mxfile>

src/main/java/verkocht/VerkochtStreamHandler.java

@@ -24,7 +24,9 @@
 import verkocht.handlers.LaunchRequestHandler;
 import verkocht.handlers.ModifyRecipeByUnitsIntentHandler;
 import verkocht.handlers.ModifyRecipeIntentHandler;
+import verkocht.handlers.SaveRecipeToFavoriteIntentHandler;
 import verkocht.handlers.SelectRecipeByCategoryIntentHandler;
+import verkocht.handlers.SelectRecipeByFavoritsSelectorIntentHandler;
 import verkocht.handlers.SelectRecipeByFavoritsStartIntentHandler;
 import verkocht.handlers.SelectRecipeByNameInputRecipeIntentHandler;
 import verkocht.handlers.SelectRecipeByNameStartIntentHandler;
@@ -40,23 +42,26 @@ public class VerkochtStreamHandler extends SkillStreamHandler {
     private static Skill getSkill() {
         return Skills.standard()
                 .addRequestHandlers(
-                        new TellMeCategoriesIntentHandler(), 
+                        new CancelandStopIntentHandler(), 
+                        new FallbackIntentHandler(),
+                        new HelpIntentHandler(),
+                        new LaunchRequestHandler(),
                         new ModifyRecipeIntentHandler(),
                         new ModifyRecipeByUnitsIntentHandler(),
+                        new SaveRecipeToFavoriteIntentHandler(),
                         new SelectRecipeByCategoryIntentHandler(), 
+                        new SelectRecipeByFavoritsSelectorIntentHandler(),
                         new SelectRecipeByFavoritsStartIntentHandler(),
                         new SelectRecipeByNameInputRecipeIntentHandler(),
                         new SelectRecipeByNameStartIntentHandler(),
                         new SelectRecipeIntentHandler(), 
+                        new SessionEndedRequestHandler(), 
                         new SetFavoriteIntentHandler(),
                         new SetNumberOfPeopleIntentHandler(),
                         new TellRecipeStepsIntentHandler(),
-                        new LaunchRequestHandler(),
-                        new CancelandStopIntentHandler(), 
-                        new SessionEndedRequestHandler(), 
-                        new HelpIntentHandler(),
-                        new FallbackIntentHandler())
-                .withSkillId("amzn1.ask.skill.5eb7a2b5-a62c-493e-8499-1a96b68b5c89").build();
+                        new TellMeCategoriesIntentHandler())
+//                .withSkillId("amzn1.ask.skill.c5bc074f-b96e-4343-ba1e-393f8084fe94")
+                .build();
     }
 
     public VerkochtStreamHandler() {

src/main/java/verkocht/handlers/SaveRecipeToFavoriteHandler.java → src/main/java/verkocht/handlers/SaveRecipeToFavoriteIntentHandler.java

@@ -30,14 +30,13 @@
 import com.amazon.ask.model.Response;
 import com.amazon.ask.model.Slot;
 
-public class SaveRecipeToFavoriteHandler implements RequestHandler {
+public class SaveRecipeToFavoriteIntentHandler implements RequestHandler {
 
     @Override
     public boolean canHandle(HandlerInput input) {
-        return input.matches(intentName("SelectRecipeByFavoritsStartIntentHandler"));
+        return input.matches(intentName("SaveRecipeToFavoriteIntent"));
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Optional<Response> handle(HandlerInput input) {
 

src/main/java/verkocht/handlers/SelectRecipeByFavoritsIntentSelectorHandler.java → src/main/java/verkocht/handlers/SelectRecipeByFavoritsSelectorIntentHandler.java

@@ -22,11 +22,11 @@
  * 
  *
  */
-public class SelectRecipeByFavoritsIntentSelectorHandler implements RequestHandler {
+public class SelectRecipeByFavoritsSelectorIntentHandler implements RequestHandler {
 
     @Override
     public boolean canHandle(HandlerInput input) {
-        return input.matches(intentName("SelectRecipeByFavoritsIntentSelectorHandler"));
+        return input.matches(intentName("SelectRecipeByFavoritsSelectorIntent"));
     }
 
     @Override