Skip to content
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.

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

[Emails] Nouveau mail de demande d'ajout de documents #3291

Merged
merged 9 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ FEATURE_ZONAGE=0
FEATURE_GRILLE_VISITE=0
FEATURE_PERMISSION_AFFECTATION=0
FEATURE_ENABLE_MENU_HORIZONTALE=0
FEATURE_CHECK_NEW_SIGNALEMENT_FILES=0
DELAY_MIN_CHECK_NEW_SIGNALEMENT_FILES=30 #minutes
### histologe ###

### object storage S3 ###
Expand Down
2 changes: 2 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ FEATURE_SCHS_SYNC_EVENT_ENABLE=0
FEATURE_ZONAGE=1
FEATURE_GRILLE_VISITE=0
FEATURE_PERMISSION_AFFECTATION=0
FEATURE_CHECK_NEW_SIGNALEMENT_FILES=0
DELAY_MIN_CHECK_NEW_SIGNALEMENT_FILES=30 #minutes
###> knplabs/knp-snappy-bundle ###
WKHTMLTOPDF_PATH=wkhtmltopdf
WKHTMLTOIMAGE_PATH=wkhtmltoimage
Expand Down
1 change: 1 addition & 0 deletions config/packages/messenger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ framework:
App\Messenger\Message\Esabora\DossierMessageSISH: async
App\Messenger\Message\Oilhi\DossierMessage: async
App\Messenger\Message\Idoss\DossierMessage: async
App\Messenger\Message\NewSignalementCheckFileMessage: async_priority_high
App\Messenger\Message\ListExportMessage: async_priority_high
App\Messenger\Message\UserExportMessage: async_priority_high
App\Messenger\Message\PdfExportMessage: async_priority_high
Expand Down
2 changes: 2 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ parameters:
feature_grille_visite: '%env(bool:FEATURE_GRILLE_VISITE)%'
feature_permission_affectation: '%env(bool:FEATURE_PERMISSION_AFFECTATION)%'
feature_enable_menu_horizontale: '%env(bool:FEATURE_ENABLE_MENU_HORIZONTALE)%'
feature_check_new_signalement_files: '%env(bool:FEATURE_CHECK_NEW_SIGNALEMENT_FILES)%'
delay_min_check_new_signalement_files: '%env(DELAY_MIN_CHECK_NEW_SIGNALEMENT_FILES)%'

