StreakFit: exercices planifiés dans la séance + filtre matériel + config matos profil
Build & Deploy / build (push) Successful in 25s
Build & Deploy / build (push) Successful in 25s
- BUG: une séance issue d'une routine était vide -> WorkoutSessionResource expose planned_exercises (eager-load routine.routineExercises.exercise), pre-rempli cote front - profil: champ users.available_equipment (json), PATCH /api/me (UpdateProfileRequest), expose dans /api/me - exercises: filtre equipment accepte une liste CSV (whereIn) -> filtre 'mon matos' Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -24,7 +24,12 @@ class ExercisesController
|
|||||||
$exercises = Exercise::query()
|
$exercises = Exercise::query()
|
||||||
->search($request->query('search'))
|
->search($request->query('search'))
|
||||||
->when($request->query('body_part'), fn ($query, $bodyPart) => $query->where('body_part', $bodyPart))
|
->when($request->query('body_part'), fn ($query, $bodyPart) => $query->where('body_part', $bodyPart))
|
||||||
->when($request->query('equipment'), fn ($query, $equipment) => $query->where('equipment', $equipment))
|
->when($request->query('equipment'), function ($query, $equipment) {
|
||||||
|
// Accepte une valeur unique ou une liste séparée par des virgules ("dumbbell,barbell")
|
||||||
|
// → filtre "mon matériel" (plusieurs équipements possédés).
|
||||||
|
$values = array_values(array_filter(is_array($equipment) ? $equipment : explode(',', (string) $equipment)));
|
||||||
|
$query->whereIn('equipment', $values);
|
||||||
|
})
|
||||||
->when($request->query('target'), fn ($query, $target) => $query->where('target', $target))
|
->when($request->query('target'), fn ($query, $target) => $query->where('target', $target))
|
||||||
->when($request->query('category'), fn ($query, $category) => $query->where('category', $category))
|
->when($request->query('category'), fn ($query, $category) => $query->where('category', $category))
|
||||||
->orderBy('name')
|
->orderBy('name')
|
||||||
|
|||||||
@@ -34,10 +34,12 @@ class SessionsController
|
|||||||
->setStatusCode(Response::HTTP_CREATED);
|
->setStatusCode(Response::HTTP_CREATED);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** GET /api/sessions/{session} — séance + setLogs. */
|
/** GET /api/sessions/{session} — séance + setLogs + exercices planifiés de la routine. */
|
||||||
public function show(int $session): WorkoutSessionResource
|
public function show(int $session): WorkoutSessionResource
|
||||||
{
|
{
|
||||||
return new WorkoutSessionResource($this->findForUser($session)->load('setLogs'));
|
return new WorkoutSessionResource(
|
||||||
|
$this->findForUser($session)->load(['setLogs', 'routine.routineExercises.exercise'])
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** POST /api/sessions/{session}/sets — log un set. */
|
/** POST /api/sessions/{session}/sets — log un set. */
|
||||||
|
|||||||
@@ -2,11 +2,14 @@
|
|||||||
|
|
||||||
namespace Functional\Tracking\Http\Resources;
|
namespace Functional\Tracking\Http\Resources;
|
||||||
|
|
||||||
|
use Functional\Exercises\Models\Exercise;
|
||||||
|
use Functional\Routines\Models\RoutineExercise;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Une séance d'entraînement, avec ses séries (setLogs) quand elles sont chargées.
|
* Une séance d'entraînement, avec ses séries (setLogs) quand elles sont chargées, et — pour une
|
||||||
|
* séance issue d'une routine — les exercices planifiés (prêts-à-logger, avec séries/reps cibles).
|
||||||
*/
|
*/
|
||||||
class WorkoutSessionResource extends JsonResource
|
class WorkoutSessionResource extends JsonResource
|
||||||
{
|
{
|
||||||
@@ -23,6 +26,42 @@ class WorkoutSessionResource extends JsonResource
|
|||||||
'notes' => $this->notes,
|
'notes' => $this->notes,
|
||||||
'set_count' => $this->when($this->set_logs_count !== null, $this->set_logs_count),
|
'set_count' => $this->when($this->set_logs_count !== null, $this->set_logs_count),
|
||||||
'set_logs' => SetLogResource::collection($this->whenLoaded('setLogs')),
|
'set_logs' => SetLogResource::collection($this->whenLoaded('setLogs')),
|
||||||
|
'planned_exercises' => $this->plannedExercises($request),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exercices prévus par la routine (dans l'ordre), pour pré-remplir la séance dès son démarrage.
|
||||||
|
* Vide pour une séance ad hoc (sans routine).
|
||||||
|
*/
|
||||||
|
private function plannedExercises(Request $request): array
|
||||||
|
{
|
||||||
|
if (! $this->relationLoaded('routine') || $this->routine === null) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$locale = (string) ($request->query('locale') ?: 'fr');
|
||||||
|
|
||||||
|
return $this->routine->routineExercises
|
||||||
|
->map(function (RoutineExercise $routineExercise) use ($locale) {
|
||||||
|
$exercise = $routineExercise->exercise;
|
||||||
|
|
||||||
|
return [
|
||||||
|
'exercise_id' => $routineExercise->exercise_id,
|
||||||
|
'position' => $routineExercise->position,
|
||||||
|
'sets' => $routineExercise->sets,
|
||||||
|
'target_reps' => $routineExercise->target_reps,
|
||||||
|
'target_weight' => $routineExercise->target_weight,
|
||||||
|
'rest_seconds' => $routineExercise->rest_seconds,
|
||||||
|
'exercise' => $exercise ? [
|
||||||
|
'id' => $exercise->id,
|
||||||
|
'name' => $exercise->localizedName($locale),
|
||||||
|
'image_url' => $exercise->image_url,
|
||||||
|
'target' => Exercise::localizeTerm($exercise->target, $locale),
|
||||||
|
] : null,
|
||||||
|
];
|
||||||
|
})
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Matériel possédé par l'utilisateur (config profil) : sert à filtrer le catalogue
|
||||||
|
* d'exercices sur "mon matos". Valeurs canoniques anglaises alignées sur exercises.equipment.
|
||||||
|
*/
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table) {
|
||||||
|
$table->json('available_equipment')->nullable()->after('timezone');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('available_equipment');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Route;
|
|||||||
// Le préfixe api/ est ajouté par UsersServiceProvider::withRouting().
|
// Le préfixe api/ est ajouté par UsersServiceProvider::withRouting().
|
||||||
Route::middleware('auth:sanctum')->group(function () {
|
Route::middleware('auth:sanctum')->group(function () {
|
||||||
Route::get('me', [AuthController::class, 'me']);
|
Route::get('me', [AuthController::class, 'me']);
|
||||||
|
Route::patch('me', [AuthController::class, 'update']);
|
||||||
|
|
||||||
// Web Push (rappels de série pilotés par le back)
|
// Web Push (rappels de série pilotés par le back)
|
||||||
Route::post('push/subscribe', [PushController::class, 'subscribe']);
|
Route::post('push/subscribe', [PushController::class, 'subscribe']);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace Functional\Users\Http\Controllers;
|
|||||||
use Functional\Streaks\Models\Streak;
|
use Functional\Streaks\Models\Streak;
|
||||||
use Functional\Users\Http\Requests\LoginRequest;
|
use Functional\Users\Http\Requests\LoginRequest;
|
||||||
use Functional\Users\Http\Requests\RegisterRequest;
|
use Functional\Users\Http\Requests\RegisterRequest;
|
||||||
|
use Functional\Users\Http\Requests\UpdateProfileRequest;
|
||||||
use Functional\Users\Models\User;
|
use Functional\Users\Models\User;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -79,6 +80,7 @@ class AuthController
|
|||||||
'units' => $user->units,
|
'units' => $user->units,
|
||||||
'timezone' => $user->timezone,
|
'timezone' => $user->timezone,
|
||||||
'avatar_url' => $this->avatarUrl($user->avatar_path),
|
'avatar_url' => $this->avatarUrl($user->avatar_path),
|
||||||
|
'available_equipment' => $user->available_equipment ?? [],
|
||||||
],
|
],
|
||||||
'streak' => [
|
'streak' => [
|
||||||
'current' => $streak->current_count,
|
'current' => $streak->current_count,
|
||||||
@@ -92,6 +94,17 @@ class AuthController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH /api/me — met à jour les préférences du profil courant (matériel possédé, locale, unités…).
|
||||||
|
* Renvoie la vue /api/me rafraîchie.
|
||||||
|
*/
|
||||||
|
public function update(UpdateProfileRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$request->user()->update($request->validated());
|
||||||
|
|
||||||
|
return $this->me($request);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Résout l'URL publique d'un média stocké sur RustFS/S3 à partir de son chemin relatif.
|
* Résout l'URL publique d'un média stocké sur RustFS/S3 à partir de son chemin relatif.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Functional\Users\Http\Requests;
|
||||||
|
|
||||||
|
use Functional\Users\Enums\Units;
|
||||||
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mise à jour du profil courant (PATCH /api/me) : préférences + matériel possédé.
|
||||||
|
* Tous les champs sont optionnels (mise à jour partielle).
|
||||||
|
*/
|
||||||
|
class UpdateProfileRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user() !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, ValidationRule|array<mixed>|string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'locale' => ['sometimes', 'string', Rule::in(['fr', 'en', 'pt-BR'])],
|
||||||
|
'units' => ['sometimes', Rule::enum(Units::class)],
|
||||||
|
'timezone' => ['sometimes', 'nullable', 'string', 'max:64'],
|
||||||
|
'available_equipment' => ['sometimes', 'array'],
|
||||||
|
'available_equipment.*' => ['string', 'max:64'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,8 +23,9 @@ use Spatie\Permission\Traits\HasRoles;
|
|||||||
* @property string|null $timezone
|
* @property string|null $timezone
|
||||||
* @property string|null $avatar_path
|
* @property string|null $avatar_path
|
||||||
* @property string|null $oidc_sub
|
* @property string|null $oidc_sub
|
||||||
|
* @property array<int, string>|null $available_equipment
|
||||||
*/
|
*/
|
||||||
#[Fillable(['name', 'email', 'password', 'locale', 'units', 'timezone', 'avatar_path', 'oidc_sub'])]
|
#[Fillable(['name', 'email', 'password', 'locale', 'units', 'timezone', 'avatar_path', 'oidc_sub', 'available_equipment'])]
|
||||||
#[Hidden(['password', 'remember_token'])]
|
#[Hidden(['password', 'remember_token'])]
|
||||||
#[UseFactory(UserFactory::class)]
|
#[UseFactory(UserFactory::class)]
|
||||||
class User extends Authenticatable implements FilamentUser
|
class User extends Authenticatable implements FilamentUser
|
||||||
@@ -48,6 +49,7 @@ class User extends Authenticatable implements FilamentUser
|
|||||||
'email_verified_at' => 'datetime',
|
'email_verified_at' => 'datetime',
|
||||||
'password' => 'hashed',
|
'password' => 'hashed',
|
||||||
'units' => Units::class,
|
'units' => Units::class,
|
||||||
|
'available_equipment' => 'array',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user