* fix: keep post drafts unscheduled by default * Align schedule validation and keep drafts unscheduled. Require scheduled_at only when status is scheduled and the post has no usable future schedule. Share that rule across web, API, and MCP, keep create without a date as null, and preserve the legacy date → 09:00 UTC fallback. * Polish schedule validation typing and tests. Type requiresExplicitSchedule status as ?string, reuse a local status variable in request/tool validation, tighten the web reject assertion, and collapse overlapping MCP unscheduled-create cases. * Centralize status helper in post update validation. Reuse the typed status() helper across FormRequests and the already-parsed $status in UpdatePostTool so schedule checks stay consistent and less noisy. * Share scheduled_at update rules across web, API, and MCP. Centralize schedule validation in PostStatusRules, normalize status parsing in one place, and align past-schedule coverage across entry points. * Cover the full unscheduled-draft checklist in Pest. Add feature coverage for null/past schedule rejection, explicit scheduling, draft saves, publish-now without a schedule, calendar exclusion, and 09:00 UTC date defaults across web, API, and MCP. * Remove normalizeStatus helper. Keep the inline is_string check at the few call sites that read raw request status before validation — no shared wrapper needed. Co-authored-by: Cursor <cursoragent@cursor.com> * Drop is_string status guards from schedule validation. Accept mixed status in PostStatusRules and rely on strict comparisons with Rule::requiredIf / Rule::when — malformed input simply does not match. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Paulo Castellano <paulo@castellanos.llc>
111 lines
3.6 KiB
PHP
111 lines
3.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Http\Requests\App\Post;
|
|
|
|
use App\Enums\Post\Status;
|
|
use App\Enums\PostPlatform\ContentType;
|
|
use App\Enums\SocialAccount\Platform;
|
|
use App\Rules\ContentFitsPlatformLimits;
|
|
use App\Rules\ContentTypeCompatibleWithMedia;
|
|
use App\Support\PostMediaRules;
|
|
use App\Support\PostPlatformMetaRules;
|
|
use App\Support\PostStatusRules;
|
|
use Illuminate\Foundation\Http\FormRequest;
|
|
use Illuminate\Support\Collection;
|
|
use Illuminate\Validation\Rule;
|
|
use Illuminate\Validation\Validator;
|
|
|
|
class UpdatePostRequest extends FormRequest
|
|
{
|
|
public function authorize(): bool
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public function rules(): array
|
|
{
|
|
$status = $this->input('status');
|
|
|
|
$enforcesMediaCompatibility = in_array(
|
|
$status,
|
|
[Status::Scheduled->value, Status::Publishing->value],
|
|
true,
|
|
);
|
|
|
|
return [
|
|
'status' => ['required', 'string', Rule::in([Status::Draft->value, Status::Scheduled->value, Status::Publishing->value])],
|
|
'content' => [
|
|
'nullable',
|
|
'string',
|
|
'max:10000',
|
|
Rule::when(
|
|
$enforcesMediaCompatibility,
|
|
[new ContentFitsPlatformLimits($this->resolveSelectedPlatforms())]
|
|
),
|
|
],
|
|
...PostMediaRules::rules(hosted: true),
|
|
'scheduled_at' => PostStatusRules::scheduledAtRules($this->route('post'), $status),
|
|
'platforms' => ['sometimes', 'array'],
|
|
'platforms.*.id' => ['required', 'uuid', Rule::exists('post_platforms', 'id')->where('post_id', $this->route('post')->id)],
|
|
'platforms.*.content_type' => [
|
|
$enforcesMediaCompatibility ? 'required' : 'sometimes',
|
|
'string',
|
|
Rule::in(array_column(ContentType::cases(), 'value')),
|
|
Rule::when($enforcesMediaCompatibility, [new ContentTypeCompatibleWithMedia]),
|
|
],
|
|
...PostPlatformMetaRules::rules(),
|
|
'label_ids' => ['sometimes', 'array'],
|
|
'label_ids.*' => ['uuid', Rule::exists('workspace_labels', 'id')->where('workspace_id', $this->user()->currentWorkspace->id)],
|
|
];
|
|
}
|
|
|
|
public function withValidator(Validator $validator): void
|
|
{
|
|
$validator->after(function (Validator $validator): void {
|
|
if (! $this->isPublishingOrScheduling()) {
|
|
return;
|
|
}
|
|
|
|
$platforms = $this->input('platforms', []);
|
|
$ids = collect($platforms)->pluck('id')->filter()->all();
|
|
|
|
$platformsById = $this->route('post')
|
|
->postPlatforms()
|
|
->whereIn('id', $ids)
|
|
->pluck('platform', 'id');
|
|
|
|
PostPlatformMetaRules::addRequiredOnPublishErrors(
|
|
$validator,
|
|
$platforms,
|
|
fn ($platform) => $platformsById[data_get($platform, 'id')] ?? null,
|
|
);
|
|
});
|
|
}
|
|
|
|
private function isPublishingOrScheduling(): bool
|
|
{
|
|
return in_array(
|
|
$this->input('status'),
|
|
[Status::Scheduled->value, Status::Publishing->value],
|
|
true,
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @return Collection<int|string, Platform>
|
|
*/
|
|
private function resolveSelectedPlatforms(): Collection
|
|
{
|
|
$ids = collect($this->input('platforms', []))->pluck('id')->filter()->all();
|
|
if (empty($ids)) {
|
|
return collect();
|
|
}
|
|
|
|
return $this->route('post')
|
|
->postPlatforms()
|
|
->whereIn('id', $ids)
|
|
->pluck('platform', 'id');
|
|
}
|
|
}
|