services:
# default configuration for services in *this* file
Expand Down
5 changes: 4 additions & 1 deletion src/Controller/Back/SignalementActionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
Expand All @@ -32,6 +33,8 @@ public function validationResponseSignalement(
Request $request,
ManagerRegistry $doctrine,
NotificationMailerRegistry $notificationMailerRegistry,
#[Autowire(env: 'FEATURE_CHECK_NEW_SIGNALEMENT_FILES')]
bool $isEnabledFeatureCheckNewSignalementFiles,
): Response {
$this->denyAccessUnlessGranted('SIGN_VALIDATE', $signalement);
if ($this->isCsrfTokenValid('signalement_validation_response_'.$signalement->getId(), $request->get('_token'))
Expand All @@ -45,7 +48,7 @@ public function validationResponseSignalement(
foreach ($toRecipients as $toRecipient) {
$notificationMailerRegistry->send(
new NotificationMail(
type: $signalement->hasNDE() ?
type: $signalement->hasNDE() && !$isEnabledFeatureCheckNewSignalementFiles ?
NotificationMailerType::TYPE_SIGNALEMENT_ASK_BAIL_DPE_TO_USAGER :
NotificationMailerType::TYPE_SIGNALEMENT_VALIDATION_TO_USAGER,
to: $toRecipient,
Expand Down
22 changes: 21 additions & 1 deletion src/EventSubscriber/SignalementDraftCompletedSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use App\Entity\SignalementDraft;
use App\Event\SignalementDraftCompletedEvent;
use App\Manager\SignalementManager;
use App\Messenger\Message\NewSignalementCheckFileMessage;
use App\Messenger\Message\SignalementDraftFileMessage;
use App\Service\Files\DocumentProvider;
use App\Service\Mailer\NotificationMail;
Expand All @@ -15,8 +16,10 @@
use App\Service\Signalement\SignalementBuilder;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Messenger\Stamp\DelayStamp;

class SignalementDraftCompletedSubscriber implements EventSubscriberInterface
{
Expand All @@ -29,6 +32,7 @@ public function __construct(
private readonly MessageBusInterface $messageBus,
private readonly EntityManagerInterface $entityManager,
private readonly LoggerInterface $logger,
private readonly ParameterBagInterface $parameterBag,
) {
}

Expand Down Expand Up @@ -57,15 +61,16 @@ public function onSignalementDraftCompleted(SignalementDraftCompletedEvent $even

if (null !== $signalement) {
$this->signalementManager->save($signalement);
$this->entityManager->commit();
$this->logger->info(sprintf(
'Signalement saved with reference #%s in territory %s',
$signalement->getReference(),
$signalement->getTerritory()->getName()
));
$this->sendNotifications($signalement);
$this->processFiles($signalementDraft, $signalement);
$this->dispatchCheckFiles($signalement);
$this->autoAssigner->assign($signalement);
$this->entityManager->commit();
} else {
$this->entityManager->rollback();
}
Expand Down Expand Up @@ -99,4 +104,19 @@ private function processFiles(SignalementDraft $signalementDraft, Signalement $s
$signalement->getId()
));
}

private function dispatchCheckFiles(Signalement $signalement): void
{
if (!$this->parameterBag->get('feature_check_new_signalement_files')) {
return;
}

$delayInMs = $this->parameterBag->get('delay_min_check_new_signalement_files') * 60000;
$this->messageBus->dispatch(
new NewSignalementCheckFileMessage($signalement->getId()),
[
new DelayStamp($delayInMs),
]
);
}
}
15 changes: 15 additions & 0 deletions src/Messenger/Message/NewSignalementCheckFileMessage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace App\Messenger\Message;

class NewSignalementCheckFileMessage
{
public function __construct(private ?int $signalementId)
{
}

public function getSignalementId(): ?int
{
return $this->signalementId;
}
}
214 changes: 214 additions & 0 deletions src/Messenger/MessageHandler/NewSignalementCheckFileMessageHandler.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<?php

namespace App\Messenger\MessageHandler;

use App\Entity\Enum\DocumentType;
use App\Entity\Signalement;
use App\Entity\Suivi;
use App\Manager\SuiviManager;
use App\Messenger\Message\NewSignalementCheckFileMessage;
use App\Repository\DesordreCritereRepository;
use App\Repository\SignalementRepository;
use App\Repository\UserRepository;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;

#[AsMessageHandler]
class NewSignalementCheckFileMessageHandler
{
private const array DESORDRES_CATEGORIES_WITH_PHOTOS = [
'desordres_batiment_proprete',
'desordres_batiment_nuisibles',
'desordres_batiment_isolation',
'desordres_batiment_maintenance',
'desordres_batiment_securite',
'desordres_logement_humidite',
'desordres_logement_nuisibles',
'desordres_logement_securite',
];

private const array DESORDRES_CRITERES_WITH_PHOTOS = [
'desordres_logement_chauffage_details_chauffage_dangereux',
'desordres_logement_electricite_installation_dangereuse',
];

public ?Suivi $suivi;
public ?string $description;

public function __construct(
private SignalementRepository $signalementRepository,
private UserRepository $userRepository,
private DesordreCritereRepository $desordreCritereRepository,
private LoggerInterface $logger,
private SuiviManager $suiviManager,
private ParameterBagInterface $parameterBag,
protected Security $security,
) {
}

public function __invoke(NewSignalementCheckFileMessage $newSignalementCheckFileMessage): void
{
$this->logger->info('Start handling NewSignalementCheckFileMessage', [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c’était pour test ou tu veux garder ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c'était le cas sur un autre message, j'ai juste copié en me disant que ça permettrait de débug au début. Rien d'obligatoire.

'signalementId' => $newSignalementCheckFileMessage->getSignalementId(),
]);

$signalement = $this->signalementRepository->find(
$newSignalementCheckFileMessage->getSignalementId()
);

$documents = $this->getMissingDocumentsString($signalement);

$desordres = $this->getMissingDesordresPhotosString($signalement);

$this->suivi = null;
if (!empty($documents) || !empty($desordres)) {
$this->suivi = $this->createSuivi($signalement, $documents, $desordres);
}

$this->logger->info('NewSignalementCheckFileMessage handled successfully', [
'signalementId' => $newSignalementCheckFileMessage->getSignalementId(),
'suiviId' => $this->suivi ? $this->suivi->getId() : null,
]);
}

public function getMissingDocumentsString(Signalement $signalement): string
{
$documents = '';
if ($signalement->getTypeCompositionLogement()) {
if ('oui' === $signalement->getTypeCompositionLogement()->getBailDpeBail()
&& !$this->hasDocumentType($signalement, DocumentType::SITUATION_FOYER_BAIL)) {
$documents = 'le bail du logement';
}
if ('oui' === $signalement->getTypeCompositionLogement()->getBailDpeEtatDesLieux()
&& !$this->hasDocumentType($signalement, DocumentType::SITUATION_FOYER_ETAT_DES_LIEUX)) {
if (!empty($documents)) {
$documents .= ', ';
}
$documents .= 'l\'état des lieux réalisé à l\'entrée dans le logement';
}
if ('oui' === $signalement->getTypeCompositionLogement()->getBailDpeDpe()
&& !$this->hasDocumentType($signalement, DocumentType::SITUATION_FOYER_DPE)) {
if (!empty($documents)) {
$documents .= ', ';
}
$documents .= 'le diagnostic de performance énergétique du logement (DPE)';
}
}

return $documents;
}

public function getMissingDesordresPhotosString(Signalement $signalement): string
{
$desordres = '';
$signalementDesordreCategorieSlugs = $signalement->getDesordreCategorieSlugs();
foreach (self::DESORDRES_CATEGORIES_WITH_PHOTOS as $desordreCategorieSlug) {
if (!in_array($desordreCategorieSlug, $signalementDesordreCategorieSlugs)) {
continue;
}
$categorieLabel = $this->getCategorieLabelFromCategorieSlug($desordreCategorieSlug);
if ($categorieLabel && !$this->hasPhotoForCritere($signalement, $desordreCategorieSlug)) {
if (!empty($desordres)) {
$desordres .= ' / ';
}
$desordres .= $categorieLabel;
}
}

$signalementDesordrePrecisionSlugs = $signalement->getDesordrePrecisionSlugs();
foreach (self::DESORDRES_CRITERES_WITH_PHOTOS as $desordrePrecisionSlug) {
if (!in_array($desordrePrecisionSlug, $signalementDesordrePrecisionSlugs)) {
continue;
}
$categorieLabel = $this->getCategorieLabelFromCritereSlug($desordrePrecisionSlug);
if ($categorieLabel && !$this->hasPhotoForCritere($signalement, $desordrePrecisionSlug)) {
if (!empty($desordres)) {
$desordres .= ' / ';
}
$desordres .= $categorieLabel;
}
}

return $desordres;
}

private function hasDocumentType(Signalement $signalement, DocumentType $documentType): bool
{
foreach ($signalement->getFiles() as $file) {
if ($file->getDocumentType() === $documentType) {
return true;
}
}

return false;
}

private function getCategorieLabelFromCategorieSlug(string $desordreCategorieSlug): ?string
{
$desordresCritere = $this->desordreCritereRepository->findBy(
['slugCategorie' => $desordreCategorieSlug]
);
$desordreCritere = $desordresCritere[0];
if ($desordreCritere) {
return $desordreCritere->getLabelCategorie();
}

return null;
}

private function getCategorieLabelFromCritereSlug(string $desordreCritereSlug): ?string
{
$desordreCritere = $this->desordreCritereRepository->findOneBy(
['slugCritere' => $desordreCritereSlug]
);
if ($desordreCritere) {
return $desordreCritere->getLabelCategorie();
}

return null;
}

private function hasPhotoForCritere(Signalement $signalement, string $desordreSlug): bool
{
foreach ($signalement->getFiles() as $file) {
if ($file->getDesordreSlug() === $desordreSlug) {
return true;
}
}

return false;
}

private function createSuivi(Signalement $signalement, string $documents, string $desordres): Suivi
{
$this->description = 'Bonjour,<br><br>';
$this->description .= 'Vous avez un signalé un problème sur un logement.<br>';
$this->description .= 'Votre dossier a bien été enregistré par nos services.<br><br>';
$this->description .= 'Afin de nous aider à traiter au mieux votre dossier, veuillez nous fournir :<br>';
if (!empty($documents)) {
$this->description .= '- le ou les documents suivants : '.$documents.'<br>';
}
if (!empty($desordres)) {
$this->description .= '- des photos pour les désordres suivants : '.$desordres.'<br>';
}
$this->description .= '<br>';
$this->description .= 'Envoyez-nous un message en y ajoutant vos documents !<br>';
$this->description .= 'Merci,<br>';
$this->description .= 'L\'équipe Histologe';

$userAdmin = $this->userRepository->findOneBy(['email' => $this->parameterBag->get('user_system_email')]);

return $this->suiviManager->createSuivi(
user: $userAdmin,
signalement: $signalement,
params: [
'type' => Suivi::TYPE_AUTO,
'description' => $this->description,
],
isPublic: true,
flush: true
);
}
}
Loading
Loading