EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: email reminder about pending feedbacks for hotel managers

Browse Source
This commit is contained in:
Björn Fromme
2023-12-07 16:20:09 +01:00
parent aee17c63b9
commit ab066c4656
8 changed files with 292 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BusProNet/DataProvider/HotelDataProvider.php
+2 -1
View File
@@ -5,6 +5,7 @@ namespace App\BusProNet\DataProvider;
use App\BusProNet\ApiClient;
use App\BusProNet\ApiClientException;
use App\BusProNet\Model\Hotel;
use Psr\Cache\InvalidArgumentException;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
@@ -25,7 +26,7 @@ class HotelDataProvider
->getItems()
;
});
} catch (ApiClientException $e) {
} catch (ApiClientException|InvalidArgumentException $e) {
$hotels = [];
}
src/Command/CronCommand.php
+21 -150
View File
@@ -2,13 +2,9 @@
namespace App\Command;
use App\Email\Mailer;
use App\Entity\Disposition;
use App\Entity\Upload;
use Doctrine\DBAL\Exception;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query\Expr\Join;
use Psr\Log\LoggerInterface;
use App\Service\Cron\FeedbackReminderService;
use App\Service\Cron\FlushLogsService;
use App\Service\Cron\UploadReminderService;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
@@ -22,9 +18,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
class CronCommand extends Command
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly Mailer $mailer,
private readonly LoggerInterface $logger
private readonly FlushLogsService $flushLogsService,
private readonly UploadReminderService $uploadReminderService,
private readonly FeedbackReminderService $feedbackReminderService
) {
parent::__construct();
}
@@ -33,147 +29,22 @@ class CronCommand extends Command
{
$io = new SymfonyStyle($input, $output);
$this->flushLogs($io);
$this->sendContractUploadReminders($io);
$this->sendInvoiceUploadReminders($io);
[$success, $message] = $this->flushLogsService->flush();
if (true === $success) {
$io->success($message);
} else {
$io->error($message);
}
$message = $this->uploadReminderService->sendContractUploadReminders();
$io->info($message);
$message = $this->uploadReminderService->sendInvoiceUploadReminders();
$io->info($message);
$message = $this->feedbackReminderService->sendFeedbackReminders();
$io->info($message);
return Command::SUCCESS;
}
private function flushLogs(SymfonyStyle $io): void
{
// Deletes all log entries older than 30 days
$dueDate = (new \DateTimeImmutable())->modify('-30 days');
try {
$result = $this
->entityManager
->getConnection()
->executeQuery('DELETE FROM log WHERE log.timestamp < ?', [$dueDate->format('Y-m-d H:i:s')]);
$message = 'Deleted '.$result->rowCount().' log entries';
$io->info($message);
$this->logger->info($message);
} catch (Exception $e) {
$message = 'Unable to delete log entries: '.$e->getMessage();
$io->error($message);
$this->logger->error($message);
}
}
private function sendContractUploadReminders(SymfonyStyle $io): void
{
// Find dispositions of assignments with due contract upload
$repository = $this->entityManager->getRepository(Disposition::class);
// Contracts have to be uploaded before assignment's begin date. Reminder is
// sent three days before end of this period thus due date is today in three days.
$contractDueDate = (new \DateTimeImmutable())->modify('+3 days');
$qb = $repository->createQueryBuilder('disposition');
$dispositions = $qb
->select('disposition', 'assignment', 'destination')
->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->leftJoin('disposition.documents', 'document', Join::WITH, 'document.type = :documentType')
->where($qb->expr()->andX(
$qb->expr()->isNull('document'),
$qb->expr()->orX(
// Due date can be determined by assignment's date which potentially overrides destination date
$qb->expr()->andX(
$qb->expr()->isNotNull('assignment.dateFrom'),
$qb->expr()->eq('assignment.dateFrom', ':dateFrom')
),
$qb->expr()->eq('destination.dateFrom', ':dateFrom'),
)
))
->setParameters([
'documentType' => Upload::TYPE_CONTRACT,
'dateFrom' => $contractDueDate,
])
->getQuery()
->getResult()
;
if (0 === $count = count($dispositions)) {
$message = 'No reminders regarding due contract uploads to be sent';
$io->info($message);
$this->logger->info($message);
return;
}
foreach ($dispositions as $disposition) {
$teamer = $disposition->getTeamer();
$this->mailer->createAndSendEmail([
'disposition' => $disposition,
], [
'to' => $teamer->getCommunication()->getEmail(),
'subject' => 'Reminder: Fehlende Dokumente',
'template' => 'email/reminder_contract_upload.html.twig',
]);
}
$message = 'Sent '.$count.' reminders about due contract uploads';
$io->info($message);
$this->logger->info($message);
}
private function sendInvoiceUploadReminders(SymfonyStyle $io): void
{
// Find dispositions of assignments with due invoice upload
$repository = $this->entityManager->getRepository(Disposition::class);
// Invoices have to be uploaded until 14 days after end of assignment. Reminder
// is sent three days before end of this period thus on the 11th day after end of assignment.
$invoiceDueDate = (new \DateTimeImmutable())->modify('-11 days');
$qb = $repository->createQueryBuilder('disposition');
$dispositions = $qb
->select('disposition', 'assignment', 'destination')
->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->leftJoin('disposition.documents', 'document', Join::WITH, 'document.type = :documentType')
->where($qb->expr()->andX(
$qb->expr()->isNull('document'),
$qb->expr()->orX(
// Due date can be determined by assignment's date which potentially overrides destination date
$qb->expr()->andX(
$qb->expr()->isNotNull('assignment.dateTo'),
$qb->expr()->eq('assignment.dateTo', ':dateTo')
),
$qb->expr()->eq('destination.dateTo', ':dateTo'),
)
))
->setParameters([
'documentType' => Upload::TYPE_INVOICE,
'dateTo' => $invoiceDueDate,
])
->getQuery()
->getResult()
;
if (0 === $count = count($dispositions)) {
$message = 'No reminders regarding due invoice uploads to be sent';
$io->info($message);
$this->logger->info($message);
return;
}
foreach ($dispositions as $disposition) {
$teamer = $disposition->getTeamer();
$this->mailer->createAndSendEmail([
'disposition' => $disposition,
], [
'to' => $teamer->getCommunication()->getEmail(),
'subject' => 'Reminder: Fehlende Dokumente',
'template' => 'email/reminder_invoice_upload.html.twig',
]);
}
$message = 'Sent '.$count.' reminders about due invoice uploads';
$io->info($message);
$this->logger->info($message);
}
}
src/Repository/DispositionRepository.php
+8
View File
@@ -157,6 +157,14 @@ class DispositionRepository extends ServiceEntityRepository
return $qb->getQuery();
}
public function getPendingFeedbacks(): array
{
return $this
->getPendingFeedbackQuery()
->getResult()
;
}
public function getPendingFeedbackByHotelBusProIds(array $hotelBusProIds): array
{
return $this
src/Service/Cron/FeedbackReminderService.php
+72
View File
@@ -0,0 +1,72 @@
<?php
namespace App\Service\Cron;
use App\BusProNet\DataProvider\HotelDataProvider;
use App\Email\Mailer;
use App\Entity\Feedback;
use App\Entity\User;
use App\Repository\DispositionRepository;
use App\Repository\UserRepository;
use Psr\Log\LoggerInterface;
class FeedbackReminderService
{
public function __construct(
private readonly DispositionRepository $dispositionRepository,
private readonly HotelDataProvider $hotelDataProvider,
private readonly UserRepository $userRepository,
private readonly Mailer $mailer,
private readonly LoggerInterface $logger
) {
}
public function sendFeedbackReminders(): string
{
/** @var Feedback[] $pendingFeedbacks */
$pendingFeedbacks = $this->dispositionRepository->getPendingFeedbacks();
$sortedFeedbacks = [];
foreach ($pendingFeedbacks as $feedback) {
// Get hotel by bus pro id
$hotelBusProId = $feedback->getDestination()->getHotelBusProId();
$hotel = $this->hotelDataProvider->get($hotelBusProId);
if (null === $hotel) {
$this->logger->error('Could not find hotel by bus pro id '.$hotelBusProId);
continue;
}
// Get hotel base code to find hotel manager later
$hotelBaseCode = substr($hotel->getCode(), 0, 3);
if (false === array_key_exists($hotelBaseCode, $sortedFeedbacks)) {
$sortedFeedbacks[$hotelBaseCode] = [];
}
// Sort feedback by hotel base code
$sortedFeedbacks[$hotelBaseCode][] = $feedback;
}
// Determine hotel managers to notify
$hotelBaseCodes = array_keys($sortedFeedbacks);
/** @var User[] $hotelManagers */
$hotelManagers = $this->userRepository->findBy([
'hotelCode' => $hotelBaseCodes,
]);
foreach ($hotelManagers as $manager) {
$this->mailer->createAndSendEmail([
'feedbacks' => $sortedFeedbacks[$manager->getHotelCode()],
], [
'to' => $manager->getEmail(),
'subject' => 'Reminder: Offene Feedbacks',
'template' => 'email/reminder_pending_feedback.html.twig',
]);
}
return 'Sent feedback reminders to '.count($hotelManagers).' hotel managers';
}
}
src/Service/Cron/FlushLogsService.php
+39
View File
@@ -0,0 +1,39 @@
<?php
namespace App\Service\Cron;
use Doctrine\DBAL\Exception;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
class FlushLogsService
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly LoggerInterface $logger
) {
}
public function flush(): array
{
// Deletes all log entries older than 30 days
$dueDate = (new \DateTimeImmutable())->modify('-30 days');
try {
$result = $this
->entityManager
->getConnection()
->executeQuery('DELETE FROM log WHERE log.timestamp < ?', [$dueDate->format('Y-m-d H:i:s')]);
$message = 'Deleted '.$result->rowCount().' log entries';
$success = true;
$this->logger->info($message);
} catch (Exception $e) {
$message = 'Unable to delete log entries: '.$e->getMessage();
$success = false;
$this->logger->error($message);
}
return [$success, $message];
}
}
src/Service/Cron/UploadReminderService.php
+137
View File
@@ -0,0 +1,137 @@
<?php
namespace App\Service\Cron;
use App\Email\Mailer;
use App\Entity\Disposition;
use App\Entity\Upload;
use App\Repository\DispositionRepository;
use Doctrine\ORM\Query\Expr\Join;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
class UploadReminderService
{
public function __construct(
private readonly DispositionRepository $dispositionRepository,
private readonly Mailer $mailer,
private readonly LoggerInterface $logger
) {
}
public function sendContractUploadReminders(): string
{
// Contracts have to be uploaded before assignment's begin date. Reminder is
// sent three days before end of this period thus due date is today in three days.
$contractDueDate = (new \DateTimeImmutable())->modify('+3 days');
// Find dispositions of assignments with due contract upload
$qb = $this->dispositionRepository->createQueryBuilder('disposition');
$dispositions = $qb
->select('disposition', 'assignment', 'destination')
->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->leftJoin('disposition.documents', 'document', Join::WITH, 'document.type = :documentType')
->where($qb->expr()->andX(
$qb->expr()->isNull('document'),
$qb->expr()->orX(
// Due date can be determined by assignment's date which potentially overrides destination date
$qb->expr()->andX(
$qb->expr()->isNotNull('assignment.dateFrom'),
$qb->expr()->eq('assignment.dateFrom', ':dateFrom')
),
$qb->expr()->eq('destination.dateFrom', ':dateFrom'),
)
))
->setParameters([
'documentType' => Upload::TYPE_CONTRACT,
'dateFrom' => $contractDueDate,
])
->getQuery()
->getResult()
;
if (0 === $count = count($dispositions)) {
$message = 'No reminders regarding due contract uploads to be sent';
$this->logger->info($message);
return $message;
}
foreach ($dispositions as $disposition) {
$teamer = $disposition->getTeamer();
$this->mailer->createAndSendEmail([
'disposition' => $disposition,
], [
'to' => $teamer->getCommunication()->getEmail(),
'subject' => 'Reminder: Fehlende Dokumente',
'template' => 'email/reminder_contract_upload.html.twig',
]);
}
$message = 'Sent '.$count.' reminders about due contract uploads';
$this->logger->info($message);
return $message;
}
public function sendInvoiceUploadReminders(): string
{
// Invoices have to be uploaded until 14 days after end of assignment. Reminder
// is sent three days before end of this period thus on the 11th day after end of assignment.
$invoiceDueDate = (new \DateTimeImmutable())->modify('-11 days');
// Find dispositions of assignments with due invoice upload
$qb = $this->dispositionRepository->createQueryBuilder('disposition');
$dispositions = $qb
->select('disposition', 'assignment', 'destination')
->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination')
->leftJoin('disposition.documents', 'document', Join::WITH, 'document.type = :documentType')
->where($qb->expr()->andX(
$qb->expr()->isNull('document'),
$qb->expr()->orX(
// Due date can be determined by assignment's date which potentially overrides destination date
$qb->expr()->andX(
$qb->expr()->isNotNull('assignment.dateTo'),
$qb->expr()->eq('assignment.dateTo', ':dateTo')
),
$qb->expr()->eq('destination.dateTo', ':dateTo'),
)
))
->setParameters([
'documentType' => Upload::TYPE_INVOICE,
'dateTo' => $invoiceDueDate,
])
->getQuery()
->getResult()
;
if (0 === $count = count($dispositions)) {
$message = 'No reminders regarding due invoice uploads to be sent';
$this->logger->info($message);
return $message;
}
foreach ($dispositions as $disposition) {
$teamer = $disposition->getTeamer();
$this->mailer->createAndSendEmail([
'disposition' => $disposition,
], [
'to' => $teamer->getCommunication()->getEmail(),
'subject' => 'Reminder: Fehlende Dokumente',
'template' => 'email/reminder_invoice_upload.html.twig',
]);
}
$message = 'Sent '.$count.' reminders about due invoice uploads';
$this->logger->info($message);
return $message;
}
}
templates/email/reminder_pending_feedback.html.twig
+12
View File
@@ -0,0 +1,12 @@
{% extends 'email/layout.html.twig' %}
{% block body %}
<h1>
Reminder zu ausstehenden Feedbacks
</h1>
<p>
<a href="{{ url('app_teamer_index') }}" class="button">
Zum Portal
</a>
</p>
{% endblock %}
templates/house_manager/index.html.twig
+1 -1
View File
@@ -35,7 +35,7 @@
</div>
<div class="bg-gray-100 border border-gray-200 rounded-md px-4 py-2">
<h2 class="font-bold text-lg pb-2">
Offene Feedbacks
Ausstehende Feedbacks
</h2>
<ul class="divide-y divide-gray-200">
{% for disposition in pendingFeedbacks %}