feat: history and calculate needs for user

app/Http/Controllers/AuthController.php

@@ -43,7 +43,7 @@ class AuthController extends Controller
         $this->startWebSession($request, $user);
 
         return response()->json([
-            'message' => __('api.auth.registered_unverified'),
+            'code' => 'REGISTERED_UNVERIFIED',
             'user' => new UserResource($user),
         ], 201);
     }
@@ -73,7 +73,7 @@ class AuthController extends Controller
         }
 
         return response()->json([
-            'message' => __('api.auth.registered_unverified'),
+            'code' => 'REGISTERED_UNVERIFIED',
             'token' => $this->createMobileToken($user, $request->validated('device_name')),
             'user' => new UserResource($user),
         ], 201);
@@ -101,7 +101,7 @@ class AuthController extends Controller
         if (! hash_equals($hash, sha1($user->getEmailForVerification()))) {
             if ($request->expectsJson()) {
                 return response()->json([
-                    'message' => __('api.auth.invalid_verification_link'),
+                    'code' => 'INVALID_VERIFICATION_LINK',
                 ], 403);
             }
 
@@ -118,9 +118,9 @@ class AuthController extends Controller
 
         if ($request->expectsJson()) {
             return response()->json([
-                'message' => $alreadyVerified
-                    ? __('api.auth.already_verified')
-                    : __('api.auth.verified'),
+                'code' => $alreadyVerified
+                    ? 'EMAIL_ALREADY_VERIFIED'
+                    : 'EMAIL_VERIFIED',
                 'user' => new UserResource($user->fresh()),
             ]);
         }
@@ -141,7 +141,7 @@ class AuthController extends Controller
         }
 
         return response()->json([
-            'message' => __('api.auth.verification_sent_if_unverified'),
+            'code' => 'VERIFICATION_EMAIL_SENT_IF_UNVERIFIED',
         ]);
     }
 
@@ -152,12 +152,12 @@ class AuthController extends Controller
 
         if ($status === Password::RESET_THROTTLED) {
             return response()->json([
-                'message' => __($status),
+                'code' => 'PASSWORD_RESET_THROTTLED',
             ], 429);
         }
 
         return response()->json([
-            'message' => __('api.auth.password_reset_link_sent'),
+            'code' => 'PASSWORD_RESET_LINK_SENT',
         ]);
     }
 
@@ -167,12 +167,12 @@ class AuthController extends Controller
 
         if ($status !== Password::PASSWORD_RESET) {
             return response()->json([
-                'message' => __($status),
+                'code' => 'PASSWORD_RESET_FAILED',
             ], 422);
         }
 
         return response()->json([
-            'message' => __('api.auth.password_reset'),
+            'code' => 'PASSWORD_RESET',
         ]);
     }
 
@@ -228,7 +228,7 @@ class AuthController extends Controller
         }
 
         return response()->json([
-            'message' => __('api.auth.logout'),
+            'code' => 'LOGGED_OUT',
         ]);
     }
 
@@ -237,7 +237,7 @@ class AuthController extends Controller
         $user = auth()->user();
 
         if (! $user) {
-            return response()->json(['message' => __('api.auth.unauthenticated')], 401);
+            return response()->json(['code' => 'UNAUTHENTICATED'], 401);
         }
 
         return new UserResource($user);
