Filter appointments by animal type

Author: joaopms

app/Http/Controllers/AppointmentController.php

@@ -4,32 +4,34 @@
 
 use App\Http\Requests\ListAppointmentsRequest;
 use App\Http\Resources\AppointmentResource;
+use App\Models\Animal;
 use App\Models\Appointment;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
 class AppointmentController extends Controller
 {
     public function index(ListAppointmentsRequest $request)
     {
-        $query = Appointment::with([
-            'animal',
-            'animal.client',
-            'medic',
-        ])
-            ->orderBy('preferred_date', 'desc');
+        $appointments = Appointment::with(['animal', 'animal.client', 'medic'])
+            ->orderBy('preferred_date', 'desc')
+            // Date filters
+            ->when($request->start, fn (Builder $query) => $query->where('preferred_date', '>=', $request->start))
+            ->when($request->end, fn (Builder $query) => $query->where('preferred_date', '<=', $request->end))
+            // Animal type filter
+            ->when($request->animalTypes, function (Builder $query) use ($request) {
+                $query->whereHas('animal', fn (Builder $animal) => $animal->whereIn('type', $request->animalTypes));
+            })
+            // -------
+            ->paginate(15);
 
-        if ($request->start) {
-            $query->where('preferred_date', '>=', $request->start);
-        }
-        if ($request->end) {
-            $query->where('preferred_date', '<=', $request->end);
-        }
-
-        $appointments = $query->paginate(15);
+        // TODO Cache animal types
+        $animalTypes = Animal::types(approved: false);
 
         return Inertia::render('dashboard/Appointments', [
             'appointments' => AppointmentResource::collection($appointments),
+            'animalTypes' => $animalTypes,
         ]);
     }
 

app/Http/Controllers/PublicController.php

@@ -16,8 +16,7 @@ public function home()
     {
         return Inertia::render('client/ScheduleAppointment', [
             // TODO Cache animal types
-            // TODO Only show approved (aka assigned appointments) animals
-            'animalTypes' => Animal::distinct('type')->orderBy('type')->pluck('type'),
+            'animalTypes' => Animal::types(approved: true),
             'timeOfDay' => TimeOfDay::selectable(),
         ]);
     }

app/Http/Requests/ListAppointmentsRequest.php

@@ -15,8 +15,9 @@ public function rules(): array
     {
         return [
             // Filters
-            'start' => ['date'], // Date
-            'end' => ['date'],   // Date
+            'start' => ['date'],            // Date
+            'end' => ['date'],              // Date
+            'animalTypes' => ['array'],    // Animal types
         ];
     }
 }

app/Models/Animal.php

@@ -6,6 +6,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
 
 class Animal extends Model
 {
@@ -25,4 +27,15 @@ public function appointments(): HasMany
     {
         return $this->hasMany(Appointment::class);
     }
+
+    public static function types(bool $approved): array
+    {
+        return DB::table('animals')
+            ->join('appointments', 'animals.id', '=', 'appointments.animal_id')
+            ->when($approved, fn (Builder $query) => $query->whereNotNull('appointments.medic_id'))
+            ->select('animals.type')
+            ->distinct()
+            ->pluck('animals.type')
+            ->toArray();
+    }
 }

app/Models/Appointment.php

@@ -3,6 +3,8 @@
 namespace App\Models;
 
 use App\TimeOfDay;
+use Illuminate\Database\Eloquent\Attributes\Scope;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -51,6 +53,12 @@ public function client(): HasOneThrough
         );
     }
 
+    #[Scope]
+    protected function assigned(Builder $query): Builder
+    {
+        return $query->whereNotNull('medic_id');
+    }
+
     public function preferredDateFormatted(): Attribute
     {
         return Attribute::make(

resources/js/pages/dashboard/Appointments.vue

@@ -12,6 +12,7 @@ interface AppointmentsDataManager {
             start: CalendarDate | undefined;
             end: CalendarDate | undefined;
         };
+        animalTypes: string[] | undefined;
     };
     pagination: {
         pageIndex: number;
@@ -42,6 +43,7 @@ const dataManager = ref<AppointmentsDataManager>({
             start: params.start ? parseDate(params.start as string) : undefined,
             end: params.end ? parseDate(params.end as string) : undefined,
         },
+        animalTypes: params?.animalTypes,
     },
     pagination: {
         pageIndex: parseInt(meta.value.current_page),
@@ -58,11 +60,12 @@ watch(
 );
 
 const urlFilters = computed(() => {
-    const preferredDate = dataManager.value.filters.preferredDate;
+    const { preferredDate, animalTypes } = dataManager.value.filters;
 
     return {
         start: preferredDate?.start?.toString(),
         end: preferredDate?.end?.toString(),
+        animalTypes: animalTypes,
     };
 });
 
@@ -95,10 +98,10 @@ function updateData() {
         <UCard>
             <div class="space-y-4">
                 <!-- Filters -->
-                <div class="flex items-center gap-2">
+                <div class="flex items-center gap-3">
                     <!-- Date filter -->
                     <UPopover>
-                        <UButton variant="subtle" icon="i-lucide-calendar" size="sm">
+                        <UButton variant="soft" icon="i-lucide-calendar" size="sm">
                             <template v-if="datesFilter.start">
                                 {{ formatDate(datesFilter.start) }}
 
@@ -118,6 +121,16 @@ function updateData() {
                             </div>
                         </template>
                     </UPopover>
+
+                    <!-- Animal type list -->
+                    <UInputMenu
+                        v-model="dataManager.filters.animalTypes"
+                        :items="page.props.animalTypes as string[]"
+                        variant="soft"
+                        size="sm"
+                        multiple
+                        placeholder="Select animal types"
+                    />
                 </div>
 
                 <USeparator />