fixing bugs in seo generate, fix bug set publish time in post, changes in import posts command, changes in pagination

This commit is contained in:
F4ilji
2025-04-19 15:07:29 +05:00
parent 1399e2b8de
commit 03aca1725b
10 changed files with 86 additions and 57 deletions
+5 -2
View File
@@ -14,7 +14,7 @@ class SeoPageProvider
{
return $model->seo?->toArray();
}
public function getSeoForCurrentPage(): ?array
public function getSeoForCurrentPage(): array|null
{
$path = $this->getCurrentPath();
@@ -23,8 +23,11 @@ class SeoPageProvider
now()->addHours(1),
fn() => Page::where('path', $path)->first()
);
if ($page) {
return $page->seo->toArray();
}
return $page->seo?->toArray();
return null;
}
private function getCurrentPath(): string
@@ -14,7 +14,7 @@ class PostDataProcessor
* @param array $data
* @return array
*/
public function process(array $data): array
public function process(array $data, $operation): array
{
// Удаляем ненужные данные
unset($data['publication']);
@@ -23,7 +23,14 @@ class PostDataProcessor
$data['preview_text'] = $this->setPreviewText($data);
// Устанавливаем время публикации
$data['publish_at'] = $this->setPublishDateTime($data['publish_setting'], $data['status']);
if ($data['publish_setting']['publish_after'] === true) {
$data['publish_at'] = $this->setPublishDateTimeInFuture($data['publish_setting']);
}
if (($data['status'] === PostStatus::PUBLISHED->value || PostStatus::PUBLISHED) && $operation === 'create') {
$data['publish_at'] = $this->setPublishDateTime();
}
unset($data['publish_setting']);
// Генерируем данные для поиска
@@ -63,21 +70,17 @@ class PostDataProcessor
* @param string $status
* @return Carbon|null
*/
private function setPublishDateTime(array $publishSetting, $status): ?Carbon
private function setPublishDateTime(): ?Carbon
{
return Carbon::now();
}
private function setPublishDateTimeInFuture(array $publishSetting): ?Carbon
{
if ($publishSetting['publish_after'] === true) {
return Carbon::parse($publishSetting['publish_at']);
}
if ($status === PostStatus::PUBLISHED->value) {
return Carbon::now();
}
if ($status === PostStatus::PUBLISHED) {
return Carbon::now();
}
return null;
}
+4 -3
View File
@@ -9,20 +9,21 @@ trait SeoGenerate
{
public function createSeo($record): void
{
$record->seo()->create($this->generateSeo($record));
$seo = $this->generateSeoData($record);
$record->seo()->create($seo);
}
public function updateSeo($record): void
{
if ($record->seo()->exists()) {
$record->seo()->update($this->generateSeo($record));
$record->seo()->update($this->generateSeoData($record));
} else {
$this->createSeo($record);
}
}
private function generateSeo($record) {
private function generateSeoData($record) {
return app(SeoGeneratorService::class)->generate([
'title' => $record->title,
'content' => $record instanceof SeoDescriptionInterface