@@ -247,10 +247,9 @@ class AuthController extends Controller
     {
         $user = $request->user();
 
-        abort_if($user->isSuspended(), 403, __('api.auth.suspended'));
+        abort_if($user->isSuspended(), 403, 'ACCOUNT_SUSPENDED');
 
         $data = $request->validated();
-        $nutritionGoals = $data['nutritionGoals'] ?? null;
 
         if ($request->hasFile('avatar')) {
             if ($user->avatar_url) {
@@ -263,13 +262,6 @@ class AuthController extends Controller
 
         $userAttributes = $this->userAttributesFromRequestData($data);
 
-        if (is_array($nutritionGoals)) {
-            $userAttributes['daily_calorie_goal'] = $nutritionGoals['calories'];
-            $userAttributes['daily_protein_goal'] = $nutritionGoals['proteins'];
-            $userAttributes['daily_carbs_goal'] = $nutritionGoals['carbs'];
-            $userAttributes['daily_fats_goal'] = $nutritionGoals['fats'];
-        }
-
         if (! empty($userAttributes)) {
             $user->update($userAttributes);
         }
@@ -281,7 +273,7 @@ class AuthController extends Controller
     {
         $user = $request->user();
 
-        abort_if($user->isSuspended(), 403, __('api.auth.suspended'));
+        abort_if($user->isSuspended(), 403, 'ACCOUNT_SUSPENDED');
 
         $currentAccessToken = $user->currentAccessToken();
 
@@ -299,7 +291,7 @@ class AuthController extends Controller
         }
 
         return response()->json([
-            'message' => __('api.auth.password_updated'),
+            'code' => 'PASSWORD_UPDATED',
         ]);
     }
 
@@ -350,7 +342,7 @@ class AuthController extends Controller
         }
 
         return response()->json([
-            'message' => __('api.auth.deleted'),
+            'code' => 'ACCOUNT_DELETED',
         ]);
     }
 
@@ -382,7 +374,7 @@ class AuthController extends Controller
             }
 
             return response()->json([
-                'message' => __('api.auth.verification_email_failed'),
+                'code' => 'VERIFICATION_EMAIL_FAILED',
             ], 503);
         }
 
@@ -398,13 +390,13 @@ class AuthController extends Controller
 
         if (! $user || ! Hash::check((string) $data['password'], $user->password)) {
             return response()->json([
-                'message' => __('api.auth.invalid_credentials'),
+                'code' => 'INVALID_CREDENTIALS',
             ], 401);
         }
 
         if ($user->isSuspended()) {
             return response()->json([
-                'message' => __('api.auth.suspended'),
+                'code' => 'ACCOUNT_SUSPENDED',
             ], 403);
         }
 
@@ -414,7 +406,7 @@ class AuthController extends Controller
 
         if (! $user->hasVerifiedEmail()) {
             return response()->json([
-                'message' => __('api.auth.email_not_verified'),
+                'code' => 'EMAIL_NOT_VERIFIED',
             ], 403);
         }
 
@@ -480,25 +472,9 @@ class AuthController extends Controller
             'name',
             'avatar_url',
             'locale',
-            'height',
             'bio',
-            'sex',
-            'date_of_birth',
         ]);
 
-        $attributeMap = [
-            'physicalActivityLevel' => 'physical_activity_level',
-            'weightGoal' => 'weight_goal',
-            'pacePreference' => 'pace_preference',
-            'dateOfBirth' => 'date_of_birth',
-        ];
-
-        foreach ($attributeMap as $requestKey => $attribute) {
-            if (array_key_exists($requestKey, $data)) {
-                $attributes[$attribute] = $data[$requestKey];
-            }
-        }
-
         return $attributes;
     }
 }

app/Http/Controllers/NutritionOnboardingController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\CompleteNutritionOnboarding;
+use App\Http\Requests\CompleteNutritionOnboardingRequest;
+use App\Http\Resources\UserResource;
+
+class NutritionOnboardingController extends Controller
+{
+    public function __invoke(
+        CompleteNutritionOnboardingRequest $request,
+        CompleteNutritionOnboarding $completeNutritionOnboarding,
+    ): UserResource {
+        return new UserResource(
+            $completeNutritionOnboarding->execute($request->user(), $request->validated())
+        );
+    }
+}

app/Http/Controllers/NutritionPlanController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\NutritionPlanResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+
+class NutritionPlanController extends Controller
+{
+    public function index(Request $request): AnonymousResourceCollection
+    {
+        return NutritionPlanResource::collection(
+            $request->user()->nutritionPlans()->latest('effective_from')->limit(50)->get()
+        );
+    }
+
+    public function current(Request $request): NutritionPlanResource
+    {
+        $plan = $request->user()->nutritionPlans()->where('is_active', true)->latest('effective_from')->firstOrFail();
+
+        return new NutritionPlanResource($plan);
+    }
+}

