feat: meal post visibility
This commit is contained in:
@@ -13,7 +13,6 @@ use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
class MealPostController extends Controller
|
||||
{
|
||||
@@ -116,7 +115,7 @@ class MealPostController extends Controller
|
||||
|
||||
if ($request->hasFile('image')) {
|
||||
$path = $request->file('image')->store('meal-posts', 'public');
|
||||
$data['image_url'] = asset(Storage::url($path));
|
||||
$data['image_url'] = $path;
|
||||
}
|
||||
|
||||
unset($data['image']);
|
||||
|
||||
@@ -2,22 +2,26 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Enums\MealPostVisibility;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class MealPostsRequest extends FormRequest
|
||||
{
|
||||
public function rules(): array
|
||||
{
|
||||
$isCreating = $this->isMethod('post');
|
||||
|
||||
return [
|
||||
'image' => ['sometimes', 'nullable', 'image', 'max:4096'],
|
||||
'image_url' => ['required_without:image', 'nullable', 'string', 'url', 'max:2048'],
|
||||
'caption' => ['nullable', 'string', 'max:1000'],
|
||||
'calories' => ['nullable', 'integer', 'min:0'],
|
||||
'proteins' => ['nullable', 'numeric', 'min:0'],
|
||||
'carbs' => ['nullable', 'numeric', 'min:0'],
|
||||
'fats' => ['nullable', 'numeric', 'min:0'],
|
||||
'title' => ['required', 'string', 'max:255'],
|
||||
'eaten_at' => ['required', 'date'],
|
||||
'title' => [$isCreating ? 'required' : 'sometimes', 'string', 'max:255'],
|
||||
'eaten_at' => [$isCreating ? 'required' : 'sometimes', 'date'],
|
||||
'visibility' => ['sometimes', Rule::enum(MealPostVisibility::class)],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -31,6 +35,7 @@ class MealPostsRequest extends FormRequest
|
||||
return [
|
||||
'image.max' => "L'image ne doit pas dépasser 4 Mo.",
|
||||
'image_url.required_without' => 'Ajoute une image au repas.',
|
||||
'visibility' => 'Choisis une visibilité valide.',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Resources;
|
||||
|
||||
use App\Enums\MealPostVisibility;
|
||||
use App\Models\MealPosts;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
@@ -16,13 +17,14 @@ class MealPostsResource extends JsonResource
|
||||
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'imageUrl' => $this->image_url,
|
||||
'imageUrl' => $this->image_url ? asset(Storage::url($this->image_url)) : null,
|
||||
'caption' => $this->caption,
|
||||
'calories' => $this->calories,
|
||||
'proteins' => $this->proteins,
|
||||
'carbs' => $this->carbs,
|
||||
'fats' => $this->fats,
|
||||
'title' => $this->title,
|
||||
'visibility' => $this->visibility,
|
||||
'eatenAt' => $this->eaten_at,
|
||||
'createdAt' => $this->created_at,
|
||||
'updatedAt' => $this->updated_at,
|
||||
|
||||
Reference in New Issue
Block a user