feat: history and calculate needs for user
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user