Update servlets to handle IngredientInput

src/main/java/shef/data/Ingredient.java

@@ -21,7 +21,7 @@ public class Ingredient {
   public Ingredient() {
 
   }
-
+  
   public Ingredient(EmbeddedEntity entity) {
 
   }

src/main/java/shef/data/Recipe.java

@@ -32,8 +32,12 @@ public class Recipe {
   private String key;
   private String name;
   private String description;
+  private double time;
+  private double servings;
+  private String imageKey;
   private Set<String> tags;
   private Set<String> ingredients;
+  private Set<String> equipment;
   private List<Step> steps;
   private Set<SpinOff> spinOffs;
   private long timestamp;
@@ -62,12 +66,19 @@ public Recipe(String name, String description, Set<String> tags, Set<String> ing
     this.timestamp = timestamp;
   }
 
-  /** Creates a Recipe from a Datastore entity. */
+  /** 
+   * Creates a Recipe from a Datastore entity.
+   * This constructor is used to easily convert an Entity into an object, which can be sent as JSON.
+   */
   public Recipe(Entity recipeEntity) {
     this.name = (String) recipeEntity.getProperty("name");
     this.description = (String) recipeEntity.getProperty("description");
+    this.time = (double) recipeEntity.getProperty("time");
+    this.servings = (double) recipeEntity.getProperty("servings");
+    this.imageKey = (String) recipeEntity.getProperty("imageKey");
     this.tags = getTagsFromEntity((Collection<EmbeddedEntity>) recipeEntity.getProperty("tags"));
     this.ingredients = getIngredientsFromEntity((Collection<EmbeddedEntity>) recipeEntity.getProperty("ingredients"));
+    this.equipment = getEquipmentFromEntity((Collection<EmbeddedEntity>) recipeEntity.getProperty("equipment"));
     this.steps = getStepsFromEntity((Collection<EmbeddedEntity>) recipeEntity.getProperty("steps"));
     this.timestamp = (long) recipeEntity.getProperty("timestamp");
   }
@@ -252,6 +263,15 @@ private Set<String> getIngredientsFromEntity(Collection<EmbeddedEntity> entityIn
     return ingredientsSet;
   }
 
+  /** Returns the equipment of an EmbeddedEntity as a Set. */
+  private Set<String> getEquipmentFromEntity(Collection<EmbeddedEntity> entityEquipment) {
+    Set<String> equipmentSet = new HashSet<>();
+    for (EmbeddedEntity equipment : entityEquipment) {
+      equipmentSet.add((String) equipment.getProperty("equipment"));
+    }
+    return equipmentSet;
+  }
+
   /** Returns the steps of an EmbeddedEntity as a List. */
   private List<Step> getStepsFromEntity(Collection<EmbeddedEntity> entitySteps) {
     List<Step> stepsList = new LinkedList<>();

src/main/java/shef/servlets/BlobServlet.java

@@ -17,11 +17,15 @@
 import com.google.appengine.api.blobstore.BlobKey;
 import com.google.appengine.api.blobstore.BlobstoreService;
 import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import com.google.appengine.api.blobstore.BlobInfo;
+import com.google.appengine.api.blobstore.BlobInfoFactory;
 import java.io.IOException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 /** Servlet that serves blobstore files. */
 @WebServlet("/blob")
@@ -33,4 +37,30 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     BlobKey blobKey = new BlobKey(request.getParameter("blob-key"));
     blobstoreService.serve(blobKey, response);
   }
+
+  /* 
+   * Returns the String representation of the BlobKey of the uploaded file, or null if the user didn't upload a file. 
+   * Used in alternative to getting the blob's direct URL, which causes crashes on the live server.
+  */
+  public static String getUploadedFileBlobKey(HttpServletRequest request, String formInputElementName) {
+    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
+    Map<String, List<BlobKey>> blobs = blobstoreService.getUploads(request);
+    List<BlobKey> blobKeys = blobs.get(formInputElementName);
+
+    // User submitted form without selecting a file, so we can't get a URL. (dev server)
+    if (blobKeys == null || blobKeys.isEmpty()) {
+      return null;
+    }
+
+    // Our form only contains a single file input, so get the first index.
+    BlobKey blobKey = blobKeys.get(0);
+
+    // User submitted form without selecting a file, so we can't get a URL. (live server)
+    BlobInfo blobInfo = new BlobInfoFactory().loadBlobInfo(blobKey);
+    if (blobInfo.getSize() == 0) {
+      blobstoreService.delete(blobKey);
+      return null;
+    }
+    return blobKey.getKeyString();
+  }
 }

src/main/java/shef/servlets/NewRecipeServlet.java

@@ -42,6 +42,7 @@ public class NewRecipeServlet extends HttpServlet {
   private DatastoreService datastore;
   private final String TAG = "tag";
   private final String INGREDIENT = "ingredient";
+  private final String EQUIPMENT = "equipment";
   private final String STEP = "step";
 
   @Override
@@ -62,7 +63,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     }
     Recipe original = new Recipe(recipeEntity);
     response.setContentType("application/json;");
-    response.getWriter().println(convertToJsonUsingGson(original));  
+    response.getWriter().println(new Gson().toJson(original));  
   }
 
   /** Posts a new recipe to the servlet. */
