Skip to content

[stable30] fix(Cleanup): Cleanup attachments in cron job #7270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 1 commit into from
May 27, 2025
Merged

[stable30] fix(Cleanup): Cleanup attachments in cron job #7270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions lib/Cron/Cleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,22 @@
namespace OCA\Text\Cron;

use OCA\Text\Exception\DocumentHasUnsavedChangesException;
use OCA\Text\Service\AttachmentService;
use OCA\Text\Service\DocumentService;
use OCA\Text\Service\SessionService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use Psr\Log\LoggerInterface;

class Cleanup extends TimedJob {
private SessionService $sessionService;
private DocumentService $documentService;
private LoggerInterface $logger;

public function __construct(ITimeFactory $time,
SessionService $sessionService,
DocumentService $documentService,
LoggerInterface $logger) {
public function __construct(
ITimeFactory $time,
private readonly SessionService $sessionService,
private readonly DocumentService $documentService,
private readonly AttachmentService $attachmentService,
private readonly LoggerInterface $logger,
) {
parent::__construct($time);
$this->sessionService = $sessionService;
$this->documentService = $documentService;
$this->logger = $logger;
$this->setInterval(SessionService::SESSION_VALID_TIME);
}

Expand All @@ -50,10 +47,11 @@ protected function run($argument): void {
$this->documentService->resetDocument($document->getId());
} catch (DocumentHasUnsavedChangesException) {
}
$this->attachmentService->cleanupAttachments($document->getId());
}

$this->logger->debug('Run cleanup job for text sessions');
$removedSessions = $this->sessionService->removeInactiveSessionsWithoutSteps(null);
$removedSessions = $this->sessionService->removeInactiveSessionsWithoutSteps();
$this->logger->debug('Removed ' . $removedSessions . ' inactive sessions');

$this->logger->debug('Run cleanup job for obsolete documents folders');
Expand Down
Loading