Merge pull request #175 from folded-ear/no-quantity-shop-agg

scale sections' ingredients, but not subrecipes'

Author: barneyb

src/main/java/com/brennaswitzer/cookbook/domain/AggregateIngredient.java

@@ -36,4 +36,6 @@ default IngredientRef addIngredient(Ingredient ingredient, String preparation) {
      */
     Collection<IngredientRef> assembleRawIngredientRefs();
 
+    boolean isOwnedSection();
+
 }

src/main/java/com/brennaswitzer/cookbook/services/PlanService.java

@@ -176,16 +176,21 @@ private void sendToPlan(IngredientRef ref, PlanItem aggItem, Double scale) {
         }
         Ingredient ingredient = Hibernate.unproxy(ref.getIngredient(), Ingredient.class);
         if (ingredient instanceof AggregateIngredient agg) {
-            // Subrecipes DO NOT get scaled; there's not a quantifiable
-            // relationship to multiply across. The ref's quantity itself is
-            // scaled, so the recipe remains intact.
             PlanItem it = new PlanItem(
                     ingredient.getName(),
                     ref.getQuantity(),
                     ingredient,
                     ref.getPreparation());
             aggItem.addAggregateComponent(it);
-            sendToPlan(agg, it, 1d);
+            // Subrecipes DO NOT get scaled; there's not a quantifiable
+            // relationship to multiply across. The ref's quantity itself is
+            // scaled, so the parent recipe remains intact. Sections, however,
+            // DO get scaled as they are "part of" the parent recipe (and never
+            // have a quantity on their ref).
+            if (!agg.isOwnedSection()) {
+                scale = 1d;
+            }
+            sendToPlan(agg, it, scale);
         } else {
             aggItem.addAggregateComponent(new PlanItem(
                     ref.toString(),