Add date goal handling for user journal

app/Http/Controllers/JournalEntryController.php

@@ -42,25 +42,20 @@ class JournalEntryController extends Controller
         }
 
         // Get daily goals data for user.
-        $goals = Auth::user()->getGoalsByTime($date);
+        $goal = Auth::user()->getGoalByDate($date);
-        $dailyGoals = [];
+        $goalProgress = [];
-        foreach (Nutrients::all()->pluck('value') as $nutrient) {
-            $goal = $goals['present']
-                ->where('frequency', 'daily')
-                ->where('name', $nutrient)
-                ->first();
         if ($goal) {
-                $dailyGoals[$goal->name] = round($sums[$goal->name] / $goal->goal * 100);
+            foreach (Nutrients::all()->pluck('value') as $nutrient) {
-                if ($dailyGoals[$goal->name] > 0) {
+                $goalProgress[$nutrient] = round($sums[$nutrient] / $goal->{$nutrient} * 100);
-                    $dailyGoals[$goal->name] .= '%';
+                $goalProgress[$nutrient] .= '%';
-                }
             }
         }
 
         return view('journal-entries.index')
             ->with('entries', $entries)
             ->with('sums', $sums)
-            ->with('dailyGoals', $dailyGoals)
+            ->with('goal', $goal)
+            ->with('goalProgress', $goalProgress)
             ->with('date', $date);
     }
 

app/Models/Goal.php

@@ -81,6 +81,7 @@ final class Goal extends Model
      * Each entry has the following keys:
      *  - value: Day value (used for bitwise operations).
      *  - label: Human-readable name for the day.
+     *  - dow: ISO-8601 numeric representation of the day of the week.
      */
     public static function days(): Collection
     {
@@ -88,30 +89,37 @@ final class Goal extends Model
             [
                 'value' => 1,
                 'label' => 'monday',
+                'dow' => 1,
             ],
             [
                 'value' => 2,
                 'label' => 'tuesday',
+                'dow' => 2,
             ],
             [
                 'value' => 4,
                 'label' => 'wednesday',
+                'dow' => 3,
             ],
             [
                 'value' => 8,
                 'label' => 'thursday',
+                'dow' => 4,
             ],
             [
                 'value' => 16,
                 'label' => 'friday',
+                'dow' => 5,
             ],
             [
                 'value' => 32,
                 'label' => 'saturday',
+                'dow' => 6,
             ],
             [
                 'value' => 64,
                 'label' => 'sunday',
+                'dow' => 7,
             ],
         ]);
     }

app/Models/User.php

@@ -106,14 +106,14 @@ final class User extends Authenticatable implements HasMedia
     }
 
     /**
-     * Get User's past, present, and future goals.
+     * Get user's goal (if one exists) for a specific date.
-     *
-     * @todo Refactor or remove as needed.
-     *
-     * @return \Illuminate\Support\Collection[]
      */
-    public function getGoalsByTime(?Carbon $date = null): array {
+    public function getGoalByDate(Carbon $date): ?Goal {
-        return ['past' => new Collection(), 'present' => new Collection(), 'future' => new Collection()];
+        $day = Goal::days()->firstWhere('dow', $date->format('N'));
+        if (!$day) {
+            throw new \BadMethodCallException("No day with `dow` value {$date->format('N')}.");
+        }
+        return $this->goals()->whereRaw("(days & {$day['value']}) != 0")->get()->first();
     }
 
     /**

resources/views/journal-entries/index.blade.php

@@ -51,7 +51,7 @@
                     <span class="text-lg">{{ number_format($sums['calories']) }}</span>
                 </div>
                 <div class="font-extrabold text-right text-lg">
-                    {{ $dailyGoals['calories'] ?? 'N/A' }}
+                    {{ $goalProgress['calories'] ?? 'N/A' }}
                 </div>
             </div>
             <div class="flex justify-between items-baseline border-b border-gray-300 text-sm">
@@ -60,7 +60,7 @@
                     {{ number_format($sums['fat']) }}g
                 </div>
                 <div class="text-right">
-                    {{ $dailyGoals['fat'] ?? 'N/A' }}
+                    {{ $goalProgress['fat'] ?? 'N/A' }}
                 </div>
             </div>
             <div class="flex justify-between items-baseline border-b border-gray-300 text-sm">
@@ -69,7 +69,7 @@
                     {{ number_format($sums['cholesterol']) }}mg
                 </div>
                 <div class="text-right">
-                    {{ $dailyGoals['cholesterol'] ?? 'N/A' }}
+                    {{ $goalProgress['cholesterol'] ?? 'N/A' }}
                 </div>
             </div>
             <div class="flex justify-between items-baseline border-b border-gray-300 text-sm">
@@ -78,7 +78,7 @@
                     {{ number_format($sums['sodium']) }}mg
                 </div>
                 <div class="text-right">
-                    {{ $dailyGoals['sodium'] ?? 'N/A' }}
+                    {{ $goalProgress['sodium'] ?? 'N/A' }}
                 </div>
             </div>
             <div class="flex justify-between items-baseline border-b border-gray-300 text-sm">
@@ -87,7 +87,7 @@
                     {{ number_format($sums['carbohydrates']) }}g
                 </div>
                 <div class="text-right">
-                    {{ $dailyGoals['carbohydrates'] ?? 'N/A' }}
+                    {{ $goalProgress['carbohydrates'] ?? 'N/A' }}
                 </div>
             </div>
             <div class="flex justify-between items-baseline text-sm">
@@ -96,9 +96,18 @@
                     {{ number_format($sums['protein']) }}g
                 </div>
                 <div class="text-right">
-                    {{ $dailyGoals['protein'] ?? 'N/A' }}
+                    {{ $goalProgress['protein'] ?? 'N/A' }}
                 </div>
             </div>
+            <h4 class="font-semibold text-lg pt-2">Goal</h4>
+            @empty($goal)
+                <div class="italic">No goal.</div>
+            @else
+                <a class="text-gray-500 hover:text-gray-700 hover:border-gray-300"
+                   href="{{ route('goals.show', $goal) }}">
+                    {{ $goal->name }}
+                </a>
+            @endempty
         </div>
         <div class="w-full sm:w-3/5 md:w-2/3 lg:w-3/4 flex flex-col space-y-4">
             @foreach(['breakfast', 'lunch', 'dinner', 'snacks'] as $meal)