changes
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use App\Containers\Dashboard\Tasks\ParseDocxTask;
|
||||
use App\Containers\Dashboard\Tasks\ConvertDocToDocxTask;
|
||||
use App\Containers\Dashboard\Tasks\AI\ParseDocxTask;
|
||||
use App\Containers\Dashboard\Tasks\AI\ConvertDocToDocxTask;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Collection;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\AI;
|
||||
|
||||
use ZipArchive;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@@ -0,0 +1,69 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\AdditionalEducations;
|
||||
|
||||
class GenerateSearchDataTask
|
||||
{
|
||||
public function run(array $content): string
|
||||
{
|
||||
$result = '';
|
||||
|
||||
foreach ($content as $block) {
|
||||
$result .= $this->extractDataFromBlock($block);
|
||||
}
|
||||
|
||||
// Удаляем лишние пробелы и переносы строк
|
||||
$result = preg_replace('/\s+/', ' ', $result);
|
||||
$result = trim($result);
|
||||
|
||||
return strtolower($result);
|
||||
}
|
||||
|
||||
private function extractDataFromBlock(array $block): string
|
||||
{
|
||||
$data = '';
|
||||
|
||||
switch ($block['type']) {
|
||||
case 'paragraph':
|
||||
case 'heading':
|
||||
$data .= strip_tags($block['data']['content'] ?? '') . ' ';
|
||||
break;
|
||||
|
||||
case 'files':
|
||||
if (isset($block['data']['file']) && is_array($block['data']['file'])) {
|
||||
foreach ($block['data']['file'] as $file) {
|
||||
$data .= ($file['title'] ?? '') . ' ';
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'person':
|
||||
$data .= ($block['data']['name'] ?? '') . ' ';
|
||||
break;
|
||||
|
||||
case 'stepper':
|
||||
$data .= ($block['data']['step_name'] ?? '') . ' ';
|
||||
if (isset($block['data']['steps']) && is_array($block['data']['steps'])) {
|
||||
foreach ($block['data']['steps'] as $step) {
|
||||
$data .= ($step['title'] ?? '') . ' ';
|
||||
$data .= strip_tags($step['content'] ?? '') . ' ';
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'tabs':
|
||||
if (isset($block['data']['tab']) && is_array($block['data']['tab'])) {
|
||||
foreach ($block['data']['tab'] as $item) {
|
||||
if (isset($item['content']) && is_array($item['content'])) {
|
||||
foreach ($item['content'] as $nestedBlock) {
|
||||
$data .= $this->extractDataFromBlock($nestedBlock);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
@@ -1,106 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
|
||||
use App\Containers\Dashboard\Exceptions\EmailFetchException;
|
||||
use Webklex\PHPIMAP\Client;
|
||||
use Webklex\PHPIMAP\ClientManager;
|
||||
use Webklex\PHPIMAP\Folder;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Подключение к IMAP-серверу
|
||||
*/
|
||||
class ConnectToImapTask
|
||||
{
|
||||
/**
|
||||
* Подключиться к IMAP-серверу
|
||||
*
|
||||
* @param string|null $accountName Имя аккаунта из config/imap.php
|
||||
* @return Client IMAP клиент
|
||||
* @throws EmailFetchException
|
||||
*/
|
||||
public function run(?string $accountName = null): Client
|
||||
{
|
||||
$accountName = $accountName ?? config('email-news.imap_account', 'email_news');
|
||||
|
||||
// Получаем конфиг для webklex/php-imap
|
||||
$imapConfig = config('imap');
|
||||
|
||||
Log::info('[ConnectToImapTask] Попытка подключения к IMAP', [
|
||||
'account' => $accountName,
|
||||
'host' => $imapConfig['accounts'][$accountName]['host'] ?? 'unknown',
|
||||
]);
|
||||
|
||||
try {
|
||||
// Создаём ClientManager с явным конфигом
|
||||
$clientManager = new ClientManager($imapConfig);
|
||||
$client = $clientManager->account($accountName);
|
||||
$client->connect();
|
||||
|
||||
Log::info('[ConnectToImapTask] Успешное подключение к IMAP', [
|
||||
'account' => $accountName,
|
||||
]);
|
||||
|
||||
return $client;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[ConnectToImapTask] Ошибка подключения к IMAP', [
|
||||
'account' => $accountName,
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
throw EmailFetchException::connectionFailed($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить папку
|
||||
*
|
||||
* @param Client $client IMAP клиент
|
||||
* @param string $folderName Имя папки
|
||||
* @return Folder
|
||||
* @throws EmailFetchException
|
||||
*/
|
||||
public function getFolder(Client $client, string $folderName): Folder
|
||||
{
|
||||
Log::info('[ConnectToImapTask] Получение папки', [
|
||||
'folder' => $folderName,
|
||||
]);
|
||||
|
||||
try {
|
||||
// Пробуем получить папку напрямую
|
||||
$folder = $client->getFolder($folderName);
|
||||
|
||||
// Если не получилось, ищем в списке папок
|
||||
if (!$folder) {
|
||||
$folders = $client->getFolders();
|
||||
foreach ($folders as $f) {
|
||||
if ($f->name === $folderName || $f->path === $folderName) {
|
||||
$folder = $f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$folder) {
|
||||
throw EmailFetchException::folderNotFound($folderName);
|
||||
}
|
||||
|
||||
Log::info('[ConnectToImapTask] Папка получена успешно', [
|
||||
'folder' => $folderName,
|
||||
'fullName' => $folder->full_name ?? $folder->name ?? $folderName,
|
||||
]);
|
||||
|
||||
return $folder;
|
||||
} catch (EmailFetchException $e) {
|
||||
throw $e;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[ConnectToImapTask] Ошибка получения папки', [
|
||||
'folder' => $folderName,
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
throw EmailFetchException::folderNotFound($folderName);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Content;
|
||||
|
||||
class GenerateSearchDataTask
|
||||
{
|
||||
/**
|
||||
* Generate searchable text from content builder blocks
|
||||
*/
|
||||
public function run(array $content): string
|
||||
{
|
||||
$result = '';
|
||||
|
||||
foreach ($content as $block) {
|
||||
$result .= $this->getDataFromBlocks($block);
|
||||
}
|
||||
|
||||
// Remove extra whitespace and newlines
|
||||
$result = preg_replace('/\s+/', ' ', $result);
|
||||
$result = trim($result);
|
||||
|
||||
return strtolower($result);
|
||||
}
|
||||
|
||||
private function getDataFromBlocks($block): string
|
||||
{
|
||||
$data = '';
|
||||
|
||||
switch ($block['type']) {
|
||||
case 'paragraph':
|
||||
$data .= strip_tags($block['data']['content']) . ' ';
|
||||
break;
|
||||
case 'heading':
|
||||
$data .= strip_tags($block['data']['content']) . ' ';
|
||||
break;
|
||||
case 'files':
|
||||
foreach ($block['data']['file'] as $file) {
|
||||
$data .= $file['title'] . ' ';
|
||||
}
|
||||
break;
|
||||
case 'person':
|
||||
$data .= $block['data']['name'] . ' ';
|
||||
break;
|
||||
case 'stepper':
|
||||
$data .= $block['data']['step_name'] . ' ';
|
||||
foreach ($block['data']['steps'] as $step) {
|
||||
$data .= $step['title'] . ' ';
|
||||
$data .= strip_tags($step['content']) . ' ';
|
||||
}
|
||||
break;
|
||||
case 'tabs':
|
||||
foreach ($block['data']['tab'] as $item) {
|
||||
foreach ($item['content'] as $block) {
|
||||
$data .= $this->getDataFromBlocks($block);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
@@ -1,190 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
|
||||
use App\Containers\Dashboard\Data\EmailAttachmentData;
|
||||
use App\Containers\Dashboard\Exceptions\EmailFetchException;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Webklex\PHPIMAP\Attachment;
|
||||
|
||||
/**
|
||||
* Загрузка и сохранение вложений из письма
|
||||
*/
|
||||
class DownloadAttachmentsTask
|
||||
{
|
||||
/**
|
||||
* Скачать и сохранить вложения
|
||||
*
|
||||
* @param object $message IMAP сообщение
|
||||
* @param string|null $disk Диск для сохранения
|
||||
* @return array<EmailAttachmentData>
|
||||
* @throws EmailFetchException
|
||||
*/
|
||||
public function run(object $message, ?string $disk = null): array
|
||||
{
|
||||
$disk = $disk ?? config('email-news.attachments_folder', 'email_attachments');
|
||||
|
||||
Log::info('[DownloadAttachmentsTask] Начало загрузки вложений', [
|
||||
'message_id' => $message->getMessageId(),
|
||||
'disk' => $disk,
|
||||
]);
|
||||
|
||||
$attachments = $message->getAttachments();
|
||||
|
||||
if (empty($attachments)) {
|
||||
Log::warning('[DownloadAttachmentsTask] Вложения не найдены');
|
||||
throw EmailFetchException::noAttachmentsFound();
|
||||
}
|
||||
|
||||
Log::info('[DownloadAttachmentsTask] Найдено вложений', [
|
||||
'count' => count($attachments),
|
||||
]);
|
||||
|
||||
$savedAttachments = [];
|
||||
$maxSize = config('email-news.max_attachment_size', 41943040); // 40MB по умолчанию
|
||||
|
||||
/** @var Attachment $attachment */
|
||||
foreach ($attachments as $attachment) {
|
||||
try {
|
||||
// Проверяем размер
|
||||
if ($maxSize > 0 && $attachment->getSize() > $maxSize) {
|
||||
Log::warning('[DownloadAttachmentsTask] Вложение превышает максимальный размер', [
|
||||
'filename' => $attachment->getName(),
|
||||
'size' => $attachment->getSize(),
|
||||
'max_size' => $maxSize,
|
||||
]);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Сохраняем вложение
|
||||
$savedPath = $this->saveAttachment($attachment, $disk);
|
||||
|
||||
if ($savedPath) {
|
||||
// Декодируем MIME-имя для корректного определения расширения
|
||||
$decodedFilename = $this->decodeMimeFilename($attachment->getName());
|
||||
|
||||
$savedAttachments[] = EmailAttachmentData::fromFile(
|
||||
path: $savedPath,
|
||||
originalFilename: $decodedFilename,
|
||||
mimeType: $attachment->getContentType(),
|
||||
size: $attachment->getSize(),
|
||||
contentId: $attachment->getContentId(),
|
||||
);
|
||||
|
||||
Log::info('[DownloadAttachmentsTask] Вложение сохранено', [
|
||||
'filename' => $attachment->getName(),
|
||||
'path' => $savedPath,
|
||||
'size' => $attachment->getSize(),
|
||||
]);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[DownloadAttachmentsTask] Ошибка сохранения вложения', [
|
||||
'filename' => $attachment->getName(),
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
// Продолжаем обработку остальных вложений
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($savedAttachments)) {
|
||||
Log::error('[DownloadAttachmentsTask] Не удалось сохранить ни одно вложение');
|
||||
throw EmailFetchException::noAttachmentsFound();
|
||||
}
|
||||
|
||||
Log::info('[DownloadAttachmentsTask] Загрузка вложений завершена', [
|
||||
'saved_count' => count($savedAttachments),
|
||||
]);
|
||||
|
||||
return $savedAttachments;
|
||||
}
|
||||
|
||||
/**
|
||||
* Сохранить вложение на диск
|
||||
*
|
||||
* @param Attachment $attachment Вложение
|
||||
* @param string $disk Диск для сохранения
|
||||
* @return string|null Путь к сохранённому файлу
|
||||
*/
|
||||
private function saveAttachment(Attachment $attachment, string $disk): ?string
|
||||
{
|
||||
$filename = $this->generateUniqueFilename($attachment->getName());
|
||||
$savePath = storage_path('app/' . $disk);
|
||||
|
||||
// Создаём директорию, если не существует
|
||||
if (!is_dir($savePath)) {
|
||||
mkdir($savePath, 0755, true);
|
||||
}
|
||||
|
||||
// Сохраняем вложение (метод save принимает только путь и имя файла)
|
||||
try {
|
||||
$savedPath = $attachment->save($savePath, $filename);
|
||||
|
||||
if ($savedPath) {
|
||||
// Возвращаем относительный путь для сохранения в БД
|
||||
return $disk . '/' . $filename;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[DownloadAttachmentsTask:saveAttachment] Ошибка сохранения', [
|
||||
'filename' => $attachment->getName(),
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Сгенерировать уникальное имя файла
|
||||
*
|
||||
* @param string $originalName Оригинальное имя файла
|
||||
* @return string
|
||||
*/
|
||||
private function generateUniqueFilename(string $originalName): string
|
||||
{
|
||||
$decodedName = $this->decodeMimeFilename($originalName);
|
||||
|
||||
// Очищаем имя от специальных символов
|
||||
$decodedName = preg_replace('/[^a-zA-Z0-9_\-\p{L}.]/u', '_', $decodedName);
|
||||
|
||||
// Удаляем множественные подчёркивания
|
||||
$decodedName = preg_replace('/_+/', '_', $decodedName);
|
||||
|
||||
// Получаем расширение
|
||||
$extension = strtolower(pathinfo($decodedName, PATHINFO_EXTENSION));
|
||||
|
||||
// Если расширение пустое, пробуем определить из оригинального имени
|
||||
if (empty($extension) && str_contains($originalName, '.docx')) {
|
||||
$extension = 'docx';
|
||||
} elseif (empty($extension) && str_contains($originalName, '.doc')) {
|
||||
$extension = 'doc';
|
||||
} elseif (empty($extension) && str_contains($originalName, '.pdf')) {
|
||||
$extension = 'pdf';
|
||||
}
|
||||
|
||||
// Генерируем уникальное имя
|
||||
$basename = pathinfo($decodedName, PATHINFO_FILENAME);
|
||||
$basename = mb_substr($basename, 0, 100); // Ограничиваем длину
|
||||
|
||||
return $basename . '_' . time() . '_' . bin2hex(random_bytes(4)) . '.' . ($extension ?: 'bin');
|
||||
}
|
||||
|
||||
/**
|
||||
* Декодировать MIME-кодированное имя файла
|
||||
*
|
||||
* @param string $filename Имя файла в MIME-кодировке
|
||||
* @return string Декодированное имя файла
|
||||
*/
|
||||
private function decodeMimeFilename(string $filename): string
|
||||
{
|
||||
// Декодируем MIME-кодировку (=?UTF-8?B?...?=)
|
||||
$decodedName = mb_decode_mimeheader($filename) ?: $filename;
|
||||
|
||||
// Если не декодировалось, пробуем другой метод
|
||||
if ($decodedName === $filename && str_contains($filename, '=?')) {
|
||||
$decodedName = iconv_mime_decode($filename, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8') ?: $filename;
|
||||
}
|
||||
|
||||
return $decodedName;
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
|
||||
use Webklex\PHPIMAP\Folder;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Получение непрочитанных писем из папки
|
||||
*/
|
||||
class FetchUnreadEmailsTask
|
||||
{
|
||||
/**
|
||||
* Получить непрочитанные письма
|
||||
*
|
||||
* @param Folder $folder IMAP папка
|
||||
* @return array Массив писем
|
||||
*/
|
||||
public function run(Folder $folder): array
|
||||
{
|
||||
Log::info('[FetchUnreadEmailsTask] Получение непрочитанных писем', [
|
||||
'folder' => $folder->full_name ?? $folder->name ?? 'unknown',
|
||||
]);
|
||||
|
||||
try {
|
||||
// Получаем все непрочитанные сообщения
|
||||
$messages = $folder->messages()->unseen()->get();
|
||||
|
||||
$emails = [];
|
||||
foreach ($messages as $message) {
|
||||
$from = $message->getFrom()[0] ?? null;
|
||||
$subject = $message->getSubject();
|
||||
$date = $message->getDate();
|
||||
|
||||
$emails[] = [
|
||||
'message' => $message,
|
||||
'message_id' => $message->getMessageId(),
|
||||
'from_email' => $from?->mail ?? null,
|
||||
'from_name' => $from?->name ?? null,
|
||||
'subject' => $subject,
|
||||
'date' => $date,
|
||||
'has_attachments' => $message->hasAttachments(),
|
||||
];
|
||||
}
|
||||
|
||||
Log::info('[FetchUnreadEmailsTask] Получены письма', [
|
||||
'count' => count($emails),
|
||||
'folder' => $folder->full_name ?? $folder->name ?? 'unknown',
|
||||
]);
|
||||
|
||||
return $emails;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[FetchUnreadEmailsTask] Ошибка получения писем', [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\Files;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@@ -104,6 +104,7 @@ class CompressImageTask
|
||||
'compressed_size' => $this->formatFileSize($newSize),
|
||||
'compression_ratio' => round((1 - $newSize / $file->getSize()) * 100, 2) . '%',
|
||||
'temp_path' => $tempPath,
|
||||
'memory_usage' => round(memory_get_usage(true) / 1024 / 1024, 2) . ' MB',
|
||||
]);
|
||||
|
||||
// Создаём новый UploadedFile из сжатого
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Files;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class UploadFileTask
|
||||
{
|
||||
/**
|
||||
* Загружает файл на публичный диск и возвращает путь
|
||||
*
|
||||
* @param UploadedFile $file Файл для загрузки
|
||||
* @return array ['path' => путь в storage, 'url' => публичный URL, 'original_name' => оригинальное имя]
|
||||
*/
|
||||
public function run(UploadedFile $file): array
|
||||
{
|
||||
$originalFileNameWithExtension = $file->getClientOriginalName();
|
||||
$originalFileName = pathinfo($originalFileNameWithExtension, PATHINFO_FILENAME);
|
||||
$extension = $file->getClientOriginalExtension();
|
||||
|
||||
$sluggedFileName = Str::slug($originalFileName);
|
||||
$uniqueFileName = $sluggedFileName . '-' . md5(uniqid(rand(), true)) . '.' . $extension;
|
||||
|
||||
$path = $file->storeAs('files', $uniqueFileName, 'public');
|
||||
$url = Storage::url($path);
|
||||
|
||||
return [
|
||||
'path' => $path,
|
||||
'url' => $url,
|
||||
'original_name' => $originalFileNameWithExtension,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Фильтрация писем по отправителю
|
||||
*/
|
||||
class FilterBySenderTask
|
||||
{
|
||||
/**
|
||||
* Отфильтровать письма по разрешённым отправителям
|
||||
*
|
||||
* @param array $emails Массив писем
|
||||
* @param array|null $allowedSenders Whitelist email-адресов
|
||||
* @return array Отфильтрованные письма
|
||||
*/
|
||||
public function run(array $emails, ?array $allowedSenders = null): array
|
||||
{
|
||||
// Если whitelist не передан, берём из конфига
|
||||
$allowedSenders = $allowedSenders ?? config('email-news.allowed_senders', []);
|
||||
|
||||
// Фильтруем пустые значения
|
||||
$allowedSenders = array_filter($allowedSenders, fn($email) => !empty($email));
|
||||
|
||||
// Если список пуст, используем editor_email
|
||||
if (empty($allowedSenders)) {
|
||||
$editorEmail = config('email-news.editor_email');
|
||||
if ($editorEmail) {
|
||||
$allowedSenders = [$editorEmail];
|
||||
}
|
||||
}
|
||||
|
||||
Log::info('[FilterBySenderTask] Фильтрация писем', [
|
||||
'total_emails' => count($emails),
|
||||
'allowed_senders' => $allowedSenders,
|
||||
]);
|
||||
|
||||
if (empty($allowedSenders)) {
|
||||
Log::warning('[FilterBySenderTask] Не указан разрешённый отправитель, пропускаем все письма');
|
||||
return [];
|
||||
}
|
||||
|
||||
$filtered = [];
|
||||
$skippedCount = 0;
|
||||
|
||||
foreach ($emails as $email) {
|
||||
$fromEmail = $email['from_email'];
|
||||
|
||||
// Проверяем, есть ли отправитель в whitelist
|
||||
if (!in_array($fromEmail, $allowedSenders, true)) {
|
||||
$skippedCount++;
|
||||
|
||||
// Логируем только если включено логирование
|
||||
if (config('email-news.log_skipped_emails', true)) {
|
||||
Log::debug('[FilterBySenderTask] Пропущено письмо от неразрешённого отправителя', [
|
||||
'from' => $fromEmail,
|
||||
'subject' => $email['subject'],
|
||||
'date' => $email['date'],
|
||||
]);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
$filtered[] = $email;
|
||||
}
|
||||
|
||||
Log::info('[FilterBySenderTask] Фильтрация завершена', [
|
||||
'total' => count($emails),
|
||||
'filtered' => count($filtered),
|
||||
'skipped' => $skippedCount,
|
||||
]);
|
||||
|
||||
return $filtered;
|
||||
}
|
||||
|
||||
/**
|
||||
* Проверить конкретный email на разрешение
|
||||
*
|
||||
* @param string $email Email для проверки
|
||||
* @return bool
|
||||
*/
|
||||
public function isAllowed(string $email): bool
|
||||
{
|
||||
$allowedSenders = config('email-news.allowed_senders', []);
|
||||
$allowedSenders = array_filter($allowedSenders, fn($e) => !empty($e));
|
||||
|
||||
if (empty($allowedSenders)) {
|
||||
$allowedSenders = [config('email-news.editor_email')];
|
||||
}
|
||||
|
||||
return in_array($email, $allowedSenders, true);
|
||||
}
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Пометка письма как прочитанного
|
||||
*/
|
||||
class MarkEmailAsReadTask
|
||||
{
|
||||
/**
|
||||
* Пометить письмо как прочитанное
|
||||
*
|
||||
* @param object $message IMAP сообщение
|
||||
* @return bool
|
||||
*/
|
||||
public function run(object $message): bool
|
||||
{
|
||||
Log::info('[MarkEmailAsReadTask] Пометка письма как прочитанного', [
|
||||
'message_id' => $message->getMessageId(),
|
||||
'subject' => $message->getSubject(),
|
||||
]);
|
||||
|
||||
try {
|
||||
$message->setFlag('Seen');
|
||||
|
||||
Log::info('[MarkEmailAsReadTask] Письмо помечено как прочитанное');
|
||||
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[MarkEmailAsReadTask] Ошибка пометки письма', [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Пометить письмо как прочитанное и переместить в другую папку
|
||||
*
|
||||
* @param object $message IMAP сообщение
|
||||
* @param string $targetFolder Целевая папка
|
||||
* @return bool
|
||||
*/
|
||||
public function markAndMove(object $message, string $targetFolder): bool
|
||||
{
|
||||
Log::info('[MarkEmailAsReadTask] Пометка и перемещение письма', [
|
||||
'message_id' => $message->getMessageId(),
|
||||
'target_folder' => $targetFolder,
|
||||
]);
|
||||
|
||||
try {
|
||||
// Помечаем как прочитанное
|
||||
$message->setFlag('Seen');
|
||||
|
||||
// Перемещаем в другую папку
|
||||
$message->moveToFolder($targetFolder);
|
||||
|
||||
Log::info('[MarkEmailAsReadTask] Письмо обработано и перемещено', [
|
||||
'target_folder' => $targetFolder,
|
||||
]);
|
||||
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Log::error('[MarkEmailAsReadTask] Ошибка обработки письма', [
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
|
||||
class BulkDeletePostsTask
|
||||
{
|
||||
public function run(array $ids): int
|
||||
{
|
||||
return Post::whereIn('id', $ids)->delete();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Post;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class BulkUpdatePostStatusTask
|
||||
{
|
||||
public function run(array $ids, PostStatus $status, ?Carbon $publishAt = null): int
|
||||
{
|
||||
$data = ['status' => $status];
|
||||
|
||||
if ($publishAt !== null) {
|
||||
$data['publish_at'] = $publishAt;
|
||||
}
|
||||
|
||||
return Post::whereIn('id', $ids)->update($data);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Post;
|
||||
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Services\Filament\Domain\Posts\PostDataProcessor;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class CreatePostTask
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PostDataProcessor $postDataProcessor,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Создает новый пост в БД
|
||||
*
|
||||
* @param array $data Данные поста
|
||||
* @return Post
|
||||
*/
|
||||
public function run(array $data): Post
|
||||
{
|
||||
$processedData = $this->postDataProcessor->processCreate($data);
|
||||
return Post::create($processedData);
|
||||
}
|
||||
|
||||
/**
|
||||
* Генерирует уникальный slug
|
||||
*/
|
||||
public function generateUniqueSlug(string $baseSlug): string
|
||||
{
|
||||
$slug = $baseSlug;
|
||||
$count = 1;
|
||||
|
||||
while (Post::where('slug', $slug)->exists()) {
|
||||
$slug = $baseSlug . '-' . $count;
|
||||
$count++;
|
||||
}
|
||||
|
||||
return $slug;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
|
||||
class DeletePostTask
|
||||
{
|
||||
public function run(Post $post): bool
|
||||
{
|
||||
return $post->delete();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks;
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Post;
|
||||
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Category;
|
||||
use App\Containers\Widget\Models\Slider;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
class GetPostFormDataTask
|
||||
{
|
||||
public function run(): array
|
||||
{
|
||||
return [
|
||||
'categories' => Category::all(['id', 'title']),
|
||||
'sliders' => Slider::where('is_active', true)->get(['id', 'title']),
|
||||
'statuses' => PostStatus::cases(),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Dto\MainSliderDTO;
|
||||
use App\Services\Filament\Domain\Posts\PostSliderService;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
class HandlePostSliderTask
|
||||
{
|
||||
/**
|
||||
* Обрабатывает слайдер для поста (создание/обновление/удаление)
|
||||
*
|
||||
* @param Post $post
|
||||
* @param array $slideData Данные слайдера
|
||||
* @param bool $isCreate Создание или обновление
|
||||
* @return void
|
||||
*/
|
||||
public function run(Post $post, array $slideData, bool $isCreate = false): void
|
||||
{
|
||||
// Если слайдер не передан или slider_id null - ничего не делаем
|
||||
if (empty($slideData) || empty($slideData['slider_id'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Если нужно удалить слайдер
|
||||
if (isset($slideData['slider_id']) && $slideData['slider_id'] === null) {
|
||||
$post->slide?->delete();
|
||||
return;
|
||||
}
|
||||
|
||||
$data = [
|
||||
'is_active' => $slideData['is_active'] ?? false,
|
||||
'start_time' => $post->publish_at ?? Carbon::now(),
|
||||
'title' => $slideData['title'] ?? $post->title,
|
||||
'description' => $slideData['content'] ?? $post->preview_text,
|
||||
'image' => $slideData['image']['url'] ?? null,
|
||||
'color_theme' => $slideData['color_theme'] ?? '#ffffff',
|
||||
];
|
||||
|
||||
// Добавляем настройки слайда
|
||||
if (isset($slideData['settings'])) {
|
||||
$data = array_merge($data, $slideData['settings']);
|
||||
}
|
||||
|
||||
$sliderDTO = MainSliderDTO::fromArray($data);
|
||||
$sliderService = new PostSliderService($sliderDTO, $post);
|
||||
|
||||
// Обновляем или создаем слайдер
|
||||
if ($post->slide && !$isCreate) {
|
||||
$sliderService->update();
|
||||
} else {
|
||||
$sliderService->create();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
||||
|
||||
class ListPostsTask
|
||||
{
|
||||
public function run(array $filters = [], int $perPage = 20): LengthAwarePaginator
|
||||
{
|
||||
$query = Post::with(['category', 'author'])
|
||||
->orderBy('publish_at', 'desc');
|
||||
|
||||
if (!empty($filters['status'])) {
|
||||
$query->where('status', $filters['status']);
|
||||
}
|
||||
|
||||
if (!empty($filters['search'])) {
|
||||
$query->where('title', 'like', '%' . $filters['search'] . '%');
|
||||
}
|
||||
|
||||
return $query->paginate($perPage);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Services\Filament\Domain\Posts\VkPostPublisher;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class PublishPostToVkTask
|
||||
{
|
||||
/**
|
||||
* Публикует пост в VK
|
||||
*
|
||||
* @param Post $post
|
||||
* @param bool $shouldPublish Флаг публикации
|
||||
* @param bool $isUpdate Флаг обновления (true) или создания (false)
|
||||
* @return void
|
||||
*/
|
||||
public function run(Post $post, bool $shouldPublish, bool $isUpdate = false): void
|
||||
{
|
||||
if (!$shouldPublish) {
|
||||
return;
|
||||
}
|
||||
|
||||
$publisher = new VkPostPublisher();
|
||||
|
||||
if ($isUpdate) {
|
||||
// Проверяем, опубликован ли пост уже в VK
|
||||
$postRelation = DB::table('posts_vk_posts')
|
||||
->where('post_id', $post->id)
|
||||
->first();
|
||||
|
||||
if ($postRelation) {
|
||||
$publisher->update(['vk' => true], $post);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$publisher->publish(['vk' => true], $post);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Services\Filament\Domain\Posts\PostNotificationService;
|
||||
|
||||
class SendPostNotificationTask
|
||||
{
|
||||
/**
|
||||
* Отправляет уведомления о статусе поста
|
||||
*
|
||||
* @param Post $post
|
||||
* @param string|null $newStatus Новый статус поста
|
||||
* @param bool $isCreation Флаг создания (true) или обновления (false)
|
||||
* @return void
|
||||
*/
|
||||
public function run(Post $post, ?string $newStatus = null, bool $isCreation = false): void
|
||||
{
|
||||
$notificationService = new PostNotificationService();
|
||||
|
||||
// При создании всегда отправляем уведомление
|
||||
if ($isCreation) {
|
||||
$notificationService->send($post);
|
||||
return;
|
||||
}
|
||||
|
||||
// При обновлении отправляем только при смене статуса
|
||||
$status = $newStatus ?? $post->status;
|
||||
|
||||
if ($status instanceof PostStatus) {
|
||||
if ($status === PostStatus::PUBLISHED) {
|
||||
$notificationService->sendSuccessNotification($post);
|
||||
} elseif ($status === PostStatus::REJECTED) {
|
||||
$notificationService->sendDeniedNotification($post);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Posts;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Services\Filament\Domain\Posts\PostDataProcessor;
|
||||
|
||||
class UpdatePostTask
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PostDataProcessor $postDataProcessor,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Обновляет существующий пост
|
||||
*
|
||||
* @param Post $post Пост для обновления
|
||||
* @param array $data Новые данные
|
||||
* @return Post
|
||||
*/
|
||||
public function run(Post $post, array $data): Post
|
||||
{
|
||||
$processedData = $this->postDataProcessor->processUpdate([
|
||||
...$post->toArray(),
|
||||
...$data,
|
||||
]);
|
||||
|
||||
$post->update($processedData);
|
||||
|
||||
return $post->fresh();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Sliders;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class UploadSlideImageTask
|
||||
{
|
||||
public function run(UploadedFile $file): array
|
||||
{
|
||||
$filename = Str::uuid() . '.' . $file->getClientOriginalExtension();
|
||||
$path = $file->storeAs('slides', $filename, 'public');
|
||||
|
||||
// Сохраняем только путь файла (как Filament)
|
||||
return [
|
||||
'url' => $path,
|
||||
'path' => $path,
|
||||
'name' => $file->getClientOriginalName(),
|
||||
'size' => $file->getSize(),
|
||||
'mime' => $file->getMimeType(),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Stats;
|
||||
|
||||
use App\Containers\Article\Enums\PostStatus;
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Containers\Schedule\Models\EducationalGroup;
|
||||
use App\Containers\Schedule\Models\Schedule;
|
||||
use App\Containers\Widget\Models\Slider;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class GetDashboardStatsTask
|
||||
{
|
||||
public function run(): array
|
||||
{
|
||||
$now = now();
|
||||
$weekAgo = $now->clone()->subWeek();
|
||||
|
||||
return [
|
||||
'posts' => $this->getPostsStats($weekAgo),
|
||||
'schedules' => $this->getSchedulesStats($weekAgo),
|
||||
'educational_groups' => $this->getEducationalGroupsStats($weekAgo),
|
||||
'sliders' => $this->getSlidersStats($weekAgo),
|
||||
];
|
||||
}
|
||||
|
||||
private function getPostsStats($weekAgo): array
|
||||
{
|
||||
$stats = Post::selectRaw('
|
||||
COUNT(*) as total,
|
||||
SUM(CASE WHEN created_at >= ? THEN 1 ELSE 0 END) as week,
|
||||
SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) as verification,
|
||||
SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) as published,
|
||||
SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) as rejected
|
||||
', [
|
||||
$weekAgo,
|
||||
PostStatus::VERIFICATION,
|
||||
PostStatus::PUBLISHED,
|
||||
PostStatus::REJECTED,
|
||||
])->first();
|
||||
|
||||
return [
|
||||
'total' => (int) $stats->total,
|
||||
'week' => (int) $stats->week,
|
||||
'verification' => (int) $stats->verification,
|
||||
'published' => (int) $stats->published,
|
||||
'rejected' => (int) $stats->rejected,
|
||||
];
|
||||
}
|
||||
|
||||
private function getSchedulesStats($weekAgo): array
|
||||
{
|
||||
$stats = Schedule::selectRaw('
|
||||
COUNT(*) as total,
|
||||
SUM(CASE WHEN created_at >= ? THEN 1 ELSE 0 END) as week
|
||||
', [$weekAgo])->first();
|
||||
|
||||
return [
|
||||
'total' => (int) $stats->total,
|
||||
'week' => (int) $stats->week,
|
||||
];
|
||||
}
|
||||
|
||||
private function getEducationalGroupsStats($weekAgo): array
|
||||
{
|
||||
$stats = EducationalGroup::selectRaw('
|
||||
COUNT(*) as total,
|
||||
SUM(CASE WHEN created_at >= ? THEN 1 ELSE 0 END) as week
|
||||
', [$weekAgo])->first();
|
||||
|
||||
return [
|
||||
'total' => (int) $stats->total,
|
||||
'week' => (int) $stats->week,
|
||||
];
|
||||
}
|
||||
|
||||
private function getSlidersStats($weekAgo): array
|
||||
{
|
||||
$stats = Slider::selectRaw('
|
||||
COUNT(*) as total,
|
||||
SUM(CASE WHEN created_at >= ? THEN 1 ELSE 0 END) as week
|
||||
', [$weekAgo])->first();
|
||||
|
||||
return [
|
||||
'total' => (int) $stats->total,
|
||||
'week' => (int) $stats->week,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
<?php
|
||||
|
||||
namespace App\Containers\Dashboard\Tasks\Stats;
|
||||
|
||||
use App\Containers\Article\Models\Post;
|
||||
use App\Containers\Schedule\Models\Schedule;
|
||||
use App\Containers\Widget\Models\Slider;
|
||||
|
||||
class GetRecentActivityTask
|
||||
{
|
||||
private const RECENT_POSTS_LIMIT = 5;
|
||||
private const RECENT_SCHEDULES_LIMIT = 3;
|
||||
private const RECENT_SLIDERS_LIMIT = 3;
|
||||
|
||||
public function run(): array
|
||||
{
|
||||
return [
|
||||
'recent_posts' => Post::query()
|
||||
->whereNotNull('user_id')
|
||||
->with(['category', 'author'])
|
||||
->latest()
|
||||
->limit(self::RECENT_POSTS_LIMIT)
|
||||
->get([
|
||||
'id',
|
||||
'title',
|
||||
'slug',
|
||||
'status',
|
||||
'category_id',
|
||||
'user_id',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
]),
|
||||
'recent_schedules' => Schedule::query()
|
||||
->with('educationalGroup')
|
||||
->latest()
|
||||
->limit(self::RECENT_SCHEDULES_LIMIT)
|
||||
->get([
|
||||
'id',
|
||||
'file',
|
||||
'educational_group_id',
|
||||
'created_at',
|
||||
]),
|
||||
'recent_sliders' => Slider::query()
|
||||
->withCount('slides')
|
||||
->latest()
|
||||
->limit(self::RECENT_SLIDERS_LIMIT)
|
||||
->get([
|
||||
'id',
|
||||
'title',
|
||||
'slug',
|
||||
'created_at',
|
||||
]),
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user