app/Http/Controllers/NutritionProfileController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\RecalculateNutritionPlan;
+use App\Enums\NutritionPlanSource;
+use App\Http\Requests\UpdateNutritionProfileRequest;
+use App\Http\Resources\UserResource;
+
+class NutritionProfileController extends Controller
+{
+    public function __invoke(
+        UpdateNutritionProfileRequest $request,
+        RecalculateNutritionPlan $recalculateNutritionPlan,
+    ): UserResource {
+        return new UserResource($recalculateNutritionPlan->execute(
+            user: $request->user(),
+            data: $request->validated(),
+            source: NutritionPlanSource::PROFILE_RECALCULATION,
+        ));
+    }
+}

app/Http/Controllers/WeeklyReviewController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Actions\AcceptWeeklyReviewAdjustment;
+use App\Http\Resources\NutritionPlanResource;
+use App\Http\Resources\WeeklyReviewResource;
+use App\Models\WeeklyReview;
+use App\Services\WeeklyReviewService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+
+class WeeklyReviewController extends Controller
+{
+    public function index(Request $request): AnonymousResourceCollection
+    {
+        return WeeklyReviewResource::collection(
+            $request->user()->weeklyReviews()->latest('period_start')->limit(52)->get()
+        );
+    }
+
+    public function current(Request $request, WeeklyReviewService $weeklyReviewService): JsonResponse
+    {
+        return (new WeeklyReviewResource($weeklyReviewService->generate($request->user())))
+            ->response()
+            ->setStatusCode(200);
+    }
+
+    public function accept(
+        Request $request,
+        WeeklyReview $weeklyReview,
+        AcceptWeeklyReviewAdjustment $acceptWeeklyReviewAdjustment,
+    ): NutritionPlanResource {
+        abort_unless($weeklyReview->user_id === $request->user()->getKey(), 404);
+
+        return new NutritionPlanResource($acceptWeeklyReviewAdjustment->execute($weeklyReview));
+    }
+}

app/Http/Controllers/WeightEntryController.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\ListWeightEntriesRequest;
+use App\Http\Requests\StoreWeightEntryRequest;
+use App\Http\Resources\WeightEntryResource;
+use App\Models\WeightEntry;
+use Carbon\CarbonImmutable;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Http\Response;
+
+class WeightEntryController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(ListWeightEntriesRequest $request): AnonymousResourceCollection
+    {
+        $from = now()->subDays($request->integer('days', 365))->startOfDay();
+        $entries = $request->user()
+            ->weightEntries()
+            ->where('measured_at', '>=', $from)
+            ->latest('measured_at')
+            ->get();
+
+        return WeightEntryResource::collection($entries);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(StoreWeightEntryRequest $request): WeightEntryResource
+    {
+        $entry = $request->user()->weightEntries()->create([
+            'weight_kg' => $request->validated('weightKg'),
+            'measured_at' => CarbonImmutable::parse($request->validated('measuredAt') ?? now()),
+        ]);
+
+        return new WeightEntryResource($entry);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Request $request, WeightEntry $weightEntry): Response
+    {
+        abort_unless($weightEntry->user_id === $request->user()->getKey(), 404);
+
+        $weightEntry->delete();
+
+        return response()->noContent();
+    }
+}

