feat: get my meal posts
This commit is contained in:
parent
6d0f1591fa
commit
1a53ae3f05
|
|
@ -23,12 +23,20 @@ class MealPostController extends Controller
|
||||||
{
|
{
|
||||||
$perPage = max(1, min($request->integer('per_page', 15), 100));
|
$perPage = max(1, min($request->integer('per_page', 15), 100));
|
||||||
|
|
||||||
$mealPosts = MealPosts::query()
|
$mealPosts = $this->mealPostListQuery($request)
|
||||||
->with('user:id,name,avatar_url')
|
->latest('eaten_at')
|
||||||
->withCount('likedByUsers')
|
->paginate($perPage)
|
||||||
->withExists([
|
->withQueryString();
|
||||||
'likedByUsers as liked_by_current_user' => fn (Builder $query): Builder => $query->whereKey($request->user()->getKey()),
|
|
||||||
])
|
return MealPostsResource::collection($mealPosts);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function mine(Request $request): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
$perPage = max(1, min($request->integer('per_page', 15), 100));
|
||||||
|
|
||||||
|
$mealPosts = $this->mealPostListQuery($request)
|
||||||
|
->where('user_id', $request->user()->getKey())
|
||||||
->latest('eaten_at')
|
->latest('eaten_at')
|
||||||
->paginate($perPage)
|
->paginate($perPage)
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
|
|
@ -200,6 +208,16 @@ class MealPostController extends Controller
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function mealPostListQuery(Request $request): Builder
|
||||||
|
{
|
||||||
|
return MealPosts::query()
|
||||||
|
->with('user:id,name,avatar_url')
|
||||||
|
->withCount('likedByUsers')
|
||||||
|
->withExists([
|
||||||
|
'likedByUsers as liked_by_current_user' => fn (Builder $query): Builder => $query->whereKey($request->user()->getKey()),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
private function getValidatedDataWithImageUrl(MealPostsRequest $request): array
|
private function getValidatedDataWithImageUrl(MealPostsRequest $request): array
|
||||||
{
|
{
|
||||||
$data = $request->validated();
|
$data = $request->validated();
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Http\Requests\WorkoutSessionsRequest;
|
use App\Http\Requests\WorkoutSessionsRequest;
|
||||||
use App\Http\Resources\WorkoutSessionsResource;
|
use App\Http\Resources\WorkoutSessionsResource;
|
||||||
|
use Carbon\CarbonImmutable;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
|
||||||
|
|
@ -11,8 +12,19 @@ class WorkoutSessionController extends Controller
|
||||||
{
|
{
|
||||||
public function index(WorkoutSessionsRequest $request): AnonymousResourceCollection
|
public function index(WorkoutSessionsRequest $request): AnonymousResourceCollection
|
||||||
{
|
{
|
||||||
$workoutSessions = $request->user()
|
$validated = $request->validated();
|
||||||
->workouts()
|
$workoutSessionsQuery = $request->user()->workouts();
|
||||||
|
|
||||||
|
if (isset($validated['date'])) {
|
||||||
|
$referenceDate = CarbonImmutable::createFromFormat('!Y-m-d', $validated['date']);
|
||||||
|
|
||||||
|
$workoutSessionsQuery->whereBetween('started_at', [
|
||||||
|
$referenceDate->startOfDay(),
|
||||||
|
$referenceDate->endOfDay(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$workoutSessions = $workoutSessionsQuery
|
||||||
->latest('started_at')
|
->latest('started_at')
|
||||||
->paginate($request->integer('per_page', 15))
|
->paginate($request->integer('per_page', 15))
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ class WorkoutSessionsRequest extends FormRequest
|
||||||
{
|
{
|
||||||
if ($this->isMethod('get')) {
|
if ($this->isMethod('get')) {
|
||||||
return [
|
return [
|
||||||
|
'date' => ['sometimes', 'date_format:Y-m-d'],
|
||||||
'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
|
'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ Route::middleware(['auth:sanctum', 'verified'])->group(function (): void {
|
||||||
|
|
||||||
// Meals
|
// Meals
|
||||||
Route::middleware(['auth:sanctum', 'verified'])->group(function (): void {
|
Route::middleware(['auth:sanctum', 'verified'])->group(function (): void {
|
||||||
|
Route::get('me/meal-posts', [MealPostController::class, 'mine'])->name('meal-posts.mine');
|
||||||
Route::get('meal-posts/stats', [MealPostController::class, 'stats']);
|
Route::get('meal-posts/stats', [MealPostController::class, 'stats']);
|
||||||
Route::get('meal-posts/calendar', [MealPostController::class, 'calendar']);
|
Route::get('meal-posts/calendar', [MealPostController::class, 'calendar']);
|
||||||
Route::post('meal-posts/analyze-image', [MealImageAnalysisController::class, 'store']);
|
Route::post('meal-posts/analyze-image', [MealImageAnalysisController::class, 'store']);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Models\MealPosts;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Laravel\Sanctum\Sanctum;
|
||||||
|
|
||||||
|
uses(RefreshDatabase::class);
|
||||||
|
|
||||||
|
it('returns only the authenticated user meal posts', function () {
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$otherUser = User::factory()->create();
|
||||||
|
|
||||||
|
$oldMealPost = MealPosts::factory()->for($user, 'user')->create([
|
||||||
|
'eaten_at' => '2026-05-18 12:00:00',
|
||||||
|
]);
|
||||||
|
$latestMealPost = MealPosts::factory()->for($user, 'user')->create([
|
||||||
|
'eaten_at' => '2026-05-19 12:00:00',
|
||||||
|
]);
|
||||||
|
$otherMealPost = MealPosts::factory()->for($otherUser, 'user')->create([
|
||||||
|
'eaten_at' => '2026-05-20 12:00:00',
|
||||||
|
]);
|
||||||
|
|
||||||
|
Sanctum::actingAs($user);
|
||||||
|
|
||||||
|
$response = $this->getJson('/api/me/meal-posts');
|
||||||
|
|
||||||
|
$response
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonCount(2, 'data')
|
||||||
|
->assertJsonPath('data.0.id', $latestMealPost->id)
|
||||||
|
->assertJsonPath('data.1.id', $oldMealPost->id)
|
||||||
|
->assertJsonMissing([
|
||||||
|
'id' => $otherMealPost->id,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
@ -97,6 +97,36 @@ it('returns workouts for the authenticated user', function () {
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('filters workouts by date', function () {
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
$todayWorkoutSession = WorkoutSessions::factory()->for($user, 'user')->create([
|
||||||
|
'calories_burned' => 450,
|
||||||
|
'started_at' => '2026-05-19 07:30:00',
|
||||||
|
]);
|
||||||
|
$eveningWorkoutSession = WorkoutSessions::factory()->for($user, 'user')->create([
|
||||||
|
'calories_burned' => 120,
|
||||||
|
'started_at' => '2026-05-19 19:30:00',
|
||||||
|
]);
|
||||||
|
$yesterdayWorkoutSession = WorkoutSessions::factory()->for($user, 'user')->create([
|
||||||
|
'calories_burned' => 320,
|
||||||
|
'started_at' => '2026-05-18 10:00:00',
|
||||||
|
]);
|
||||||
|
|
||||||
|
Sanctum::actingAs($user);
|
||||||
|
|
||||||
|
$response = $this->getJson('/api/workouts?date=2026-05-19');
|
||||||
|
|
||||||
|
$response
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonCount(2, 'data')
|
||||||
|
->assertJsonPath('data.0.id', $eveningWorkoutSession->id)
|
||||||
|
->assertJsonPath('data.1.id', $todayWorkoutSession->id)
|
||||||
|
->assertJsonMissing([
|
||||||
|
'id' => $yesterdayWorkoutSession->id,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
it('validates the workouts pagination size', function () {
|
it('validates the workouts pagination size', function () {
|
||||||
Sanctum::actingAs(User::factory()->create());
|
Sanctum::actingAs(User::factory()->create());
|
||||||
|
|
||||||
|
|
@ -106,6 +136,15 @@ it('validates the workouts pagination size', function () {
|
||||||
->assertJsonValidationErrors(['per_page']);
|
->assertJsonValidationErrors(['per_page']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('validates the workouts date filter', function () {
|
||||||
|
Sanctum::actingAs(User::factory()->create());
|
||||||
|
|
||||||
|
$this
|
||||||
|
->getJson('/api/workouts?date=2026-13-01')
|
||||||
|
->assertUnprocessable()
|
||||||
|
->assertJsonValidationErrors(['date']);
|
||||||
|
});
|
||||||
|
|
||||||
it('validates workout creation data', function () {
|
it('validates workout creation data', function () {
|
||||||
Sanctum::actingAs(User::factory()->create());
|
Sanctum::actingAs(User::factory()->create());
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue