diff --git a/database/Factories/GoalFactory.php b/database/Factories/GoalFactory.php index 434d713..29e1d08 100644 --- a/database/Factories/GoalFactory.php +++ b/database/Factories/GoalFactory.php @@ -20,12 +20,12 @@ class GoalFactory extends Factory { return [ 'user_id' => User::factory(), - 'name' => $this->faker->words, - 'days' => $this->faker->randomElement(Goal::days()->pluck('value')->all()), + 'name' => $this->faker->words(asText: true), + 'days' => $this->faker->numberBetween(1, Goal::days()->pluck('value')->sum()), 'calories' => $this->faker->numberBetween(1600, 2500), 'fat' => $this->faker->numberBetween(40, 90), - 'cholesterol' => $this->faker->numberBetween(0, 500), - 'sodium' => $this->faker->numberBetween(0, 3000), + 'cholesterol' => $this->faker->numberBetween(int2: 500), + 'sodium' => $this->faker->numberBetween(int2: 3000), 'carbohydrates' => $this->faker->numberBetween(50, 100), 'protein' => $this->faker->numberBetween(90, 200), ]; diff --git a/database/Seeders/DatabaseSeeder.php b/database/Seeders/DatabaseSeeder.php index fa79562..ac48a45 100644 --- a/database/Seeders/DatabaseSeeder.php +++ b/database/Seeders/DatabaseSeeder.php @@ -21,6 +21,7 @@ class DatabaseSeeder extends Seeder */ public function run(): void { + /** @var \App\Models\User $user */ $user = User::factory()->admin()->create([ 'username' => 'kcal', 'password' => Hash::make('kcal'), @@ -28,15 +29,8 @@ class DatabaseSeeder extends Seeder 'remember_token' => Str::random(10), ]); - $goals = []; - foreach (Nutrients::all() as $nutrient) { - $goals[] = [ - 'frequency' => 'daily', - 'name' => $nutrient['value'], - 'goal' => $nutrient['rdi'], - ]; - } - Goal::factory()->for($user)->createMany($goals); + // Goals will probably overlap but that's OK. + Goal::factory()->for($user)->count(3)->create(); $foods = Food::factory()->count(100)->create(); $recipes = Recipe::factory()