Adjusting to no relational model

src/main/java/guru/springframework/controllers/IngredientController.java

@@ -14,9 +14,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
-/**
- * Created by jt on 6/28/17.
- */
 @Slf4j
 @Controller
 public class IngredientController {
@@ -57,7 +54,6 @@ public String newRecipe(@PathVariable String recipeId, Model model){
 
         //need to return back parent id for hidden form property
         IngredientCommand ingredientCommand = new IngredientCommand();
-        ingredientCommand.setRecipeId(recipeId);
         model.addAttribute("ingredient", ingredientCommand);
 
         //init uom
@@ -81,7 +77,6 @@ public String updateRecipeIngredient(@PathVariable String recipeId,
     public String saveOrUpdate(@ModelAttribute IngredientCommand command){
         IngredientCommand savedCommand = ingredientService.saveIngredientCommand(command);
 
-        log.debug("saved receipe id:" + savedCommand.getRecipeId());
         log.debug("saved ingredient id:" + savedCommand.getId());
 
         return "redirect:/recipe/" + savedCommand.getRecipeId() + "/ingredient/" + savedCommand.getId() + "/show";

src/main/java/guru/springframework/converters/IngredientCommandToIngredient.java

@@ -7,9 +7,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 
-/**
- * Created by jt on 6/21/17.
- */
 @Component
 public class IngredientCommandToIngredient implements Converter<IngredientCommand, Ingredient> {
 
@@ -32,7 +29,6 @@ public Ingredient convert(IngredientCommand source) {
         if(source.getRecipeId() != null){
             Recipe recipe = new Recipe();
             recipe.setId(source.getRecipeId());
-            ingredient.setRecipe(recipe);
             recipe.addIngredient(ingredient);
         }
 

src/main/java/guru/springframework/converters/IngredientToIngredientCommand.java

@@ -7,9 +7,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 
-/**
- * Created by jt on 6/21/17.
- */
 @Component
 public class IngredientToIngredientCommand implements Converter<Ingredient, IngredientCommand> {
 
@@ -29,9 +26,6 @@ public IngredientCommand convert(Ingredient ingredient) {
 
         IngredientCommand ingredientCommand = new IngredientCommand();
         ingredientCommand.setId(ingredient.getId());
-        if (ingredient.getRecipe() != null) {
-            ingredientCommand.setRecipeId(ingredient.getRecipe().getId());
-        }
         ingredientCommand.setAmount(ingredient.getAmount());
         ingredientCommand.setDescription(ingredient.getDescription());
         ingredientCommand.setUom(uomConverter.convert(ingredient.getUom()));

src/main/java/guru/springframework/domain/Category.java

@@ -2,16 +2,17 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Set;
 
-/**
- * Created by jt on 6/13/17.
- */
 @Getter
 @Setter
+@Document
 public class Category {
     private String id;
     private String description;
+    @DBRef
     private Set<Recipe> recipes;
 }

src/main/java/guru/springframework/domain/Difficulty.java

@@ -1,9 +1,5 @@
 package guru.springframework.domain;
 
-/**
- * Created by jt on 6/13/17.
- */
 public enum Difficulty {
-
     EASY, MODERATE, KIND_OF_HARD, HARD
 }

src/main/java/guru/springframework/domain/Ingredient.java

@@ -2,20 +2,21 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.DBRef;
 
 import java.math.BigDecimal;
 
-/**
- * Created by jt on 6/13/17.
- */
 @Getter
 @Setter
 public class Ingredient {
 
+    @Id
     private String id;
     private String description;
     private BigDecimal amount;
 
+    @DBRef
     private UnitOfMeasure uom;
     private Recipe recipe;
 

src/main/java/guru/springframework/domain/Notes.java

@@ -2,15 +2,15 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
 
-
-/**
- * Created by jt on 6/13/17.
- */
 @Getter
 @Setter
+@Document
 public class Notes {
 
+    @Id
     private String id;
     private Recipe recipe;
     private String recipeNotes;

src/main/java/guru/springframework/domain/Recipe.java

@@ -2,17 +2,19 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * Created by jt on 6/13/17.
- */
 @Getter
 @Setter
+@Document
 public class Recipe {
 
+    @Id
     private String id;
     private String description;
     private Integer prepTime;
@@ -26,17 +28,16 @@ public class Recipe {
     private Difficulty difficulty;
     private Notes notes;
 
+    @DBRef
     private Set<Category> categories = new HashSet<>();
 
     public void setNotes(Notes notes) {
         if (notes != null) {
             this.notes = notes;
-            notes.setRecipe(this);
         }
     }
 
-    public Recipe addIngredient(Ingredient ingredient){
-        ingredient.setRecipe(this);
+    public Recipe addIngredient(Ingredient ingredient) {
         this.ingredients.add(ingredient);
         return this;
     }

src/main/java/guru/springframework/domain/UnitOfMeasure.java

@@ -2,15 +2,16 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 
-/**
- * Created by jt on 6/13/17.
- */
 @Getter
 @Setter
+@Document
 public class UnitOfMeasure {
 
+    @Id
     private String id;
     private String description;
 }

src/test/java/guru/springframework/converters/IngredientToIngredientCommandTest.java

@@ -11,9 +11,6 @@
 
 import static org.junit.Assert.*;
 
-/**
- * Created by jt on 6/21/17.
- */
 public class IngredientToIngredientCommandTest {
 
     public static final Recipe RECIPE = new Recipe();
@@ -45,7 +42,6 @@ public void testConvertNullUOM() throws Exception {
         //given
         Ingredient ingredient = new Ingredient();
         ingredient.setId(ID_VALUE);
-        ingredient.setRecipe(RECIPE);
         ingredient.setAmount(AMOUNT);
         ingredient.setDescription(DESCRIPTION);
         ingredient.setUom(null);
@@ -63,7 +59,6 @@ public void testConvertWithUom() throws Exception {
         //given
         Ingredient ingredient = new Ingredient();
         ingredient.setId(ID_VALUE);
-        ingredient.setRecipe(RECIPE);
         ingredient.setAmount(AMOUNT);
         ingredient.setDescription(DESCRIPTION);
 

src/test/java/guru/springframework/services/IngredientServiceImplTest.java

@@ -78,7 +78,6 @@ public void findByRecipeIdAndReceipeIdHappyPath() throws Exception {
 
         //when
         assertEquals("3", ingredientCommand.getId());
-        assertEquals("1", ingredientCommand.getRecipeId());
         verify(recipeRepository, times(1)).findById(anyString());
     }
 
@@ -116,7 +115,6 @@ public void testDeleteById() throws Exception {
         Ingredient ingredient = new Ingredient();
         ingredient.setId("3");
         recipe.addIngredient(ingredient);
-        ingredient.setRecipe(recipe);
         Optional<Recipe> recipeOptional = Optional.of(recipe);
 
         when(recipeRepository.findById(anyString())).thenReturn(recipeOptional);