Merge pull request #5764 from RoboJackets/kristaps/inventory-in-attendance

kberzinch · web-flow · commit b0deeee57d95 · 2026-08-08T08:53:50.000-04:00
Allow including inventory data during attendance submission
diff --git a/app/Http/Controllers/AttendanceController.php b/app/Http/Controllers/AttendanceController.php
@@ -15,6 +15,7 @@
 use App\Models\Team;
 use App\Models\User;
 use App\Util\AuthorizeInclude;
+use App\Util\DeviceInventory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -73,33 +74,47 @@ public function store(StoreAttendanceRequest $request): JsonResponse
         }
 
         if ($gtid !== null) {
-            $user = User::where('gtid', '=', $gtid)->first();
+            $attendee = User::where('gtid', '=', $gtid)->first();
             $attExistingQ = Attendance::where($request->only(['attendable_type', 'attendable_id']))
                 ->where('gtid', '=', $gtid)->whereDate('created_at', $date);
             $identifier = ['key' => 'gtid', 'value' => $gtid];
         } else {
-            $user = null;
+            $attendee = null;
             $attExistingQ = Attendance::where(
                 $request->only(['attendable_type', 'attendable_id', 'access_card_number'])
             )
                 ->whereDate('created_at', $date);
             $identifier = ['key' => 'access_card_number', 'value' => $request->input('access_card_number')];
         }
 
+        // Upsert the device if a reader is provided
+        $device = null;
+        if ($request->has('reader')) {
+            $device = DeviceInventory::upsert($request, $request->input('reader'));
+        }
+
+        $attendanceData = $request->validated();
+        unset($attendanceData['reader']);
+
         $attExistingCount = $attExistingQ->count();
         if ($attExistingCount > 0) {
             Log::debug(self::class.': Found attendance on '.$date.' for '.$identifier['value'].' - ignoring.');
             $att = $attExistingQ->first();
             $code = 200;
 
-            if ($user !== null) {
-                PushToJedi::dispatch($user, self::class, -1, 'duplicate-attendance');
+            if ($attendee !== null) {
+                PushToJedi::dispatch($attendee, self::class, -1, 'duplicate-attendance');
             }
         } else {
             Log::debug(self::class.': No attendance yet on '.$date.' for '.$identifier['value'].' - saving.');
+
+            if ($device !== null) {
+                $attendanceData['device_serial_number'] = $device->serial_number;
+            }
+
             $att = Attendance::create(
                 array_merge(
-                    $request->validated(),
+                    $attendanceData,
                     [
                         'recorded_by' => $request->user()->id,
                         $identifier['key'] => $identifier['value'],
diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
@@ -6,8 +6,7 @@
 
 use App\Http\Requests\StoreDeviceRequest;
 use App\Http\Resources\Device as DeviceResource;
-use App\Models\Device;
-use App\Models\User;
+use App\Util\DeviceInventory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Routing\Controllers\Middleware;
@@ -27,37 +26,7 @@ public static function middleware(): array
      */
     public function inventory(StoreDeviceRequest $request): JsonResponse
     {
-        $user = $request->user();
-
-        if (! $user instanceof User) {
-            return response()->json([
-                'status' => 'error',
-                'message' => 'A user token is required.',
-            ], 401);
-        }
-
-        $ipAddress = $request->ip();
-
-        if ($ipAddress === null) {
-            return response()->json([
-                'status' => 'error',
-                'message' => 'last_seen_ip_address is required.',
-            ], 422);
-        }
-
-        $validated = $request->validated();
-
-        $device = Device::updateOrCreate(
-            ['serial_number' => $validated['serial_number']],
-            array_merge(
-                $validated,
-                [
-                    'last_seen_user_id' => $user->id,
-                    'last_seen_at' => now(),
-                    'last_seen_ip_address' => $ipAddress,
-                ]
-            )
-        );
+        $device = DeviceInventory::upsert($request, $request->validated());
 
         $code = $device->wasRecentlyCreated ? 201 : 200;
 
diff --git a/app/Http/Requests/StoreAttendanceRequest.php b/app/Http/Requests/StoreAttendanceRequest.php
@@ -53,6 +53,34 @@ public function rules(): array
             'created_at' => [
                 'date',
             ],
+            'reader' => [
+                'sometimes',
+                'array',
+            ],
+            'reader.serial_number' => [
+                'required_with:reader',
+                'digits:7',
+            ],
+            'reader.hardware_version' => [
+                'required_with:reader',
+                'string',
+                'max:255',
+            ],
+            'reader.software_version' => [
+                'required_with:reader',
+                'string',
+                'max:255',
+            ],
+            'reader.firmware_version' => [
+                'required_with:reader',
+                'string',
+                'max:255',
+            ],
+            'reader.battery_percentage' => [
+                'required_with:reader',
+                'integer',
+                'between:0,100',
+            ],
         ];
     }
 }
diff --git a/app/Http/Resources/Attendance.php b/app/Http/Resources/Attendance.php
@@ -32,6 +32,7 @@ public function toArray(Request $request): array
                 $this->gtid
             ),
             'access_card_number' => $this->access_card_number,
+            'device_serial_number' => $this->device_serial_number,
             'source' => $this->source,
             'recorded_by' => new Manager($this->whenLoaded('recorded')),
             'created_at' => $this->created_at,
@@ -40,6 +41,7 @@ public function toArray(Request $request): array
 
             // Relationships
             'attendee' => new UserResource($this->whenLoaded('attendee')),
+            'device' => new Device($this->whenLoaded('device')),
             // This deliberately doesn't include the remote attendance link as there is no HTTP resource for it
         ];
     }
