RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor Recipe to support IngredientAmount (WIP) 

Only Food IngredientAmounts are supported currently.
This commit is contained in:
Christopher C. Wells 2021-01-22 23:46:12 -08:00 committed by Christopher Charbonneau Wells
parent 2dfc9b457c
commit 670d6127ca
7 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/Http/Controllers/RecipeController.php
View File

@ -2,7 +2,8 @@
namespace App\Http\Controllers;
use App\Models\FoodAmount;
use App\Models\Food;
use App\Models\IngredientAmount;
use App\Models\Recipe;
use App\Models\RecipeStep;
use App\Rules\ArrayNotEmpty;
@ -73,29 +74,29 @@ class RecipeController extends Controller
// Pre-populate relationships from form data or current recipe.
$ingredients = [];
if ($old = old('ingredients')) {
foreach ($old['id'] as $key => $food_id) {
if (empty($food_id)) {
foreach ($old['id'] as $key => $ingredient_id) {
if (empty($ingredient_id)) {
continue;
}
$ingredients[] = [
'original_key' => $old['original_key'][$key],
'amount' => $old['amount'][$key],
'unit' => $old['unit'][$key],
'food_id' => $food_id,
'food_name' => $old['name'][$key],
'ingredient_id' => $ingredient_id,
'ingredient_name' => $old['name'][$key],
'detail' => $old['detail'][$key],
];
}
}
else {
foreach ($recipe->foodAmounts as $key => $foodAmount) {
foreach ($recipe->ingredientAmounts as $key => $ingredientAmount) {
$ingredients[] = [
'original_key' => $key,
'amount' => $foodAmount->amount_formatted,
'unit' => $foodAmount->unit,
'food_id' => $foodAmount->food->id,
'food_name' => $foodAmount->food->name,
'detail' => $foodAmount->detail,
'amount' => $ingredientAmount->amount_formatted,
'unit' => $ingredientAmount->unit,
'ingredient_id' => $ingredientAmount->ingredient->id,
'ingredient_name' => $ingredientAmount->ingredient->name,
'detail' => $ingredientAmount->detail,
];
}
}
@ -158,7 +159,7 @@ class RecipeController extends Controller
'ingredients.detail' => ['required', 'array'],
'ingredients.detail.*' => 'nullable|string',
'ingredients.id' => ['required', 'array', new ArrayNotEmpty],
'ingredients.id.*' => 'required_with:ingredients.amount.*|nullable|exists:App\Models\Food,id',
'ingredients.id.*' => 'required_with:ingredients.amount.*|nullable',
'ingredients.original_key' => 'nullable|array',
'steps.step' => ['required', 'array', new ArrayNotEmpty],
'steps.step.*' => 'nullable|string',
@ -179,30 +180,31 @@ class RecipeController extends Controller
}
// Delete any removed ingredients.
$removed = array_diff($recipe->foodAmounts->keys()->all(), $input['ingredients']['original_key']);
$removed = array_diff($recipe->ingredientAmounts->keys()->all(), $input['ingredients']['original_key']);
foreach ($removed as $removed_key) {
$recipe->foodAmounts[$removed_key]->delete();
$recipe->ingredientAmounts[$removed_key]->delete();
}
// Add/update current ingredients.
$food_amounts = [];
$ingredient_amounts = [];
$weight = 0;
foreach (array_filter($input['ingredients']['id']) as $key => $food_id) {
foreach (array_filter($input['ingredients']['id']) as $key => $ingredient_id) {
if (!is_null($input['ingredients']['original_key'][$key])) {
$food_amounts[$key] = $recipe->foodAmounts[$input['ingredients']['original_key'][$key]];
$ingredient_amounts[$key] = $recipe->ingredientAmounts[$input['ingredients']['original_key'][$key]];
}
else {
$food_amounts[$key] = new FoodAmount();
$ingredient_amounts[$key] = new IngredientAmount();
}
$food_amounts[$key]->fill([
$ingredient_amounts[$key]->fill([
'amount' => Number::floatFromString($input['ingredients']['amount'][$key]),
'unit' => $input['ingredients']['unit'][$key],
'detail' => $input['ingredients']['detail'][$key],
'weight' => $weight++,
]);
$food_amounts[$key]->food()->associate($food_id);
$ingredient_amounts[$key]->ingredient()
->associate(Food::where('id', $ingredient_id)->first());
}
$recipe->foodAmounts()->saveMany($food_amounts);
$recipe->ingredientAmounts()->saveMany($ingredient_amounts);
$steps = [];
$number = 1;

2
app/Models/JournalEntry.php
View File

@ -51,7 +51,7 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
*/
class JournalEntry extends Model
{
use HasFactory, HasIngredients;
use HasFactory;
/**
* @inheritdoc

9
app/Models/Recipe.php
View File

@ -81,7 +81,7 @@ class Recipe extends Model
/**
* @inheritdoc
*/
protected $with = ['ingredients'];
protected $with = ['ingredientAmounts'];
/**
* Get the steps for this Recipe.
@ -90,13 +90,6 @@ class Recipe extends Model
return $this->hasMany(RecipeStep::class)->orderBy('number');
}
/**
* Get the Food Amounts used for this Recipe.
*/
public function foodAmounts(): HasMany {
return $this->hasMany(FoodAmount::class)->orderBy('weight');
}
/**
* Add nutrient calculations handling to overloading.
*

2
app/Models/Traits/HasIngredients.php
View File

@ -22,7 +22,7 @@ trait HasIngredients
/**
* Get all of the ingredients.
*/
public function ingredients(): MorphMany {
public function ingredientAmounts(): MorphMany {
return $this->morphMany(IngredientAmount::class, 'parent');
}

7
app/Models/Traits/Ingredient.php
View File

@ -8,13 +8,6 @@ use Illuminate\Support\Collection;
trait Ingredient
{
/**
* Get all of the ingredient amounts for this ingredient.
*/
public function ingredientAmounts(): MorphToMany {
return $this->morphToMany(IngredientAmount::class, 'ingredient');
}
/**
* Gets search results for a term.
*/

4
resources/views/recipes/partials/ingredient-input.blade.php
View File

@ -9,8 +9,8 @@
:selectedValue="$unit ?? null">
<option value=""></option>
</x-inputs.select>
<x-ingredient-picker :default-id="$food_id ?? null"
:default-name="$food_name ?? null" />
<x-ingredient-picker :default-id="$ingredient_id ?? null"
:default-name="$ingredient_name ?? null" />
<x-inputs.input type="text"
class="block"
name="ingredients[detail][]"

4
resources/views/recipes/show.blade.php
View File

@ -22,11 +22,11 @@
<h3 class="mb-2 font-bold">Description</h3>
<div class="mb-2 text-gray-800">{{ $recipe->description }}</div>
<h3 class="mb-2 font-bold">Ingredients</h3>
@foreach($recipe->foodAmounts as $ia)
@foreach($recipe->ingredientAmounts as $ia)
<div class="flex flex-row space-x-2 mb-2">
<div>{{ \App\Support\Number::fractionStringFromFloat($ia->amount) }}</div>
@if($ia->unit)<div>{{ $ia->unit }}</div>@endif
<div>{{ $ia->food->name }}</div>
<div>{{ $ia->ingredient->name }}</div>
@if($ia->detail)<div class="text-gray-500">{{ $ia->detail }}</div>@endif
</div>
@endforeach