Skip to content

fix: Fix autorelease with a high number of untreated messages #380

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
marien-probesys merged 1 commit into from
Dec 19, 2025
Merged

fix: Fix autorelease with a high number of untreated messages #380

Show file tree
Hide file tree
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
32 changes: 12 additions & 20 deletions app/src/Command/AmavisAutoReleaseCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
)]
class AmavisAutoReleaseCommand extends Command
{
private int $batchSize = 1000;
private int $batchSize = 500;

public function __construct(
private MsgrcptSearchRepository $msgrcptSearchRepository,
Expand All @@ -43,28 +43,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
return Command::FAILURE;
}

$searchQuery = $this->msgrcptSearchRepository->getSearchQuery(
null,
MessageStatus::UNTREATED
);
$users = $this->userRepository->findAllWithoutHumanAuthentication();

$messageRecipients = $searchQuery->setMaxResults($this->batchSize)->getResult();
foreach ($users as $user) {
$searchQuery = $this->msgrcptSearchRepository->getSearchQuery(
$user,
MessageStatus::UNTREATED
);

foreach ($messageRecipients as $messageRecipient) {
if ($messageRecipient->isAmavisReleaseOngoing()) {
continue;
}

$user = $this->userRepository->findOneBy([
'email' => $messageRecipient->getRid()->getEmailClear()
]);

if (!$user) {
continue;
}
$messageRecipients = $searchQuery->setMaxResults($this->batchSize)->getResult();

if ($user->getBypassHumanAuth()) {
$this->messageService->dispatchRelease($messageRecipient);
foreach ($messageRecipients as $messageRecipient) {
if (!$messageRecipient->isAmavisReleaseOngoing()) {
$this->messageService->dispatchRelease($messageRecipient);
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions app/src/Repository/UserRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ public function findOneByPrincipalName(string $principalName): ?User
->getOneOrNullResult();
}

/**
* @return User[]
*/
public function findAllWithoutHumanAuthentication(): array
{
return $this->findBy([
'bypassHumanAuth' => true,
]);
}

/**
* Return all users from active domains
*
Expand Down