Merge branch 'master' into FR-stock-purchase-metrics

changelog/70_UNRELEASED_xxxx.xx.xx.md

@@ -49,6 +49,7 @@
 ### Meal plan
 
 - Added a new sub feature flag `FEATURE_FLAG_RECIPES_MEALPLAN` (in `config.php`) to only disable the meal plan if not needed (thanks @webysther)
+- Fixed that consuming a recipe from the meal plan didn't add its "Produces product"-product to stock (if any)
 
 ### Chores
 

migrations/0215.sql

@@ -0,0 +1,64 @@
+DROP VIEW stock_missing_products;
+CREATE VIEW stock_missing_products
+AS
+
+SELECT *
+FROM (
+
+-- Products WITHOUT sub products where the amount of the sub products SHOULD NOT be cumulated
+SELECT
+	p.id,
+	MAX(p.name) AS name,
+	p.min_stock_amount - IFNULL(SUM(s.amount), 0) + (CASE WHEN p.treat_opened_as_out_of_stock = 1 THEN IFNULL(SUM(s.amount_opened), 0) ELSE 0 END) AS amount_missing,
+	CASE WHEN IFNULL(SUM(s.amount), 0) > 0 THEN 1 ELSE 0 END AS is_partly_in_stock
+FROM products_view p
+LEFT JOIN stock_current s
+	ON p.id = s.product_id
+WHERE p.min_stock_amount != 0
+	AND p.cumulate_min_stock_amount_of_sub_products = 0
+	AND p.has_sub_products = 0
+	AND p.parent_product_id IS NULL
+	AND IFNULL(p.active, 0) = 1
+GROUP BY p.id
+
+UNION
+
+-- Parent products WITH sub products where the amount of the sub products SHOULD be cumulated
+SELECT
+	p.id,
+	MAX(p.name) AS name,
+	SUM(sub_p.min_stock_amount) - IFNULL(SUM(s.amount_aggregated), 0) + (CASE WHEN p.treat_opened_as_out_of_stock = 1 THEN IFNULL(SUM(s.amount_opened_aggregated), 0) ELSE 0 END) AS amount_missing,
+	CASE WHEN IFNULL(SUM(s.amount), 0) > 0 THEN 1 ELSE 0 END AS is_partly_in_stock
+FROM products_view p
+JOIN products_resolved pr
+	ON p.id = pr.parent_product_id
+JOIN products sub_p
+	ON pr.sub_product_id = sub_p.id
+LEFT JOIN stock_current s
+	ON pr.sub_product_id = s.product_id
+WHERE sub_p.min_stock_amount != 0
+	AND p.cumulate_min_stock_amount_of_sub_products = 1
+	AND IFNULL(p.active, 0) = 1
+GROUP BY p.id
+
+UNION
+
+-- Sub products where the amount SHOULD NOT be cumulated into the parent product
+SELECT
+	sub_p.id,
+	MAX(sub_p.name) AS name,
+	SUM(sub_p.min_stock_amount) - IFNULL(SUM(s.amount_aggregated), 0) + (CASE WHEN p.treat_opened_as_out_of_stock = 1 THEN IFNULL(SUM(s.amount_opened_aggregated), 0) ELSE 0 END) AS amount_missing,
+	CASE WHEN IFNULL(SUM(s.amount), 0) > 0 THEN 1 ELSE 0 END AS is_partly_in_stock
+FROM products p
+JOIN products_resolved pr
+	ON p.id = pr.parent_product_id
+JOIN products sub_p
+	ON pr.sub_product_id = sub_p.id
+LEFT JOIN stock_current s
+	ON pr.sub_product_id = s.product_id
+WHERE sub_p.min_stock_amount != 0
+	AND p.cumulate_min_stock_amount_of_sub_products = 0
+	AND IFNULL(p.active, 0) = 1
+GROUP BY sub_p.id
+) x
+WHERE x.amount_missing > 0;

services/ChoresService.php