app/Http/Middleware/EnsureNutritionOnboardingCompleted.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class EnsureNutritionOnboardingCompleted
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (! $request->user()?->hasCompletedNutritionOnboarding()) {
+            return response()->json([
+                'code' => 'ONBOARDING_REQUIRED',
+            ], 409);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Requests/CompleteNutritionOnboardingRequest.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Enums\PacePreference;
+use App\Enums\PhysicalActivityLevel;
+use App\Enums\UserSex;
+use App\Enums\WeightGoal;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class CompleteNutritionOnboardingRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->user() !== null;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'dateOfBirth' => [
+                'required',
+                'date_format:Y-m-d',
+                'before_or_equal:'.now()->subYears(18)->toDateString(),
+                'after_or_equal:'.now()->subYears(100)->toDateString(),
+            ],
+            'sex' => ['required', Rule::in([UserSex::MAN->value, UserSex::WOMAN->value])],
+            'heightCm' => ['required', 'integer', 'min:120', 'max:230'],
+            'weightKg' => ['required', 'numeric', 'min:35', 'max:300'],
+            'targetWeightKg' => ['nullable', 'numeric', 'min:35', 'max:300'],
+            'physicalActivityLevel' => ['required', Rule::enum(PhysicalActivityLevel::class)],
+            'weightGoal' => ['required', Rule::enum(WeightGoal::class)],
+            'pacePreference' => ['required', Rule::enum(PacePreference::class)],
+            'nutritionEstimateAccepted' => ['required', 'accepted'],
+        ];
+    }
+
+    public function after(): array
+    {
+        return [
+            function (Validator $validator): void {
+                $weight = $this->float('weightKg');
+                $targetWeight = $this->input('targetWeightKg');
+                $goal = $this->string('weightGoal')->toString();
+
+                if ($targetWeight === null || $targetWeight === '') {
+                    return;
+                }
+
+                $targetWeight = (float) $targetWeight;
+
+                if ($goal === WeightGoal::LOSE_WEIGHT->value && $targetWeight >= $weight) {
+                    $validator->errors()->add('targetWeightKg', 'NUTRITION_TARGET_WEIGHT_MUST_BE_LOWER');
+                }
+
+                if ($goal === WeightGoal::GAIN_WEIGHT->value && $targetWeight <= $weight) {
+                    $validator->errors()->add('targetWeightKg', 'NUTRITION_TARGET_WEIGHT_MUST_BE_HIGHER');
+                }
+            },
+        ];
+    }
+
+    public function messages(): array
+    {
+        return [
+            'dateOfBirth.before_or_equal' => 'NUTRITION_ADULTS_ONLY',
+            'dateOfBirth.after_or_equal' => 'NUTRITION_BIRTH_DATE_OUT_OF_RANGE',
+            'sex.in' => 'NUTRITION_METABOLIC_SEX_REQUIRED',
+            'nutritionEstimateAccepted.accepted' => 'NUTRITION_ESTIMATE_ACCEPTANCE_REQUIRED',
+        ];
+    }
+}

app/Http/Requests/ListWeightEntriesRequest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ListWeightEntriesRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->user()?->hasCompletedNutritionOnboarding() === true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'days' => ['sometimes', 'integer', 'min:7', 'max:3650'],
+        ];
+    }
+}

app/Http/Requests/RegisterRequest.php

@@ -2,10 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\PacePreference;
-use App\Enums\PhysicalActivityLevel;
-use App\Enums\UserSex;
-use App\Enums\WeightGoal;
 use App\Http\Requests\Concerns\ModeratesUserContent;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -56,11 +52,6 @@ class RegisterRequest extends FormRequest
             'termsAccepted' => ['required', 'accepted'],
             'avatar' => ['sometimes', 'nullable', 'image', 'max:2048'],
             'bio' => ['nullable', 'string'],
-            'physicalActivityLevel' => ['sometimes', Rule::enum(PhysicalActivityLevel::class)],
-            'weightGoal' => ['sometimes', Rule::enum(WeightGoal::class)],
-            'pacePreference' => ['sometimes', Rule::enum(PacePreference::class)],
-            'sex' => ['sometimes', Rule::enum(UserSex::class)],
-            'dateOfBirth' => ['sometimes', 'nullable', 'date_format:Y-m-d', 'before:today', 'after:1900-01-01'],
         ];
     }
 

app/Http/Requests/StoreWeightEntryRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreWeightEntryRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return $this->user()?->hasCompletedNutritionOnboarding() === true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'weightKg' => ['required', 'numeric', 'min:35', 'max:300'],
+            'measuredAt' => ['sometimes', 'nullable', 'date', 'before_or_equal:now'],
+        ];
+    }
+}