diff --git a/app/Models/Attendance.php b/app/Models/Attendance.php
@@ -30,6 +30,8 @@
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property int|null $remote_attendance_link_id
  * @property int|null $people_counter_id
+ * @property int|null $device_serial_number
+ * @property-read \App\Models\Device|null $device
  * @property-read \App\Models\Event|\App\Models\Team $attendable
  * @property-read \App\Models\User|null $attendee
  * @property-read \App\Models\User|null $recorded
@@ -89,6 +91,7 @@ class Attendance extends Model
     public const array RELATIONSHIP_PERMISSIONS = [
         'attendee' => 'read-users',
         'recorded' => 'read-users',
+        'device' => 'create-attendance',
     ];
 
     /**
@@ -141,6 +144,16 @@ public function remoteAttendanceLink(): BelongsTo
         return $this->belongsTo(RemoteAttendanceLink::class);
     }
 
+    /**
+     * Get the Device that recorded this Attendance model.
+     *
+     * @return BelongsTo<Device, Attendance>
+     */
+    public function device(): BelongsTo
+    {
+        return $this->belongsTo(Device::class, 'device_serial_number', 'serial_number');
+    }
+
     /**
      * Scope query to start at given date.
      *
diff --git a/app/Models/Device.php b/app/Models/Device.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Device extends Model
 {
@@ -69,4 +70,14 @@ public function lastSeenUser(): BelongsTo
     {
         return $this->belongsTo(User::class, 'last_seen_user_id');
     }
+
+    /**
+     * Get the attendance records created with this device.
+     *
+     * @return HasMany<\App\Models\Attendance, \App\Models\Device>
+     */
+    public function attendances(): HasMany
+    {
+        return $this->hasMany(Attendance::class, 'device_serial_number', 'serial_number');
+    }
 }
diff --git a/app/Nova/Attendance.php b/app/Nova/Attendance.php
@@ -91,6 +91,7 @@ public static function uriKey(): string
         'recorded',
         'attendee',
         'attendable',
