Add mass assing on face review + more refactoring (#4483)

Author: ildyria

app/Http/Controllers/Admin/Maintenance/RunFaceClustering.php

@@ -9,6 +9,7 @@
 namespace App\Http\Controllers\Admin\Maintenance;
 
 use App\Http\Requests\Maintenance\MaintenanceRequest;
+use App\Models\Face;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Http;
@@ -29,7 +30,12 @@ class RunFaceClustering extends Controller
 	 */
 	public function check(MaintenanceRequest $request): int
 	{
-		return $request->configs()->getValueAsBool('ai_vision_enabled') ? 1 : 0;
+		if (!$request->configs()->getValueAsBool('ai_vision_enabled')) {
+			return 0;
+		}
+
+		// We do not check for dismissed faces here.
+		return Face::notDismissed()->whereNull('person_id')->exists() ? 1 : 0;
 	}
 
 	/**

app/Http/Controllers/AiVision/FaceMaintenanceController.php

@@ -8,11 +8,13 @@
 
 namespace App\Http\Controllers\AiVision;
 
+use App\Factories\PersonFactory;
+use App\Http\Requests\Face\BatchAssignFacesRequest;
 use App\Http\Requests\Face\BatchDismissFacesRequest;
 use App\Http\Requests\Face\FaceMaintenanceIndexRequest;
 use App\Http\Resources\Collections\PaginatedFaceResource;
+use App\Jobs\RecomputePersonStatsJob;
 use App\Models\Face;
-use App\Models\Person;
 use Illuminate\Routing\Controller;
 
 /**
@@ -58,23 +60,34 @@ public function batchDismiss(BatchDismissFacesRequest $request): array
 		$count = Face::whereIn('id', $request->face_ids)
 			->update(['is_dismissed' => true, 'person_id' => null]);
 
-		foreach ($affected_person_ids as $person_id) {
-			$person = Person::find($person_id);
-			if ($person === null) {
-				continue;
-			}
+		RecomputePersonStatsJob::dispatchSync($affected_person_ids);
 
-			$person->face_count = Face::where('person_id', '=', $person_id)->where('is_dismissed', '=', false)->count();
-			if ($person->face_count === 0) {
-				$person->delete();
-				continue;
-			}
+		return ['dismissed_count' => $count];
+	}
 
-			$person->photo_count = Face::where('person_id', '=', $person_id)->where('is_dismissed', '=', false)->distinct('photo_id')->count('photo_id');
-			$person->save();
-		}
+	/**
+	 * Batch-assign multiple faces to an existing person or a newly created one.
+	 *
+	 * POST /Face/maintenance/batch-assign
+	 *
+	 * @return array{assigned_count: int, person_id: string}
+	 */
+	public function batchAssign(BatchAssignFacesRequest $request, PersonFactory $person_factory): array
+	{
+		$person = $person_factory->findOrCreate($request->person_id, $request->new_person_name);
 
-		return ['dismissed_count' => $count];
+		$old_person_ids = Face::whereIn('id', $request->face_ids)
+			->whereNotNull('person_id')
+			->where('person_id', '!=', $person->id)
+			->distinct()
+			->pluck('person_id')
+			->all();
+
+		$count = Face::whereIn('id', $request->face_ids)->update(['person_id' => $person->id]);
+
+		RecomputePersonStatsJob::dispatchSync([$person->id, ...$old_person_ids]);
+
+		return ['assigned_count' => $count, 'person_id' => $person->id];
 	}
 }
 

app/Http/Requests/Face/BatchAssignFacesRequest.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2026 LycheeOrg.
+ */
+
+namespace App\Http\Requests\Face;
+
+use App\Http\Requests\BaseApiRequest;
+use App\Models\Configs;
+use App\Policies\SettingsPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Validator;
+
+/**
+ * Request for batch-assigning multiple faces to a person from the maintenance page.
+ *
+ * Admin-only: requires the CAN_EDIT settings policy gate.
+ */
+class BatchAssignFacesRequest extends BaseApiRequest
+{
+	/** @var string[] */
+	public array $face_ids = [];
+	public ?string $person_id = null;
+	public string $new_person_name;
+
+	public function authorize(): bool
+	{
+		return Gate::check(SettingsPolicy::CAN_EDIT, Configs::class);
+	}
+
+	public function rules(): array
+	{
+		return [
+			'face_ids' => ['required', 'array', 'min:1'],
+			'face_ids.*' => ['required', 'string'],
+			'person_id' => ['nullable', 'string'],
+			'new_person_name' => ['nullable', 'string', 'max:255'],
+		];
+	}
+
+	public function withValidator(Validator $validator): void
+	{
+		$validator->after(function (Validator $validator): void {
+			if ($validator->errors()->isNotEmpty()) {
+				return;
+			}
+
+			$values = $validator->validated();
+			$has_person = isset($values['person_id']) && $values['person_id'] !== null;
+			$has_name = isset($values['new_person_name']) && trim($values['new_person_name'] ?? '') !== '';
+
+			if (!$has_person && !$has_name) {
+				$validator->errors()->add('person_id', 'Either person_id or new_person_name must be provided.');
+			}
+		});
+	}
+
+	protected function processValidatedValues(array $values, array $files): void
+	{
+		$this->face_ids = $values['face_ids'];
+		$this->person_id = $values['person_id'] ?? null;
+		$this->new_person_name = $values['new_person_name'] ?? 'people.unknown';
+	}
+}

lang/ar/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/bg/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/cz/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/de/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/el/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/en/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',

lang/es/people.php

@@ -58,6 +58,7 @@
 	'dismiss' => 'Dismiss',
 	'assignment' => [
 		'title' => 'Assign face to person',
+		'batch_title' => 'Assign :count face(s) to person',
 		'select_person' => 'Select existing person…',
 		'new_person' => 'Or create new person',
 		'new_person_placeholder' => 'New person name…',