@@ -71,23 +72,26 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     Collection<String> searchStrings = new HashSet<>();
     String name = request.getParameter("name");
     searchStrings.add(name.toUpperCase());
+    double time = request.getParameter("time").equals("") ? 0 : Double.parseDouble(request.getParameter("time"));
+    double servings = request.getParameter("servings").equals("") ? 0 : Double.parseDouble(request.getParameter("servings"));
+    String imageKey = BlobServlet.getUploadedFileBlobKey(request, "image");
     String description = request.getParameter("description");
     Collection<EmbeddedEntity> tags = getParameters(request, TAG, searchStrings);
-    Collection<EmbeddedEntity> ingredients = getParameters(request, INGREDIENT, searchStrings);
+    Collection<EmbeddedEntity> ingredients = getIngredients(request, searchStrings);
+    Collection<EmbeddedEntity> equipment = getParameters(request, EQUIPMENT, null);
     Collection<EmbeddedEntity> steps = getParameters(request, STEP, null);
-    int likes;
-    try {
-      likes = Integer.parseInt(request.getParameter("likes"));
-    } catch (NumberFormatException e) {
-      likes = 0;
-    }
+    int likes = request.getParameter("likes") == null ? 0 : Integer.parseInt(request.getParameter("likes"));
     long timestamp = System.currentTimeMillis();
 
     Entity recipe = new Entity("Recipe");
     recipe.setProperty("name", name);
+    recipe.setProperty("time", time);
+    recipe.setProperty("servings", servings);
+    recipe.setProperty("imageKey", imageKey);
     recipe.setProperty("description", description);
     recipe.setProperty("tags", tags);
     recipe.setProperty("ingredients", ingredients);
+    recipe.setProperty("equipment", equipment);
     recipe.setProperty("steps", steps);
     recipe.setProperty("search-strings", new ArrayList<String>(searchStrings));
     recipe.setProperty("timestamp", timestamp);
@@ -122,16 +126,34 @@ private Collection<EmbeddedEntity> getParameters(HttpServletRequest request, Str
     return parameters;
   }
 
+  private Collection<EmbeddedEntity> getIngredients(HttpServletRequest request, Collection<String> searchStrings) {
+    Collection<EmbeddedEntity> parameters = new LinkedList<>();
+    int parameterNum = 0;
+    String parameterName = "ingredient" + parameterNum;
+    String[] parameterValues = request.getParameterValues(parameterName);
+    System.out.println(parameterValues.length);
+
+    // In the HTML form, parameters are named as [field name][index], ie step0.
+    // This loop increments the index of the parameter's name, exiting once it reaches an index for which there is no parameter.
+    while (parameterValues != null) {
+      addToSearchStrings(searchStrings, parameterValues[2]);
+      EmbeddedEntity parameterEntity = new EmbeddedEntity();
+      parameterEntity.setProperty("amount", parameterValues[0]);
+      parameterEntity.setProperty("unit", parameterValues[1]);
+      parameterEntity.setProperty("ingredient", parameterValues[2]);
+      parameters.add(parameterEntity);
+
+      parameterName = "ingredient" + (++parameterNum);
+      parameterValues = request.getParameterValues(parameterName);
+    }
+    return parameters;
+  }
+
   /** Adds a formatted search string to the set of search strings. */
   private void addToSearchStrings(Collection<String> searchStrings, String stringToAdd) {
     if (searchStrings == null) {
       return;
     }
     searchStrings.add(stringToAdd.toUpperCase());
   }
-
-  private String convertToJsonUsingGson(Recipe recipe) {
-    Gson gson = new Gson();
-    return gson.toJson(recipe);
-  }
 }

src/main/java/shef/servlets/RecipeImageUploadUrlServlet.java