@@ -271,7 +271,7 @@ class ChoresService extends BaseService
 			$this->getDatabaseService()->ExecuteDbStatement('UPDATE chores_log SET chore_id = ' . $choreIdToKeep . ' WHERE chore_id = ' . $choreIdToRemove);
 			$this->getDatabaseService()->ExecuteDbStatement('DELETE FROM chores WHERE id = ' . $choreIdToRemove);
 		}
-		catch (Exception $ex)
+		catch (\Exception $ex)
 		{
 			$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
 			throw $ex;

services/DatabaseMigrationService.php

@@ -74,7 +74,7 @@ class DatabaseMigrationService extends BaseService
 					$migrationCounter++;
 				}
 			}
-			catch (Exception $ex)
+			catch (\Exception $ex)
 			{
 				$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
 				throw $ex;

services/RecipesService.php

@@ -94,19 +94,30 @@ class RecipesService extends BaseService
 				}
 			}
 		}
-		catch (Exception $ex)
+		catch (\Exception $ex)
 		{
 			$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
 			throw $ex;
 		}
 		$this->getDatabaseService()->GetDbConnectionRaw()->commit();
 
-		$recipeRow = $this->getDatabase()->recipes()->where('id = :1', $recipeId)->fetch();
+		$recipe = $this->getDatabase()->recipes()->where('id = :1', $recipeId)->fetch();
-		if (!empty($recipeRow->product_id))
+		$productId = $recipe->product_id;
+		$amount = $recipe->desired_servings;
+		if ($recipe->type == self::RECIPE_TYPE_MEALPLAN_SHADOW)
 		{
-			$product = $this->getDatabase()->products()->where('id = :1', $recipeRow->product_id)->fetch();
+			// Use "Produces product" of the original recipe
+			$mealPlanEntry = $this->getDatabase()->meal_plan()->where('id = :1', explode('#', $recipe->name)[1])->fetch();
+			$recipe = $this->getDatabase()->recipes()->where('id = :1', $mealPlanEntry->recipe_id)->fetch();
+			$productId = $recipe->product_id;
+			$amount = $mealPlanEntry->recipe_servings;
+		}
+
+		if (!empty($productId))
+		{
+			$product = $this->getDatabase()->products()->where('id = :1', $productId)->fetch();
 			$recipeResolvedRow = $this->getDatabase()->recipes_resolved()->where('recipe_id = :1', $recipeId)->fetch();
-			$this->getStockService()->AddProduct($recipeRow->product_id, $recipeRow->desired_servings, null, StockService::TRANSACTION_TYPE_SELF_PRODUCTION, date('Y-m-d'), $recipeResolvedRow->costs_per_serving, null, null, $dummyTransactionId, $product->default_stock_label_type, true);
+			$this->getStockService()->AddProduct($productId, $amount, null, StockService::TRANSACTION_TYPE_SELF_PRODUCTION, date('Y-m-d'), $recipeResolvedRow->costs_per_serving, null, null, $dummyTransactionId, $product->default_stock_label_type, true);
 		}
 	}
 

services/StockService.php

@@ -1702,7 +1702,7 @@ class StockService extends BaseService
 			$this->getDatabaseService()->ExecuteDbStatement('UPDATE shopping_list SET product_id = ' . $productIdToKeep . ', amount = amount * ' . $factor . ' WHERE product_id = ' . $productIdToRemove);
 			$this->getDatabaseService()->ExecuteDbStatement('DELETE FROM products WHERE id = ' . $productIdToRemove);
 		}
-		catch (Exception $ex)
+		catch (\Exception $ex)
 		{
 			$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
 			throw $ex;
@@ -1749,7 +1749,7 @@ class StockService extends BaseService
 					}
 				}
 			}
-			catch (Exception $ex)
+			catch (\Exception $ex)
 			{
 				$this->getDatabaseService()->GetDbConnectionRaw()->rollback();
 				throw $ex;