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

Add nutrient calculation for recipe volumes

This commit is contained in:
Christopher C. Wells 2021-04-18 13:46:20 -07:00
parent 809e3ca7d7
commit fb3fa3dd1d
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Recipe.php
View File

@ -80,6 +80,9 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media;
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\RecipeSeparator[] $separators * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\RecipeSeparator[] $separators
* @property-read int|null $separators_count * @property-read int|null $separators_count
* @property-read Collection $units_supported * @property-read Collection $units_supported
* @property float|null $volume
* @property-read string|null $volume_formatted
* @method static \Illuminate\Database\Eloquent\Builder|Recipe whereVolume($value)
*/ */
final class Recipe extends Model implements HasMedia final class Recipe extends Model implements HasMedia
{ {

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

@ -65,6 +65,9 @@ trait Ingredient
if (!empty($this->serving_weight)) { if (!empty($this->serving_weight)) {
$supported = $supported->merge($units->where('type', 'weight')); $supported = $supported->merge($units->where('type', 'weight'));
} }
if (isset($this->volume) && !empty($this->volume)) {
$supported = $supported->merge($units->where('type', 'volume'));
}
return $supported->sortBy('label'); return $supported->sortBy('label');
} }
} }

23
app/Support/Nutrients.php
View File

@ -175,6 +175,8 @@ class Nutrients
/** /**
* Calculate a nutrient amount for a recipe. * Calculate a nutrient amount for a recipe.
*
* Weight base unit is grams, volume base unit is cups.
*/ */
public static function calculateRecipeNutrientAmount( public static function calculateRecipeNutrientAmount(
Recipe $recipe, Recipe $recipe,
@ -182,18 +184,19 @@ class Nutrients
float $amount, float $amount,
string $fromUnit string $fromUnit
): float { ): float {
if ($fromUnit === 'oz') { if ($fromUnit === 'serving') {
return $amount * self::$gramsPerOunce / $recipe->weight * $recipe->{"{$nutrient}Total"}(); // Use "per serving" methods directly.
}
elseif ($fromUnit === 'serving') {
return $recipe->{"{$nutrient}PerServing"}() * $amount; return $recipe->{"{$nutrient}PerServing"}() * $amount;
} }
elseif ($fromUnit === 'gram') { $multiplier = match ($fromUnit) {
return $amount / $recipe->weight * $recipe->{"{$nutrient}Total"}(); 'oz' => $amount * self::$gramsPerOunce / $recipe->weight,
} 'gram' => $amount / $recipe->weight,
else { 'tsp' => $amount / 48 / $recipe->volume,
throw new \DomainException("Unsupported recipe unit: {$fromUnit}"); 'tbsp' => $amount / 16 / $recipe->volume,
} 'cup' => $amount / $recipe->volume,
default => throw new \DomainException("Unsupported recipe unit: {$fromUnit}"),
};
return $multiplier * $recipe->{"{$nutrient}Total"}();
} }
/** /**