@@ -0,0 +1,45 @@
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shef.servlets;
+
+import com.google.appengine.api.blobstore.BlobInfo;
+import com.google.appengine.api.blobstore.BlobInfoFactory;
+import com.google.appengine.api.blobstore.BlobKey;
+import com.google.appengine.api.blobstore.BlobstoreService;
+import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import com.google.appengine.api.images.ImagesService;
+import com.google.appengine.api.images.ImagesServiceFactory;
+import com.google.appengine.api.images.ServingUrlOptions;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.io.IOException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.List;
+
+/** Gets the Blobstore URL to send the recipe creation form to. */
+@WebServlet("/recipe-image-upload-url")
+public class RecipeImageUploadUrlServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
+    String uploadUrl = blobstoreService.createUploadUrl("/new-recipe");
+    response.setContentType("text/html");
+    response.getWriter().println(uploadUrl);
+  }
+}

src/main/java/shef/servlets/UserServlet.java

@@ -92,7 +92,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     // Get properties that don't come from the request.
     String id = userService.getCurrentUser().getUserId();
     String email = userService.getCurrentUser().getEmail();
-    String profilePicKey = getUploadedFileBlobKey(request, "profile-pic");
+    String profilePicKey = BlobServlet.getUploadedFileBlobKey(request, "profile-pic");
 
     // Get properties from the request.
     Map<String, String[]> parameterMap = request.getParameterMap();
@@ -130,28 +130,4 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     datastore.put(finalUser);
     response.sendRedirect(redirectUrl);
   }
-
-  // Returns the String representation of the BlobKey of the uploaded file, or null if the user didn't upload a file.
-  private String getUploadedFileBlobKey(HttpServletRequest request, String formInputElementName) {
-    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
-    Map<String, List<BlobKey>> blobs = blobstoreService.getUploads(request);
-    List<BlobKey> blobKeys = blobs.get(formInputElementName);
-
-    // User submitted form without selecting a file, so we can't get a URL. (dev server)
-    if (blobKeys == null || blobKeys.isEmpty()) {
-      return null;
-    }
-
-    // Our form only contains a single file input, so get the first index.
-    BlobKey blobKey = blobKeys.get(0);
-
-    // User submitted form without selecting a file, so we can't get a URL. (live server)
-    BlobInfo blobInfo = new BlobInfoFactory().loadBlobInfo(blobKey);
-    if (blobInfo.getSize() == 0) {
-      blobstoreService.delete(blobKey);
-      return null;
-    }
-
-  return blobKey.getKeyString();
-  }
 }

src/main/webapp/create-recipe-blank.html

@@ -36,7 +36,7 @@
     <title>shef</title>
   </head>
 
-  <body class="page-container" onload="protectPage(); navBarSetup();">
+  <body class="page-container" onload="protectPage(); navBarSetup(); getRecipeImageUploadUrl();">
     <template>
       <span>
         <svg class="bi bi-plus-circle bootstrap-icon" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -72,7 +72,7 @@ <h1 class="display-4">So you want to create a recipe?</h1>
       <div class="med-sep">
         <div class="row">
           <div class="col-sm-6 col-md-6 col-lg-6 text-left">
-            <form action="/new-recipe" method="POST">
+            <form id="form" method="POST" enctype="multipart/form-data">
               <h2>Basic Info</h2>
               <div class="form-group small-sep">
                 <label for="dishNameInput">1. What’s your dish called? *</label>
@@ -85,10 +85,14 @@ <h2>Basic Info</h2>
               <div class="form-group small-sep">
                 <label for="servingsInput">3. How many servings does it make? *</label>
                 <input type="number" name="servings" class="form-control" id="servingsInput" placeholder="...">
-              </div>       
+              </div>
+              <div class="form-group small-sep">
+                <label for="image">4. Upload an image of your dish!</label><br>
+                <input type="file" name="image" id="image">
+              </div>
               <div class="form-group small-sep">
-                <label>4. What tags apply to this recipe?</label>
-                <div id="Tags">        
+                <label>5. What tags apply to this recipe?</label>
+                <div id="Tags">
                   <parameter-input name="Tag" index="0" id="Tag0"></parameter-input>
                 </div>
               </div>
@@ -138,7 +142,7 @@ <h2>Permissions</h2>
                 <h2>Sharing</h2>
                 <div class="form-group">
                   <label for="permissionSelect">Spread the joy!</label>
-                  <select class="form-control" id="permissionSelect">
+                  <select class="form-control" id="groupSelect">
                     <option>Reciplease</option>
                     <option>Cal Badminton</option>
                     <option>Some Group</option>
@@ -150,7 +154,7 @@ <h2>Sharing</h2>
           </div>
           <div class="col-sm-6 col-md-6 col-lg-6 text-center">
             <figure class="figure">
-              <img src="assets/images/bdd_jjg.jpeg" class="figure-img img-fluid rounded" alt="...">
+              <img id="recipe-image" src="assets/images/bdd_jjg.jpeg" class="figure-img img-fluid rounded" alt="...">
               <figcaption class="figure-caption">The cover photo for your recipe - choose wisely.</figcaption>
             </figure>
           </div>