app/Http/Requests/UpdateNutritionProfileRequest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Requests;
+
+class UpdateNutritionProfileRequest extends CompleteNutritionOnboardingRequest
+{
+    public function rules(): array
+    {
+        $rules = parent::rules();
+        unset($rules['nutritionEstimateAccepted']);
+
+        return $rules;
+    }
+}

app/Http/Requests/UpdateUserRequest.php

@@ -2,10 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\PacePreference;
-use App\Enums\PhysicalActivityLevel;
-use App\Enums\UserSex;
-use App\Enums\WeightGoal;
 use App\Http\Requests\Concerns\ModeratesUserContent;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -22,27 +18,24 @@ class UpdateUserRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'name' => [
+                'sometimes',
+                'string',
+                'min:3',
+                'max:32',
+                'regex:/^[a-zA-Z0-9_.-]+$/',
+                Rule::unique('users', 'name')->ignore($this->user()),
+            ],
             'bio' => ['sometimes', 'nullable', 'string'],
-            'height' => ['sometimes', 'nullable', 'integer'],
             'locale' => ['sometimes', 'string', Rule::in(config('app.supported_locales', ['fr', 'en']))],
             'avatar' => ['sometimes', 'nullable', 'image', 'max:2048'],
-            'nutritionGoals' => ['sometimes', 'array'],
-            'nutritionGoals.calories' => ['required_with:nutritionGoals', 'integer', 'min:0', 'max:100000'],
-            'nutritionGoals.proteins' => ['required_with:nutritionGoals', 'numeric', 'min:0', 'max:10000'],
-            'nutritionGoals.carbs' => ['required_with:nutritionGoals', 'numeric', 'min:0', 'max:10000'],
-            'nutritionGoals.fats' => ['required_with:nutritionGoals', 'numeric', 'min:0', 'max:10000'],
-            'physicalActivityLevel' => ['sometimes', Rule::enum(PhysicalActivityLevel::class)],
-            'weightGoal' => ['sometimes', Rule::enum(WeightGoal::class)],
-            'pacePreference' => ['sometimes', Rule::enum(PacePreference::class)],
-            'sex' => ['sometimes', Rule::enum(UserSex::class)],
-            'dateOfBirth' => ['sometimes', 'nullable', 'date_format:Y-m-d', 'before:today', 'after:1900-01-01'],
         ];
     }
 
     public function after(): array
     {
         return $this->moderationChecks(
-            [$this->input('bio')],
+            [$this->input('name'), $this->input('bio')],
             [$this->file('avatar')],
         );
     }
@@ -51,10 +44,6 @@ class UpdateUserRequest extends FormRequest
     {
         return [
             'avatar.max' => __('api.validation.image_max_2mb'),
-            'nutritionGoals.calories.integer' => __('api.validation.calories_integer'),
-            'nutritionGoals.*.required_with' => __('api.validation.nutrition_goals_required'),
-            'nutritionGoals.*.min' => __('api.validation.nutrition_goals_positive'),
-            'nutritionGoals.*.max' => __('api.validation.nutrition_goals_max'),
         ];
     }
 

app/Http/Resources/NutritionPlanResource.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\NutritionPlan;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin NutritionPlan */
+class NutritionPlanResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'source' => $this->source,
+            'formulaVersion' => $this->formula_version,
+            'calories' => $this->calories,
+            'proteins' => $this->proteins,
+            'carbs' => $this->carbs,
+            'fats' => $this->fats,
+            'restingMetabolism' => $this->resting_metabolism,
+            'maintenanceCalories' => $this->maintenance_calories,
+            'calorieAdjustmentPercent' => $this->calorie_adjustment_percent,
+            'calculationDetails' => $this->calculation_details,
+            'effectiveFrom' => $this->effective_from?->toISOString(),
+            'effectiveUntil' => $this->effective_until?->toISOString(),
+            'isActive' => $this->is_active,
+        ];
+    }
+}

app/Http/Resources/UserResource.php

