feat: add reciprocal user blocking
CI / 🧪 Tests Laravel (push) Successful in 2m6s
CI / 🐳 Build & Push Image (push) Successful in 39s

This commit is contained in:
2026-08-11 15:58:31 +02:00
parent 6b757c37be
commit cef3e29ddc
15 changed files with 420 additions and 17 deletions
+24 -8
View File
@@ -7,6 +7,7 @@ use App\Http\Resources\PostReviewsResource;
use App\Models\MealPosts;
use App\Models\PostReviews;
use App\Notifications\MealPostCommentedNotification;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -16,11 +17,15 @@ class PostReviewsController extends Controller
{
public function index(Request $request, MealPosts $mealPost): AnonymousResourceCollection
{
$this->abortIfUnavailable($mealPost);
$this->abortIfUnavailable($request, $mealPost);
$perPage = max(1, min($request->integer('per_page', 15), 100));
$reviews = $mealPost->reviews()
->whereHas(
'user',
fn (Builder $query): Builder => $query->withoutBlockingRelationshipWith($request->user())
)
->with('user:id,name,avatar_url')
->latest()
->paginate($perPage)
@@ -31,7 +36,7 @@ class PostReviewsController extends Controller
public function store(PostReviewsRequest $request, MealPosts $mealPost): JsonResponse
{
$this->abortIfUnavailable($mealPost);
$this->abortIfUnavailable($request, $mealPost);
$userId = $request->user()->getKey();
@@ -60,7 +65,7 @@ class PostReviewsController extends Controller
public function mine(Request $request, MealPosts $mealPost): JsonResponse|PostReviewsResource
{
$this->abortIfUnavailable($mealPost);
$this->abortIfUnavailable($request, $mealPost);
$postReview = $mealPost->reviews()
->where('user_id', $request->user()->getKey())
@@ -74,10 +79,15 @@ class PostReviewsController extends Controller
return new PostReviewsResource($postReview);
}
public function show(PostReviews $postReview): PostReviewsResource
public function show(Request $request, PostReviews $postReview): PostReviewsResource
{
$postReview->loadMissing('mealPost.user');
$this->abortIfUnavailable($postReview->mealPost);
$postReview->loadMissing('mealPost.user', 'user');
$this->abortIfUnavailable($request, $postReview->mealPost);
abort_if(
$postReview->user === null
|| $request->user()->hasBlockingRelationshipWith($postReview->user),
404,
);
return new PostReviewsResource($postReview->loadMissing(
'mealPost.ingredients',
@@ -110,10 +120,16 @@ class PostReviewsController extends Controller
abort_unless($postReview->user_id === $request->user()->getKey(), 404);
}
private function abortIfUnavailable(MealPosts $mealPost): void
private function abortIfUnavailable(Request $request, MealPosts $mealPost): void
{
$mealPost->loadMissing('user');
$owner = $mealPost->user;
abort_if(
$mealPost->isHidden() || $mealPost->user()->whereNotNull('suspended_at')->exists(),
$mealPost->isHidden()
|| $owner === null
|| $owner->isSuspended()
|| $request->user()?->hasBlockingRelationshipWith($owner),
404,
);
}