+        'device',
     ];
 
     /**
@@ -131,6 +132,10 @@ public function fields(Request $request): array
                 ->help('The user that recorded the swipe')
                 ->searchable(),
 
+            BelongsTo::make('Device', 'device', Device::class)
+                ->searchable()
+                ->canSee(static fn (Request $request): bool => $request->user()->can('create-attendance')),
+
             DateTime::make('Time', 'created_at')
                 ->sortable(),
 
diff --git a/app/Nova/Device.php b/app/Nova/Device.php
@@ -4,8 +4,10 @@
 
 namespace App\Nova;
 
+use Illuminate\Http\Request;
 use Laravel\Nova\Fields\BelongsTo;
 use Laravel\Nova\Fields\DateTime;
+use Laravel\Nova\Fields\HasMany;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Number;
 use Laravel\Nova\Fields\Text;
@@ -121,6 +123,9 @@ public function fields(NovaRequest $request): array
 
             Text::make('Last Seen IP Address', 'last_seen_ip_address'),
 
+            HasMany::make('Attendance', 'attendances', Attendance::class)
+                ->canSee(static fn (Request $request): bool => $request->user()->can('read-attendance')),
+
             self::metadataPanel(),
         ];
     }
diff --git a/app/Util/DeviceInventory.php b/app/Util/DeviceInventory.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Util;
+
+use App\Models\Device;
+use App\Models\User;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\Request;
+
+class DeviceInventory
+{
+    /**
+     * Upsert a Device from an inventory report.
+     *
+     * Validates the requester is a User and the request has an IP address,
+     * then updates or creates the device with the provided data and request metadata.
+     *
+     * @param  array<string, string|int>  $data
+     *
+     * @throws HttpResponseException
+     */
+    public static function upsert(Request $request, array $data): Device
+    {
+        $user = $request->user();
+
+        if (! $user instanceof User) {
+            throw new HttpResponseException(response()->json([
+                'status' => 'error',
+                'message' => 'A user token is required.',
+            ], 401));
+        }
+
+        $ipAddress = $request->ip();
+
+        if ($ipAddress === null) {
+            throw new HttpResponseException(response()->json([
+                'status' => 'error',
+                'message' => 'last_seen_ip_address is required.',
+            ], 422));
+        }
+
+        return Device::updateOrCreate(
+            ['serial_number' => $data['serial_number']],
+            array_merge(
+                $data,
+                [
+                    'last_seen_user_id' => $user->id,
+                    'last_seen_at' => now(),
+                    'last_seen_ip_address' => $ipAddress,
+                ]
+            )
+        );
+    }
+}
diff --git a/database/migrations/2026_08_07_191749_add_device_serial_number_to_attendance_table.php b/database/migrations/2026_08_07_191749_add_device_serial_number_to_attendance_table.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('attendance', static function (Blueprint $table): void {
+            $table->unsignedInteger('device_serial_number')->nullable();
+
+            $table->foreign('device_serial_number', 'attendance_device_serial_number_foreign')
+                ->references('serial_number')
+                ->on('devices');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('attendance', static function (Blueprint $table): void {
+            $table->dropForeign('attendance_device_serial_number_foreign');
+
+            $table->dropColumn('device_serial_number');
+        });
+    }
+};
diff --git a/tests/Feature/AttendanceControllerTest.php b/tests/Feature/AttendanceControllerTest.php

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use Illuminate\Database\Eloquent\Factories\HasFactory;`
`8`	`8`	`use Illuminate\Database\Eloquent\Model;`
`9`	`9`	`use Illuminate\Database\Eloquent\Relations\BelongsTo;`
	`10`	`+use Illuminate\Database\Eloquent\Relations\HasMany;`
`10`	`11`
`11`	`12`	`class Device extends Model`
`12`	`13`	`{`
`@@ -69,4 +70,14 @@ public function lastSeenUser(): BelongsTo`
`69`	`70`	`{`
`70`	`71`	`return $this->belongsTo(User::class, 'last_seen_user_id');`
`71`	`72`	`}`
	`73`	`+`
	`74`	`+ /**`
	`75`	`+ * Get the attendance records created with this device.`
	`76`	`+ *`
	`77`	`+ * @return HasMany<\App\Models\Attendance, \App\Models\Device>`
	`78`	`+ */`
	`79`	`+ public function attendances(): HasMany`
	`80`	`+ {`
	`81`	`+ return $this->hasMany(Attendance::class, 'device_serial_number', 'serial_number');`
	`82`	`+ }`
`72`	`83`	`}`