@@ -15,14 +15,19 @@ class UserResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
+        $this->resource->loadMissing(['activeNutritionPlan', 'latestWeightEntry']);
+        $nutritionPlan = $this->activeNutritionPlan;
+
         return [
-            'id' => $this->id, // à voir si suppression par la suite
+            'id' => $this->id,
             'name' => $this->name,
             'email' => $this->email,
             'locale' => $this->locale,
             'emailVerified' => $this->hasVerifiedEmail(),
             'emailVerifiedAt' => $this->email_verified_at?->toISOString(),
             'height' => $this->height,
+            'currentWeight' => $this->latestWeightEntry?->weight_kg,
+            'targetWeight' => $this->target_weight,
             'avatarUrl' => $this->avatar_url ? asset(Storage::url($this->avatar_url)) : null,
             'bio' => $this->bio,
             'role' => $this->role,
@@ -38,20 +43,27 @@ class UserResource extends JsonResource
             'hasActiveSubscription' => $this->hasActiveSubscription(),
             'suspendedAt' => $this->suspended_at?->toISOString(),
             'physicalActivityLevel' => $this->physical_activity_level,
-            'physicalActivityLevelLabel' => $this->physical_activity_level?->getLabel(),
             'weightGoal' => $this->weight_goal,
-            'weightGoalLabel' => $this->weight_goal?->getLabel(),
             'pacePreference' => $this->pace_preference,
-            'pacePreferenceLabel' => $this->pace_preference?->getLabel(),
             'sex' => $this->sex,
-            'sexLabel' => $this->sex?->getLabel(),
             'dateOfBirth' => $this->date_of_birth?->toDateString(),
-            'nutritionGoals' => [
-                'calories' => (int) $this->daily_calorie_goal,
-                'proteins' => (float) $this->daily_protein_goal,
-                'carbs' => (float) $this->daily_carbs_goal,
-                'fats' => (float) $this->daily_fats_goal,
+            'onboardingStatus' => $this->hasCompletedNutritionOnboarding() ? 'completed' : 'required',
+            'missingOnboardingFields' => $this->hasCompletedNutritionOnboarding() ? [] : [
+                'dateOfBirth',
+                'sex',
+                'heightCm',
+                'weightKg',
+                'physicalActivityLevel',
+                'weightGoal',
+                'pacePreference',
             ],
+            'nutritionPlan' => NutritionPlanResource::make($nutritionPlan),
+            'nutritionGoals' => $nutritionPlan ? [
+                'calories' => $nutritionPlan->calories,
+                'proteins' => $nutritionPlan->proteins,
+                'carbs' => $nutritionPlan->carbs,
+                'fats' => $nutritionPlan->fats,
+            ] : null,
         ];
     }
 }

app/Http/Resources/WeeklyReviewResource.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\WeeklyReview;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin WeeklyReview */
+class WeeklyReviewResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'periodStart' => $this->period_start?->toDateString(),
+            'periodEnd' => $this->period_end?->toDateString(),
+            'averages' => [
+                'calories' => $this->average_calories,
+                'proteins' => $this->average_proteins,
+                'carbs' => $this->average_carbs,
+                'fats' => $this->average_fats,
+            ],
+            'loggedDaysCount' => $this->logged_days_count,
+            'weightEntriesCount' => $this->weight_entries_count,
+            'weightTrendKg' => $this->weight_trend_kg,
+            'targetWeightTrendKg' => $this->target_weight_trend_kg,
+            'status' => $this->status,
+            'recommendedCalorieAdjustment' => $this->recommended_calorie_adjustment,
+            'messageCode' => $this->message_code,
+            'metrics' => $this->metrics,
+            'generatedAt' => $this->generated_at?->toISOString(),
+            'acceptedAt' => $this->accepted_at?->toISOString(),
+            'acceptedNutritionPlanId' => $this->accepted_nutrition_plan_id,
+        ];
+    }
+}

app/Http/Resources/WeightEntryResource.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\WeightEntry;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/** @mixin WeightEntry */
+class WeightEntryResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'weightKg' => $this->weight_kg,
+            'source' => $this->source,
+            'measuredAt' => $this->measured_at?->toISOString(),
+            'createdAt' => $this->created_at?->toISOString(),
+        ];
+    }
+}