mirror of
https://gh.wpcy.net/https://github.com/hayBIT/freescout2ant.git
synced 2026-07-15 12:13:04 +08:00
fc5a3d949a
The core bug was in CrmApiClient::archiveConversation() which returned a truthy error array on token failures, causing archiveConversationData() to mark threads as archived even though the CRM API was never called. Changes: - Return false (not error array) from archiveConversation() on token error - Add `last_error` column to crm_archive_threads to track failed archivals - Record failures in CrmArchiveThread so the cron can retry them - Update ArchiveThreads command to retry failed entries and skip disconnected users (no token file) - Wrap ArchiveThreadsJob in try-catch to track unexpected exceptions - Use CrmArchive as source for conversation IDs (more reliable) https://claude.ai/code/session_01Bvg33MSPkDhxo1LJ6kQBxu
58 lines
2.1 KiB
PHP
58 lines
2.1 KiB
PHP
<?php
|
|
namespace Modules\AmeiseModule\Jobs;
|
|
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Modules\AmeiseModule\Entities\CrmArchive;
|
|
use Modules\AmeiseModule\Entities\CrmArchiveThread;
|
|
|
|
class ArchiveThreadsJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
protected $thread;
|
|
protected $conversation;
|
|
protected $user;
|
|
public $timeout = 120;
|
|
/**
|
|
* Create a new job instance.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function __construct($conversation, $thread, $user)
|
|
{
|
|
$this->conversation = $conversation;
|
|
$this->thread = $thread;
|
|
$this->user = $user;
|
|
}
|
|
|
|
/**
|
|
* Execute the job.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function handle()
|
|
{
|
|
config('ameisemodule.ameise_log_status') && \Helper::log('Ameise Cron Log', 'Job Dispatched For Thread ID: '.$this->thread->id.' Conversation ID: '.$this->conversation->id.' User ID: '.$this->user->id);
|
|
|
|
try {
|
|
$tokenService = new \Modules\AmeiseModule\Services\TokenService('', $this->user->id);
|
|
$apiClient = new \Modules\AmeiseModule\Services\CrmApiClient($tokenService);
|
|
$archiver = new \Modules\AmeiseModule\Services\ConversationArchiver($apiClient);
|
|
$archiver->archiveConversationData($this->conversation, $this->thread, $this->user);
|
|
} catch (\Exception $e) {
|
|
\Helper::log('Ameise Cron Log', 'Job failed for Thread ID: '.$this->thread->id.' User ID: '.$this->user->id.': '.$e->getMessage());
|
|
|
|
$archives = CrmArchive::where('conversation_id', $this->conversation->id)->get();
|
|
foreach ($archives as $archive) {
|
|
CrmArchiveThread::updateOrCreate(
|
|
['crm_archive_id' => $archive->id, 'thread_id' => $this->thread->id],
|
|
['conversation_id' => $this->conversation->id, 'last_error' => $e->getMessage()]
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
