From e972beee112bea4ae56453a669064744450d4952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 25 Dec 2021 20:47:54 +0100 Subject: [PATCH 01/71] fix controller loading and add UserMenu entry --- .../Controller/NotificationController.php | 34 ++++++++++++------- .../ChillMainBundle/Entity/Notification.php | 4 +-- .../Routing/MenuBuilder/UserMenuBuilder.php | 17 +++++++++- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index 4eed79740..8ce15e6a4 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -15,6 +15,7 @@ use Chill\MainBundle\Notification\NotificationRenderer; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\NotificationRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Security; @@ -23,27 +24,34 @@ use Symfony\Component\Security\Core\Security; */ class NotificationController extends AbstractController { - private $security; + private Security $security; + private NotificationRepository $notificationRepository; + private NotificationRenderer $notificationRenderer; + private PaginatorFactory $paginatorFactory; - public function __construct(Security $security) - { + public function __construct( + Security $security, + NotificationRepository $notificationRepository, + NotificationRenderer $notificationRenderer, + PaginatorFactory $paginatorFactory + ) { $this->security = $security; + $this->notificationRepository = $notificationRepository; + $this->notificationRenderer = $notificationRenderer; + $this->paginatorFactory = $paginatorFactory; } /** * @Route("/show", name="chill_main_notification_show") */ - public function showAction( - NotificationRepository $notificationRepository, - NotificationRenderer $notificationRenderer, - PaginatorFactory $paginatorFactory - ) { + public function showAction(): Response + { $currentUser = $this->security->getUser(); - $notificationsNbr = $notificationRepository->countAllForAttendee(($currentUser)); - $paginator = $paginatorFactory->create($notificationsNbr); + $notificationsNbr = $this->notificationRepository->countAllForAttendee(($currentUser)); + $paginator = $this->paginatorFactory->create($notificationsNbr); - $notifications = $notificationRepository->findAllForAttendee( + $notifications = $this->notificationRepository->findAllForAttendee( $currentUser, $limit = $paginator->getItemsPerPage(), $offset = $paginator->getCurrentPage()->getFirstItemNumber() @@ -53,8 +61,8 @@ class NotificationController extends AbstractController foreach ($notifications as $notification) { $data = [ - 'template' => $notificationRenderer->getTemplate($notification), - 'template_data' => $notificationRenderer->getTemplateData($notification), + 'template' => $this->notificationRenderer->getTemplate($notification), + 'template_data' => $this->notificationRenderer->getTemplateData($notification), 'notification' => $notification, ]; $templateData[] = $data; diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index cba4f33e5..bfcdf1ee6 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -48,7 +48,7 @@ class Notification /** * @ORM\Column(type="text") */ - private string $message; + private string $message = ''; /** * @ORM\Column(type="json") @@ -58,7 +58,7 @@ class Notification /** * @ORM\Column(type="string", length=255) */ - private string $relatedEntityClass; + private string $relatedEntityClass = ''; /** * @ORM\Column(type="integer") diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php index 51758d979..495b2ca8b 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php @@ -14,14 +14,18 @@ namespace Chill\MainBundle\Routing\MenuBuilder; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Symfony\Component\Security\Core\Security; +use Symfony\Contracts\Translation\TranslatorInterface; class UserMenuBuilder implements LocalMenuBuilderInterface { private Security $security; - public function __construct(Security $security) + private TranslatorInterface $translator; + + public function __construct(Security $security, TranslatorInterface $translator) { $this->security = $security; + $this->translator = $translator; } public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters) @@ -44,6 +48,17 @@ class UserMenuBuilder implements LocalMenuBuilderInterface 'order' => -9999999, 'icon' => 'map-marker', ]); + + $menu + ->addChild( + $this->translator->trans('My notifications'), + ['route' => 'chill_main_notification_show'] + ) + ->setExtras([ + 'order' => 600, + 'icon' => 'envelope' + ]); + $menu ->addChild( 'Change password', From d62893827bd934f1c126b419d8eaaba088c2da5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 25 Dec 2021 22:16:34 +0100 Subject: [PATCH 02/71] create a notification controller --- ...{NotificationRenderer.php => NotificationHandlerManager.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/Bundle/ChillMainBundle/Notification/{NotificationRenderer.php => NotificationHandlerManager.php} (97%) diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php similarity index 97% rename from src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php rename to src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php index 048dfc02f..950a3f09e 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php @@ -16,7 +16,7 @@ use Chill\MainBundle\Entity\Notification; use Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer; use Exception; -final class NotificationRenderer +final class NotificationHandlerManager { private array $renderers; From 11824adda45dbf2bffba618c2cf7fbde0c684fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 25 Dec 2021 22:41:25 +0100 Subject: [PATCH 03/71] notification: create --- .../ActivityNotificationRenderer.php | 3 +- .../Controller/NotificationController.php | 97 +++++++++++++++++-- .../ChillMainBundle/Entity/Notification.php | 3 +- .../ChillMainBundle/Form/NotificationType.php | 41 ++++++++ .../Exception/NotificationHandlerNotFound.php | 18 ++++ .../NotificationHandlerInterface.php | 16 +++ .../NotificationHandlerManager.php | 26 ++--- .../views/Notification/create.html.twig | 25 +++++ ...AccompanyingPeriodNotificationRenderer.php | 3 +- .../views/AccompanyingCourse/index.html.twig | 4 + 10 files changed, 210 insertions(+), 26 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Form/NotificationType.php create mode 100644 src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php create mode 100644 src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php index f7f19e3f1..2d3d333d9 100644 --- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php +++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php @@ -13,8 +13,9 @@ namespace Chill\ActivityBundle\Notification; use Chill\ActivityBundle\Entity\Activity; use Chill\MainBundle\Entity\Notification; +use Chill\MainBundle\Notification\NotificationHandlerInterface; -final class ActivityNotificationRenderer +final class ActivityNotificationRenderer implements NotificationHandlerInterface { public function getTemplate() { diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index 8ce15e6a4..19d5142ca 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -11,41 +11,118 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; -use Chill\MainBundle\Notification\NotificationRenderer; +use Chill\MainBundle\Entity\Notification; +use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Form\NotificationType; +use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound; +use Chill\MainBundle\Notification\NotificationHandlerManager; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\NotificationRepository; +use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Security; +use Symfony\Contracts\Translation\TranslatorInterface; /** * @Route("/{_locale}/notification") */ class NotificationController extends AbstractController { - private Security $security; + private EntityManagerInterface $em; + + private NotificationHandlerManager $notificationHandlerManager; + private NotificationRepository $notificationRepository; - private NotificationRenderer $notificationRenderer; + private PaginatorFactory $paginatorFactory; + private Security $security; + + private TranslatorInterface $translator; + public function __construct( + EntityManagerInterface $em, Security $security, NotificationRepository $notificationRepository, - NotificationRenderer $notificationRenderer, - PaginatorFactory $paginatorFactory + NotificationHandlerManager $notificationHandlerManager, + PaginatorFactory $paginatorFactory, + TranslatorInterface $translator ) { + $this->em = $em; $this->security = $security; $this->notificationRepository = $notificationRepository; - $this->notificationRenderer = $notificationRenderer; + $this->notificationHandlerManager = $notificationHandlerManager; $this->paginatorFactory = $paginatorFactory; + $this->translator = $translator; } /** - * @Route("/show", name="chill_main_notification_show") + * @Route("/create", name="chill_main_notification_create") */ - public function showAction(): Response + public function createAction(Request $request): Response { + $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); + + if (!$this->security->getUser() instanceof User) { + throw new AccessDeniedHttpException('You must be authenticated and a user to create a notification'); + } + + if (!$request->query->has('entityClass')) { + throw new BadRequestHttpException('Missing entityClass parameter'); + } + + if (!$request->query->has('entityId')) { + throw new BadRequestHttpException('missing entityId parameter'); + } + + $notification = new Notification(); + $notification + ->setRelatedEntityClass($request->query->get('entityClass')) + ->setRelatedEntityId($request->query->getInt('entityId')) + ->setSender($this->security->getUser()); + + try { + $handler = $this->notificationHandlerManager->getHandler($notification); + } catch (NotificationHandlerNotFound $e) { + throw new BadRequestHttpException('no handler for this notification'); + } + + $form = $this->createForm(NotificationType::class, $notification); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $this->em->persist($notification); + $this->em->flush(); + + $this->addFlash('success', $this->translator->trans('notification.Notification created')); + + if ($request->query->has('returnPath')) { + return new RedirectResponse($request->query->get('returnPath')); + } + + return $this->redirectToRoute('chill_main_homepage'); + } + + return $this->render('@ChillMain/Notification/create.html.twig', [ + 'form' => $form->createView(), + 'handler' => $handler, + 'notification' => $notification, + ]); + } + + /** + * @Route("/my", name="chill_main_notification_my") + */ + public function myAction(): Response + { + $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); $currentUser = $this->security->getUser(); $notificationsNbr = $this->notificationRepository->countAllForAttendee(($currentUser)); @@ -61,8 +138,8 @@ class NotificationController extends AbstractController foreach ($notifications as $notification) { $data = [ - 'template' => $this->notificationRenderer->getTemplate($notification), - 'template_data' => $this->notificationRenderer->getTemplateData($notification), + 'template' => $this->notificationHandlerManager->getTemplate($notification), + 'template_data' => $this->notificationHandlerManager->getTemplateData($notification), 'notification' => $notification, ]; $templateData[] = $data; diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index bfcdf1ee6..a9b576f1f 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -53,7 +53,7 @@ class Notification /** * @ORM\Column(type="json") */ - private array $read; + private array $read = []; /** * @ORM\Column(type="string", length=255) @@ -74,6 +74,7 @@ class Notification public function __construct() { $this->addressees = new ArrayCollection(); + $this->setDate(new DateTimeImmutable()); } public function addAddressee(User $addressee): self diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php new file mode 100644 index 000000000..af884dfbb --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php @@ -0,0 +1,41 @@ +add('addressees', EntityType::class, [ + 'class' => User::class, + 'choice_label' => 'label', + 'multiple' => true, + ]) + ->add('message', ChillTextareaType::class, [ + 'required' => false, + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefault('class', Notification::class); + } +} diff --git a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php new file mode 100644 index 000000000..00add5f4f --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php @@ -0,0 +1,18 @@ +renderers[] = $activityNotificationRenderer; } - public function getTemplate(Notification $notification) - { - return $this->getRenderer($notification)->getTemplate(); - } - - public function getTemplateData(Notification $notification) - { - return $this->getRenderer($notification)->getTemplateData($notification); - } - - private function getRenderer(Notification $notification) + public function getHandler(Notification $notification): NotificationHandlerInterface { foreach ($this->renderers as $renderer) { if ($renderer->supports($notification)) { @@ -49,6 +39,16 @@ final class NotificationHandlerManager } } - throw new Exception('No renderer for ' . $notification); + throw new NotificationHandlerNotFound(); + } + + public function getTemplate(Notification $notification) + { + return $this->getHandler($notification)->getTemplate(); + } + + public function getTemplateData(Notification $notification) + { + return $this->getHandler($notification)->getTemplateData($notification); } } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig new file mode 100644 index 000000000..a6a52acf7 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig @@ -0,0 +1,25 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block content %} +
+
+ {% include handler.template(notification) with handler.templateData(notification) %} + + {{ form_start(form, { 'attr': { 'id': 'notification' }}) }} + + {{ form_row(form.addressees) }} + {{ form_row(form.message) }} + + {{ form_end(form) }} + + +
+
+{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php index c67c3d8a8..934f3f1c0 100644 --- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php +++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php @@ -12,9 +12,10 @@ declare(strict_types=1); namespace Chill\PersonBundle\Notification; use Chill\MainBundle\Entity\Notification; +use Chill\MainBundle\Notification\NotificationHandlerInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; -final class AccompanyingPeriodNotificationRenderer +final class AccompanyingPeriodNotificationRenderer implements NotificationHandlerInterface { public function getTemplate() { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 39e924d18..2ced8f611 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -108,6 +108,10 @@ {% endif %} +
+ {{ 'notification.Notify'|trans }} +
+ {% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %}
{% if accompanyingCourse.requestorPerson is not null %} From 5cebcfddb7f1ce183827754134c80d7ee286bcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 25 Dec 2021 22:51:58 +0100 Subject: [PATCH 04/71] fix cs ? --- .../Normalizer/CollectionDocGenNormalizer.php | 2 +- .../Normalizer/DocGenObjectNormalizer.php | 2 +- .../{show.html.twig => list.html.twig} | 0 .../Routing/MenuBuilder/UserMenuBuilder.php | 4 ++-- .../Serializer/Normalizer/AddressNormalizer.php | 2 +- .../Normalizer/CollectionNormalizer.php | 2 +- .../Tests/Export/ExportManagerTest.php | 16 ++++++++-------- .../PasswordRecover/TokenManagerTest.php | 3 ++- .../config/services/notification.yaml | 2 +- .../ChillMainBundle/translations/messages.fr.yml | 4 ++++ .../Controller/HouseholdMemberController.php | 2 +- .../DataFixtures/ORM/LoadHouseholdPosition.php | 2 +- .../AccompanyingPeriodDocGenNormalizer.php | 2 +- .../AccompanyingPeriodOriginNormalizer.php | 2 +- ...AccompanyingPeriodParticipationNormalizer.php | 2 +- .../Normalizer/PersonJsonNormalizer.php | 2 +- .../Normalizer/RelationshipDocGenNormalizer.php | 2 +- .../Tests/Form/Type/PickPersonTypeTest.php | 3 ++- .../Normalizer/ThirdPartyNormalizer.php | 2 +- 19 files changed, 31 insertions(+), 25 deletions(-) rename src/Bundle/ChillMainBundle/Resources/views/Notification/{show.html.twig => list.html.twig} (100%) diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php index 55774dd83..cd01a003a 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php @@ -26,7 +26,7 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor /** * @param Collection $object - * @param null|string $format + * @param string|null $format * * @return array|ArrayObject|bool|float|int|string|void|null */ diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php index fc4b4beb9..0a3f6e403 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php @@ -66,7 +66,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte if (!$this->classMetadataFactory->hasMetadataFor($classMetadataKey)) { throw new LogicException(sprintf( 'This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s', - is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/, + is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/ , $format, implode(', ', ($context['groups'] ?? [])) )); diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig rename to src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php index 495b2ca8b..74a8ff31d 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php @@ -52,11 +52,11 @@ class UserMenuBuilder implements LocalMenuBuilderInterface $menu ->addChild( $this->translator->trans('My notifications'), - ['route' => 'chill_main_notification_show'] + ['route' => 'chill_main_notification_my'] ) ->setExtras([ 'order' => 600, - 'icon' => 'envelope' + 'icon' => 'envelope', ]); $menu diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php index f66eb4de6..119126a2e 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php @@ -48,7 +48,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw /** * @param Address $address - * @param null|string $format + * @param string|null $format */ public function normalize($address, $format = null, array $context = []) { diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php index 7ca4d563c..08b22871f 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php @@ -22,7 +22,7 @@ class CollectionNormalizer implements NormalizerAwareInterface, NormalizerInterf /** * @param Collection $collection - * @param null|string $format + * @param string|null $format */ public function normalize($collection, $format = null, array $context = []) { diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php index c09385e50..94266077a 100644 --- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php @@ -388,7 +388,7 @@ final class ExportManagerTest extends KernelTestCase public function testGetAggregatorNonExistant() { - $this->expectException(\RuntimeException::class); + $this->expectException(RuntimeException::class); $exportManager = $this->createExportManager(); @@ -446,7 +446,7 @@ final class ExportManagerTest extends KernelTestCase public function testGetExportNonExistant() { - $this->expectException(\RuntimeException::class); + $this->expectException(RuntimeException::class); $exportManager = $this->createExportManager(); @@ -485,7 +485,7 @@ final class ExportManagerTest extends KernelTestCase public function testGetFilterNonExistant() { - $this->expectException(\RuntimeException::class); + $this->expectException(RuntimeException::class); $exportManager = $this->createExportManager(); @@ -646,7 +646,7 @@ final class ExportManagerTest extends KernelTestCase public function testNonExistingFormatter() { - $this->expectException(\RuntimeException::class); + $this->expectException(RuntimeException::class); $exportManager = $this->createExportManager(); @@ -668,10 +668,10 @@ final class ExportManagerTest extends KernelTestCase ?UserInterface $user = null ): ExportManager { $localUser = $user ?? self::$container->get( - 'doctrine.orm.entity_manager' - ) - ->getRepository('ChillMainBundle:User') - ->findOneBy(['username' => 'center a_social']); + 'doctrine.orm.entity_manager' + ) + ->getRepository('ChillMainBundle:User') + ->findOneBy(['username' => 'center a_social']); $token = new UsernamePasswordToken($localUser, 'password', 'provider'); $tokenStorage = new TokenStorage(); $tokenStorage->setToken($token); diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php index 294ddceb6..cc10e43cb 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Security\PasswordRecover\TokenManager; use DateInterval; use DateTimeImmutable; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; +use UnexpectedValueException; /** * @internal @@ -57,7 +58,7 @@ final class TokenManagerTest extends KernelTestCase public function testGenerateEmptyUsernameCanonical() { - $this->expectException(\UnexpectedValueException::class); + $this->expectException(UnexpectedValueException::class); $tokenManager = $this->tokenManager; // set a username, but not a username canonical diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index efb25c5b5..34027d631 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -13,4 +13,4 @@ services: $translator: '@Symfony\Component\Translation\TranslatorInterface' $routeParameters: '%chill_main.notifications%' - Chill\MainBundle\Notification\NotificationRenderer: ~ + Chill\MainBundle\Notification\NotificationHandlerManager: ~ diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 4ae23f1e3..1d6fa70e0 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -351,3 +351,7 @@ By: Par For: Pour Created for: Créé pour Created by: Créé par + +notification: + Notify: Notifier + Notification create: Notification envoyée diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index 78234d114..ddf5d9683 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -187,7 +187,7 @@ class HouseholdMemberController extends ApiController $_format, ['groups' => ['read']] ); - } catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) { + } catch (Exception\InvalidArgumentException | Exception\UnexpectedValueException $e) { throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e); } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php index 1642a71b9..fed7d2817 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php @@ -33,7 +33,7 @@ class LoadHouseholdPosition extends Fixture { foreach ( self::POSITIONS_DATA as [$name, $share, $allowHolder, - $ordering, $ref, ] + $ordering, $ref, ] ) { $position = (new Position()) ->setLabel(['fr' => $name]) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php index 4343561fc..561067652 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php @@ -93,7 +93,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf /** * @param AccompanyingPeriod|null $period - * @param null|string $format + * @param string|null $format */ public function normalize($period, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php index 88dce414f..66f65b67b 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php @@ -21,7 +21,7 @@ final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface { /** * @param Origin $origin - * @param null|string $format + * @param string|null $format */ public function normalize($origin, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php index b392ccc24..d9472184e 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php @@ -21,7 +21,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterf /** * @param AccompanyingPeriodParticipation $participation - * @param null|string $format + * @param string|null $format */ public function normalize($participation, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php index 273c2aa32..8962acc83 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php @@ -141,7 +141,7 @@ class PersonJsonNormalizer implements /** * @param Person $person - * @param null|string $format + * @param string|null $format */ public function normalize($person, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php index cfae9f6e6..52a0f701c 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php @@ -31,7 +31,7 @@ class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, N /** * @param Relationship $relation - * @param null|string $format + * @param string|null $format */ public function normalize($relation, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php index 5c7942de3..6a9e37531 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Form\Type; use Chill\PersonBundle\Form\Type\PickPersonType; +use RuntimeException; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use function count; @@ -52,7 +53,7 @@ final class PickPersonTypeTest extends KernelTestCase */ public function testWithInvalidOptionCenters() { - $this->expectException(\RuntimeException::class); + $this->expectException(RuntimeException::class); $this->markTestSkipped('need to inject locale into url generator without request'); $this->formFactory diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php index d95192f2a..3f4fe87bf 100644 --- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php +++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php @@ -30,7 +30,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf /** * @param ThirdParty $thirdParty - * @param null|string $format + * @param string|null $format */ public function normalize($thirdParty, $format = null, array $context = []) { From f6f0786d38afb061f45447468f64fb7cf21295af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 25 Dec 2021 22:53:35 +0100 Subject: [PATCH 05/71] notificaiton: load interface automatically --- .../ChillMainBundle/ChillMainBundle.php | 3 +++ .../NotificationHandlerManager.php | 27 ++++++++++--------- .../views/Notification/list.html.twig | 3 ++- .../config/services/notification.yaml | 4 ++- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php index 2ff7ef862..0416edf76 100644 --- a/src/Bundle/ChillMainBundle/ChillMainBundle.php +++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php @@ -22,6 +22,7 @@ use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass; use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass; use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass; use Chill\MainBundle\DependencyInjection\RoleProvidersCompilerPass; +use Chill\MainBundle\Notification\NotificationHandlerInterface; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Chill\MainBundle\Search\SearchApiInterface; use Chill\MainBundle\Security\ProvideRoleInterface; @@ -50,6 +51,8 @@ class ChillMainBundle extends Bundle ->addTag('chill.render_entity'); $container->registerForAutoconfiguration(SearchApiInterface::class) ->addTag('chill.search_api_provider'); + $container->registerForAutoconfiguration(NotificationHandlerInterface::class) + ->addTag('chill_main.notification_handler'); $container->addCompilerPass(new SearchableServicesCompilerPass()); $container->addCompilerPass(new ConfigConsistencyCompilerPass()); diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php index a28afd5e9..214f24239 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php @@ -11,29 +11,30 @@ declare(strict_types=1); namespace Chill\MainBundle\Notification; -use Chill\ActivityBundle\Notification\ActivityNotificationRenderer; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound; -use Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer; +use Doctrine\ORM\EntityManagerInterface; final class NotificationHandlerManager { - private array $renderers; + private EntityManagerInterface $em; + + private iterable $handlers; public function __construct( - AccompanyingPeriodNotificationRenderer $accompanyingPeriodNotificationRenderer, - ActivityNotificationRenderer $activityNotificationRenderer + iterable $handlers, + EntityManagerInterface $em ) { - // TODO configure automatically - // TODO CREER UNE INTERFACE POUR ETRE SUR QUE LES RENDERERS SONT OK - - $this->renderers[] = $accompanyingPeriodNotificationRenderer; - $this->renderers[] = $activityNotificationRenderer; + $this->handlers = $handlers; + $this->em = $em; } + /** + * @throw NotificationHandlerNotFound if handler is not found + */ public function getHandler(Notification $notification): NotificationHandlerInterface { - foreach ($this->renderers as $renderer) { + foreach ($this->handlers as $renderer) { if ($renderer->supports($notification)) { return $renderer; } @@ -42,12 +43,12 @@ final class NotificationHandlerManager throw new NotificationHandlerNotFound(); } - public function getTemplate(Notification $notification) + public function getTemplate(Notification $notification): string { return $this->getHandler($notification)->getTemplate(); } - public function getTemplateData(Notification $notification) + public function getTemplateData(Notification $notification): array { return $this->getHandler($notification)->getTemplateData($notification); } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 34aeee049..4f4f81ba2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -4,7 +4,6 @@

{{ "Notifications list" | trans }}

- {%for data in datas %} {% set notification = data.notification %} @@ -36,6 +35,8 @@ {% include data.template with data.template_data %} + {% else %} +

{{ notification.Any notification received }}

{% endfor %}
diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index 34027d631..5d4390877 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -13,4 +13,6 @@ services: $translator: '@Symfony\Component\Translation\TranslatorInterface' $routeParameters: '%chill_main.notifications%' - Chill\MainBundle\Notification\NotificationHandlerManager: ~ + Chill\MainBundle\Notification\NotificationHandlerManager: + arguments: + $handlers: !tagged_iterator chill_main.notification_handler From bd3919efcb11f314071525bdc97979a3c9fdb4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 26 Dec 2021 01:00:50 +0100 Subject: [PATCH 06/71] notification: store users which are unread instead of read, and in dedicated table The query "which are the unread notification" is much more frequent than the read one. We then store the unread items in a dedicated table. --- composer.json | 11 +- .../Controller/NotificationController.php | 58 ++++++++-- .../ChillMainBundle/Entity/Notification.php | 57 +++++++--- .../Repository/NotificationRepository.php | 102 +++++++++++++++--- .../views/Notification/list.html.twig | 86 +++++++++------ .../migrations/Version20211225231532.php | 39 +++++++ .../translations/messages.fr.yml | 6 +- .../Controller/HouseholdMemberController.php | 2 +- .../config/services/notification.yaml | 1 + 9 files changed, 283 insertions(+), 79 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20211225231532.php diff --git a/composer.json b/composer.json index a46446531..312cd1cee 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "php": "^7.4", "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290", "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8", - "ocramius/package-versions": "^1.10", "doctrine/doctrine-bundle": "^2.1", "doctrine/doctrine-migrations-bundle": "^3.0", "doctrine/orm": "^2.7", @@ -22,6 +21,7 @@ "knplabs/knp-time-bundle": "^1.12", "league/csv": "^9.7.1", "nyholm/psr7": "^1.4", + "ocramius/package-versions": "^1.10", "phpoffice/phpspreadsheet": "^1.16", "ramsey/uuid-doctrine": "^1.7", "sensio/framework-extra-bundle": "^5.5", @@ -47,6 +47,7 @@ "twig/extra-bundle": "^3.0", "twig/intl-extra": "^3.0", "twig/markdown-extra": "^3.3", + "twig/string-extra": "^3.3", "twig/twig": "^3.0" }, "conflict": { @@ -72,7 +73,13 @@ "bin-dir": "bin", "optimize-autoloader": true, "sort-packages": true, - "vendor-dir": "tests/app/vendor" + "vendor-dir": "tests/app/vendor", + "allow-plugins": { + "composer/package-versions-deprecated": true, + "phpstan/extension-installer": true, + "ergebnis/composer-normalize": true, + "phpro/grumphp": true + } }, "autoload": { "psr-4": { diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index 19d5142ca..c3ec0e549 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -118,9 +118,9 @@ class NotificationController extends AbstractController } /** - * @Route("/my", name="chill_main_notification_my") + * @Route("/inbox", name="chill_main_notification_my") */ - public function myAction(): Response + public function inboxAction(): Response { $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); $currentUser = $this->security->getUser(); @@ -134,21 +134,61 @@ class NotificationController extends AbstractController $offset = $paginator->getCurrentPage()->getFirstItemNumber() ); + return $this->render('@ChillMain/Notification/list.html.twig', [ + 'datas' => $this->itemsForTemplate($notifications), + 'notifications' => $notifications, + 'paginator' => $paginator, + 'step' => 'inbox', + 'unreads' => $this->countUnread(), + ]); + } + + /** + * @Route("/sent", name="chill_main_notification_sent") + */ + public function sentAction(): Response + { + $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); + $currentUser = $this->security->getUser(); + + $notificationsNbr = $this->notificationRepository->countAllForSender($currentUser); + $paginator = $this->paginatorFactory->create($notificationsNbr); + + $notifications = $this->notificationRepository->findAllForSender( + $currentUser, + $limit = $paginator->getItemsPerPage(), + $offset = $paginator->getCurrentPage()->getFirstItemNumber() + ); + + return $this->render('@ChillMain/Notification/list.html.twig', [ + 'datas' => $this->itemsForTemplate($notifications), + 'notifications' => $notifications, + 'paginator' => $paginator, + 'step' => 'sent', + 'unreads' => $this->countUnread(), + ]); + } + + private function countUnread(): array + { + return [ + 'sent' => $this->notificationRepository->countUnreadByUserWhereSender($this->security->getUser()), + 'inbox' => $this->notificationRepository->countUnreadByUserWhereAddressee($this->security->getUser()), + ]; + } + + private function itemsForTemplate(array $notifications): array + { $templateData = []; foreach ($notifications as $notification) { - $data = [ + $templateData[] = [ 'template' => $this->notificationHandlerManager->getTemplate($notification), 'template_data' => $this->notificationHandlerManager->getTemplateData($notification), 'notification' => $notification, ]; - $templateData[] = $data; } - return $this->render('@ChillMain/Notification/show.html.twig', [ - 'datas' => $templateData, - 'notifications' => $notifications, - 'paginator' => $paginator, - ]); + return $templateData; } } diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index a9b576f1f..c484f9826 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -50,11 +50,6 @@ class Notification */ private string $message = ''; - /** - * @ORM\Column(type="json") - */ - private array $read = []; - /** * @ORM\Column(type="string", length=255) */ @@ -71,9 +66,16 @@ class Notification */ private User $sender; + /** + * @ORM\ManyToMany(targetEntity=User::class) + * @ORM\JoinTable(name="chill_main_notification_addresses_unread") + */ + private Collection $unreadBy; + public function __construct() { $this->addressees = new ArrayCollection(); + $this->unreadBy = new ArrayCollection(); $this->setDate(new DateTimeImmutable()); } @@ -81,6 +83,16 @@ class Notification { if (!$this->addressees->contains($addressee)) { $this->addressees[] = $addressee; + $this->addUnreadBy($addressee); + } + + return $this; + } + + public function addUnreadBy(User $user): self + { + if (!$this->unreadBy->contains($user)) { + $this->unreadBy->add($user); } return $this; @@ -109,11 +121,6 @@ class Notification return $this->message; } - public function getRead(): array - { - return $this->read; - } - public function getRelatedEntityClass(): ?string { return $this->relatedEntityClass; @@ -129,9 +136,32 @@ class Notification return $this->sender; } + public function isReadBy(User $user): bool + { + return !$this->unreadBy->contains($user); + } + + public function markAsReadBy(User $user): self + { + return $this->removeUnreadBy($user); + } + + public function markAsUnreadBy(User $user): self + { + return $this->addUnreadBy($user); + } + public function removeAddressee(User $addressee): self { $this->addressees->removeElement($addressee); + $this->unreadBy->removeElement($addressee); + + return $this; + } + + public function removeUnreadBy(User $user): self + { + $this->unreadBy->removeElement($user); return $this; } @@ -150,13 +180,6 @@ class Notification return $this; } - public function setRead(array $read): self - { - $this->read = $read; - - return $this; - } - public function setRelatedEntityClass(string $relatedEntityClass): self { $this->relatedEntityClass = $relatedEntityClass; diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index 4af19550c..eea2d41e1 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -13,25 +13,75 @@ namespace Chill\MainBundle\Repository; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\User; +use Doctrine\DBAL\Types\Types; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Query; +use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ObjectRepository; final class NotificationRepository implements ObjectRepository { + private EntityManagerInterface $em; + private EntityRepository $repository; public function __construct(EntityManagerInterface $entityManager) { + $this->em = $entityManager; $this->repository = $entityManager->getRepository(Notification::class); } - public function countAllForAttendee(User $addressee): int // TODO passer à attendees avec S + public function countAllForAttendee(User $addressee): int { - $query = $this->queryAllForAttendee($addressee, $countQuery = true); + return $this->queryByAddressee($addressee) + ->select('count(n)') + ->getQuery() + ->getSingleScalarResult(); + } - return $query->getSingleScalarResult(); + public function countAllForSender(User $sender): int + { + return $this->queryBySender($sender) + ->select('count(n)') + ->getQuery() + ->getSingleScalarResult(); + } + + public function countUnreadByUser(User $user): int + { + $sql = 'SELECT count(*) AS c FROM chill_main_notification_addresses_unread WHERE user_id = ?'; + + $rsm = new Query\ResultSetMapping(); + $rsm->addScalarResult('c', 'c', Types::INTEGER); + + $nq = $this->em->createNativeQuery($sql, $rsm); + + return $nq->getSingleScalarResult(); + } + + public function countUnreadByUserWhereAddressee(User $user): int + { + $qb = $this->repository->createQueryBuilder('n'); + $qb + ->select('count(n)') + ->where($qb->expr()->isMemberOf(':user', 'n.addressees')) + ->andWhere($qb->expr()->isMemberOf(':user', 'n.unreadBy')) + ->setParameter('user', $user); + + return $qb->getQuery()->getSingleScalarResult(); + } + + public function countUnreadByUserWhereSender(User $user): int + { + $qb = $this->repository->createQueryBuilder('n'); + $qb + ->select('count(n)') + ->where($qb->expr()->eq('n.sender', ':user')) + ->andWhere($qb->expr()->isMemberOf(':user', 'n.unreadBy')) + ->setParameter('user', $user); + + return $qb->getQuery()->getSingleScalarResult(); } public function find($id, $lockMode = null, $lockVersion = null): ?Notification @@ -53,9 +103,9 @@ final class NotificationRepository implements ObjectRepository * * @return Notification[] */ - public function findAllForAttendee(User $addressee, $limit = null, $offset = null): array // TODO passer à attendees avec S + public function findAllForAttendee(User $addressee, $limit = null, $offset = null): array { - $query = $this->queryAllForAttendee($addressee); + $query = $this->queryByAddressee($addressee)->select('n'); if ($limit) { $query = $query->setMaxResults($limit); @@ -65,7 +115,22 @@ final class NotificationRepository implements ObjectRepository $query = $query->setFirstResult($offset); } - return $query->getResult(); + return $query->getQuery()->getResult(); + } + + public function findAllForSender(User $sender, $limit = null, $offset = null): array + { + $query = $this->queryBySender($sender)->select('n'); + + if ($limit) { + $query = $query->setMaxResults($limit); + } + + if ($offset) { + $query = $query->setFirstResult($offset); + } + + return $query->getQuery()->getResult(); } /** @@ -89,22 +154,25 @@ final class NotificationRepository implements ObjectRepository return Notification::class; } - private function queryAllForAttendee(User $addressee, bool $countQuery = false): Query + private function queryByAddressee(User $addressee, bool $countQuery = false): QueryBuilder { $qb = $this->repository->createQueryBuilder('n'); - $select = 'n'; - - if ($countQuery) { - $select = 'count(n)'; - } - $qb - ->select($select) - ->join('n.addressees', 'a') - ->where('a = :addressee') + ->where($qb->expr()->isMemberOf(':addressee', 'n.addressees')) ->setParameter('addressee', $addressee); - return $qb->getQuery(); + return $qb; + } + + private function queryBySender(User $sender): QueryBuilder + { + $qb = $this->repository->createQueryBuilder('n'); + + $qb + ->where($qb->expr()->eq('n.sender', ':sender')) + ->setParameter('sender', $sender); + + return $qb; } } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 4f4f81ba2..4a1f504f4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -1,43 +1,65 @@ {% extends "@ChillMain/layout.html.twig" %} +{% block title 'notification.List'|trans %} + {% block content %}
-
-

{{ "Notifications list" | trans }}

+
+
+

{{ block('title') }}

- {%for data in datas %} - {% set notification = data.notification %} + -
-
{{ 'Message'|trans }}
-
{{ notification.message }}
-
+ {% if datas|length == 0 %} + {% if step == 'inbox' %} +

{{ 'notification.Any notification received'|trans }}

+ {% else %} +

{{ 'notification.Any notification sent'|trans }}

+ {% endif %} + {% else %} +
+ {% for data in datas %} + {% set notification = data.notification %} +
+ {% include data.template with data.template_data %} +
+
+ {% if step == 'inbox' %} +
{{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }}
+ {% endif %} +
{{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+
{{ notification.date|format_datetime('long', 'short') }}
+
+
+ {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} +
+
+
+ {% endfor %} -
-
{{ 'Date'|trans }}
-
{{ notification.date | date('long') }}
-
+
+ {% endif %} +
- -
-
{{ 'Sender'|trans }}
-
{{ notification.sender }}
-
- -
-
{{ 'Addressees'|trans }}
-
{{ notification.addressees |join(', ') }}
-
- -
-
{{ 'Entity'|trans }}
-
- {% include data.template with data.template_data %} -
-
- {% else %} -

{{ notification.Any notification received }}

- {% endfor %}
{% endblock content %} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php b/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php new file mode 100644 index 000000000..eabcce641 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20211225231532.php @@ -0,0 +1,39 @@ +addSql('DROP TABLE chill_main_notification_addresses_unread'); + $this->addSql('ALTER TABLE chill_main_notification ADD read JSONB DEFAULT \'[]\''); + } + + public function getDescription(): string + { + return 'Store notification readed by user in a specific table'; + } + + public function up(Schema $schema): void + { + $this->addSql('CREATE TABLE chill_main_notification_addresses_unread (notification_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(notification_id, user_id))'); + $this->addSql('CREATE INDEX IDX_154A075FEF1A9D84 ON chill_main_notification_addresses_unread (notification_id)'); + $this->addSql('CREATE INDEX IDX_154A075FA76ED395 ON chill_main_notification_addresses_unread (user_id)'); + $this->addSql('ALTER TABLE chill_main_notification_addresses_unread ADD CONSTRAINT FK_154A075FEF1A9D84 FOREIGN KEY (notification_id) REFERENCES chill_main_notification (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification_addresses_unread ADD CONSTRAINT FK_154A075FA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification DROP read'); + } +} diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 1d6fa70e0..9b810a837 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -354,4 +354,8 @@ Created by: Créé par notification: Notify: Notifier - Notification create: Notification envoyée + Notification created: Notification envoyée + Any notification received: Aucune notification reçue + Any notification sent: Aucune notification envoyée + Notifications received: Notifications reçues + Notifications sent: Notification envoyées diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index ddf5d9683..78234d114 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -187,7 +187,7 @@ class HouseholdMemberController extends ApiController $_format, ['groups' => ['read']] ); - } catch (Exception\InvalidArgumentException | Exception\UnexpectedValueException $e) { + } catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) { throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e); } diff --git a/src/Bundle/ChillPersonBundle/config/services/notification.yaml b/src/Bundle/ChillPersonBundle/config/services/notification.yaml index 58187defb..c5d04f983 100644 --- a/src/Bundle/ChillPersonBundle/config/services/notification.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/notification.yaml @@ -1,3 +1,4 @@ services: Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer: autowire: true + autoconfigure: true From 700bb02374c33447d75f64c7e5e9263e4a9f17f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 26 Dec 2021 01:12:32 +0100 Subject: [PATCH 07/71] notification: add test for unread consistency --- .../ChillMainBundle/Entity/Notification.php | 9 ++++++-- .../ChillMainBundle/Form/NotificationType.php | 1 + .../Tests/Entity/NotificationTest.php | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index c484f9826..b50b9de53 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -92,7 +92,7 @@ class Notification public function addUnreadBy(User $user): self { if (!$this->unreadBy->contains($user)) { - $this->unreadBy->add($user); + $this->unreadBy[] = $user; } return $this; @@ -136,6 +136,11 @@ class Notification return $this->sender; } + public function getUnreadBy(): Collection + { + return $this->unreadBy; + } + public function isReadBy(User $user): bool { return !$this->unreadBy->contains($user); @@ -154,7 +159,7 @@ class Notification public function removeAddressee(User $addressee): self { $this->addressees->removeElement($addressee); - $this->unreadBy->removeElement($addressee); + $this->removeUnreadBy($addressee); return $this; } diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php index af884dfbb..b54752cde 100644 --- a/src/Bundle/ChillMainBundle/Form/NotificationType.php +++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php @@ -28,6 +28,7 @@ class NotificationType extends AbstractType 'class' => User::class, 'choice_label' => 'label', 'multiple' => true, + 'by_reference' => true, ]) ->add('message', ChillTextareaType::class, [ 'required' => false, diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php new file mode 100644 index 000000000..9be00dde3 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php @@ -0,0 +1,23 @@ +addAddressee($user1 = new User()); + $notification->addAddressee($user2 = new User()); + + $this->assertCount(2, $notification->getAddressees()); + $this->assertCount(2, $notification->getUnreadBy()); + $this->assertContains($user1, $notification->getUnreadBy()->toArray()); + $this->assertContains($user2, $notification->getUnreadBy()->toArray()); + } + +} From d5d64cdf65a23bb15c3faa8d91f8f284f60b4009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 26 Dec 2021 01:12:42 +0100 Subject: [PATCH 08/71] upgrade test app --- tests/app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app b/tests/app index bd95d3c96..5952eda44 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01 +Subproject commit 5952eda44831896991989c2e4881adc26329140e From b323ddae0597cb66be4b9748d245a0188a45379f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 Dec 2021 19:40:38 +0100 Subject: [PATCH 09/71] fix loading of unread addressees in notification --- .../ChillMainBundle/Entity/Notification.php | 40 +++++-- .../Tests/Entity/NotificationTest.php | 102 +++++++++++++++++- .../migrations/Version20211228183221.php | 34 ++++++ 3 files changed, 166 insertions(+), 10 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20211228183221.php diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index b50b9de53..1fa4e668e 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -20,19 +20,21 @@ use Doctrine\ORM\Mapping as ORM; * @ORM\Entity * @ORM\Table( * name="chill_main_notification", - * uniqueConstraints={ - * @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"}) - * } * ) + * @ORM\HasLifecycleCallbacks */ class Notification { + private array $addedAddresses = []; + /** * @ORM\ManyToMany(targetEntity=User::class) * @ORM\JoinTable(name="chill_main_notification_addresses_user") */ private Collection $addressees; + private ?ArrayCollection $addressesOnLoad = null; + /** * @ORM\Column(type="datetime_immutable") */ @@ -60,6 +62,8 @@ class Notification */ private int $relatedEntityId; + private array $removedAddresses = []; + /** * @ORM\ManyToOne(targetEntity=User::class) * @ORM\JoinColumn(nullable=false) @@ -83,7 +87,7 @@ class Notification { if (!$this->addressees->contains($addressee)) { $this->addressees[] = $addressee; - $this->addUnreadBy($addressee); + $this->addedAddresses[] = $addressee; } return $this; @@ -103,6 +107,11 @@ class Notification */ public function getAddressees(): Collection { + // keep a copy to compute changes later + if (null === $this->addressesOnLoad) { + $this->addressesOnLoad = new ArrayCollection($this->addressees->toArray()); + } + return $this->addressees; } @@ -156,10 +165,29 @@ class Notification return $this->addUnreadBy($user); } + /** + * @ORM\PreFlush + */ + public function registerUnread() + { + foreach ($this->addedAddresses as $addressee) { + $this->addUnreadBy($addressee); + } + + if (null !== $this->addressesOnLoad) { + foreach ($this->addressees as $existingAddresse) { + if (!$this->addressesOnLoad->contains($existingAddresse)) { + $this->addUnreadBy($existingAddresse); + } + } + } + } + public function removeAddressee(User $addressee): self { - $this->addressees->removeElement($addressee); - $this->removeUnreadBy($addressee); + if ($this->addressees->removeElement($addressee)) { + $this->removedAddresses[] = $addressee; + } return $this; } diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php index 9be00dde3..6343800d5 100644 --- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php @@ -1,23 +1,117 @@ get(EntityManagerInterface::class); + + foreach ($this->toDelete as [$className, $id]) { + $object = $em->find($className, $id); + $em->remove($object); + } + + $em->flush(); + } + + public function generateNotificationData() + { + self::bootKernel(); + $userRepository = self::$container->get(UserRepository::class); + + $senderId = $userRepository + ->findOneBy(['username' => 'center b_social']) + ->getId(); + + $addressesIds = []; + $addressesIds[] = $userRepository + ->findOneBy(['username' => 'center b_direction']) + ->getId(); + + yield [ + $senderId, + $addressesIds, + ]; + } + public function testAddAddresseeStoreAnUread() { $notification = new Notification(); $notification->addAddressee($user1 = new User()); $notification->addAddressee($user2 = new User()); + $notification->getAddressees()->add($user3 = new User()); - $this->assertCount(2, $notification->getAddressees()); - $this->assertCount(2, $notification->getUnreadBy()); + $this->assertCount(3, $notification->getAddressees()); + + // launch listener + $notification->registerUnread(); + $this->assertCount(3, $notification->getUnreadBy()); $this->assertContains($user1, $notification->getUnreadBy()->toArray()); $this->assertContains($user2, $notification->getUnreadBy()->toArray()); + $this->assertContains($user3, $notification->getUnreadBy()->toArray()); } + /** + * @dataProvider generateNotificationData + */ + public function testPrePersistComputeUnread(int $senderId, array $addressesIds) + { + $em = self::$container->get(EntityManagerInterface::class); + $notification = new Notification(); + $notification + ->setSender($em->find(User::class, $senderId)) + ->setRelatedEntityId(0) + ->setRelatedEntityClass(AccompanyingPeriod::class) + ->setMessage('Fake message'); + + foreach ($addressesIds as $addresseeId) { + $notification + ->getAddressees()->add($em->find(User::class, $addresseeId)); + } + + $em->persist($notification); + $em->flush(); + $em->refresh($notification); + + $this->toDelete[] = [Notification::class, $notification->getId()]; + + $this->assertEquals($senderId, $notification->getSender()->getId()); + $this->assertCount(count($addressesIds), $notification->getUnreadBy()); + + $unreadIds = $notification->getUnreadBy()->map(static function (User $u) { return $u->getId(); }); + + foreach ($addressesIds as $addresseeId) { + $this->assertContains($addresseeId, $unreadIds); + } + } } diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php b/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php new file mode 100644 index 000000000..b74579959 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20211228183221.php @@ -0,0 +1,34 @@ +addSql('create unique index uniq_5bdc8067567988b4440f6072 + on chill_main_notification (relatedentityclass, relatedentityid)'); + } + + public function getDescription(): string + { + return 'remove unique index which prevent to notify twice an entity'; + } + + public function up(Schema $schema): void + { + $this->addSql('DROP INDEX uniq_5bdc8067567988b4440f6072'); + } +} From f453dbb543f3dbba6d4aa434193aed7bd04e60bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 Dec 2021 20:04:30 +0100 Subject: [PATCH 10/71] notification: more check in test --- .../Tests/Entity/NotificationTest.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php index 6343800d5..6bf966bbb 100644 --- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php @@ -27,7 +27,7 @@ final class NotificationTest extends KernelTestCase { private array $toDelete = []; - protected function setUp() + protected function setUp(): void { self::bootKernel(); } @@ -70,15 +70,21 @@ final class NotificationTest extends KernelTestCase $notification->addAddressee($user1 = new User()); $notification->addAddressee($user2 = new User()); $notification->getAddressees()->add($user3 = new User()); + $notification->getAddressees()->add($user4 = new User()); - $this->assertCount(3, $notification->getAddressees()); + $this->assertCount(4, $notification->getAddressees()); // launch listener $notification->registerUnread(); - $this->assertCount(3, $notification->getUnreadBy()); + $this->assertCount(4, $notification->getUnreadBy()); $this->assertContains($user1, $notification->getUnreadBy()->toArray()); $this->assertContains($user2, $notification->getUnreadBy()->toArray()); $this->assertContains($user3, $notification->getUnreadBy()->toArray()); + + $notification->markAsReadBy($user1); + + $this->assertCount(3, $notification->getUnreadBy()); + $this->assertNotContains($user1, $notification->getUnreadBy()->toArray()); } /** From 1ad6a958e203540cbd2bd0ac1528297d807a10b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 Dec 2021 22:35:15 +0100 Subject: [PATCH 11/71] notification: add show action --- .../Controller/NotificationController.php | 21 ++++++++ .../views/Notification/list.html.twig | 44 +++++++++++----- .../views/Notification/show.html.twig | 28 ++++++++++ .../Authorization/NotificationVoter.php | 51 +++++++++++++++++++ .../config/services/security.yaml | 2 + 5 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index c3ec0e549..df38c15d9 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -18,6 +18,7 @@ use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound; use Chill\MainBundle\Notification\NotificationHandlerManager; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\NotificationRepository; +use Chill\MainBundle\Security\Authorization\NotificationVoter; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -169,6 +170,26 @@ class NotificationController extends AbstractController ]); } + /** + * @Route("/{id}/show", name="chill_main_notification_show") + */ + public function showAction(Notification $notification, Request $request): Response + { + $this->denyAccessUnlessGranted(NotificationVoter::SEE, $notification); + + $response = $this->render('@ChillMain/Notification/show.html.twig', [ + 'notification' => $notification, + 'handler' => $this->notificationHandlerManager->getHandler($notification), + ]); + + if ($this->getUser() instanceof User && !$notification->isReadBy($this->getUser())) { + $notification->markAsReadBy($this->getUser()); + $this->em->flush(); + } + + return $response; + } + private function countUnread(): array { return [ diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 4a1f504f4..96074e14d 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -12,9 +12,11 @@
  • {{ 'notification.Notifications received'|trans }} + {% if unreads['inbox'] > 0 %} {{ unreads['inbox'] }} + {% endif %}
  • @@ -39,19 +41,35 @@
    {% for data in datas %} {% set notification = data.notification %} -
    - {% include data.template with data.template_data %} -
    -
    - {% if step == 'inbox' %} -
    {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }}
    - {% endif %} -
    {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
    -
    {{ notification.date|format_datetime('long', 'short') }}
    -
    -
    - {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} -
    +
    +
    +
    + {% if step == 'inbox' %} + {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }} + {% endif %} + {% if not notification.isReadBy(app.user) %} +
    {{ 'notification.is_unread'|trans }}
    + {% endif %} +
    +
    {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
    +
    {{ notification.date|format_datetime('long', 'short') }}
    +
    +
    +
    +
    + {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} +
    +
    +
    +
    + {% include data.template with data.template_data %} +
    +
    +
      +
    • + +
      • +
    {% endfor %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig new file mode 100644 index 000000000..1fbe7693b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -0,0 +1,28 @@ +{% extends "@ChillMain/layout.html.twig" %} + +{% block title 'notification.show notification from %sender%'|trans({ '%sender%': notification.sender|chill_entity_render_string }) %} + +{% block content %} +
    +
    +

    {{ 'notification.Notification'|trans }}

    + +
    + {% include handler.getTemplate(notification) with handler.getTemplateData(notification) %} +
    + +
    + {# à remplacer par un commentEmbeddable #} + {{ notification.message|chill_markdown_to_html }} +
    + + +
    +
    +{% endblock content %} diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php new file mode 100644 index 000000000..f0023ec12 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php @@ -0,0 +1,51 @@ +getUser(); + + if (!$user instanceof User) { + return false; + } + + switch ($attribute) { + case self::SEE: + return $subject->getSender() === $user || $subject->getAddressees()->contains($user); + + default: + throw new UnexpectedValueException("this subject {$subject} is not implemented"); + } + } +} diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml index 163b86d8e..30eed05c0 100644 --- a/src/Bundle/ChillMainBundle/config/services/security.yaml +++ b/src/Bundle/ChillMainBundle/config/services/security.yaml @@ -24,6 +24,8 @@ services: Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory: ~ + Chill\MainBundle\Security\Authorization\NotificationVoter: ~ + Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory' chill.main.security.authorization.helper: From 9647785d8b32321aafc655ba4a8688e9eb7a85a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 Dec 2021 23:03:58 +0100 Subject: [PATCH 12/71] notificaton: add comments --- .../ChillMainBundle/Entity/Notification.php | 29 ++++ .../Entity/NotificationComment.php | 137 ++++++++++++++++++ .../migrations/Version20211228215919.php | 43 ++++++ 3 files changed, 209 insertions(+) create mode 100644 src/Bundle/ChillMainBundle/Entity/NotificationComment.php create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20211228215919.php diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index 1fa4e668e..d7e7075ed 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -35,6 +35,12 @@ class Notification private ?ArrayCollection $addressesOnLoad = null; + /** + * @ORM\OneToMany(targetEntity=NotificationComment::class, mappedBy="notification", orphanRemoval=true) + * @ORM\OrderBy({"createdAt": "ASC"}) + */ + private Collection $comments; + /** * @ORM\Column(type="datetime_immutable") */ @@ -80,6 +86,7 @@ class Notification { $this->addressees = new ArrayCollection(); $this->unreadBy = new ArrayCollection(); + $this->comments = new ArrayCollection(); $this->setDate(new DateTimeImmutable()); } @@ -93,6 +100,16 @@ class Notification return $this; } + public function addComment(NotificationComment $comment): self + { + if (!$this->comments->contains($comment)) { + $this->comments[] = $comment; + $comment->setNotification($this); + } + + return $this; + } + public function addUnreadBy(User $user): self { if (!$this->unreadBy->contains($user)) { @@ -115,6 +132,11 @@ class Notification return $this->addressees; } + public function getComments(): Collection + { + return $this->comments; + } + public function getDate(): ?DateTimeImmutable { return $this->date; @@ -192,6 +214,13 @@ class Notification return $this; } + public function removeComment(NotificationComment $comment): self + { + $this->comments->removeElement($comment); + + return $this; + } + public function removeUnreadBy(User $user): self { $this->unreadBy->removeElement($user); diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php new file mode 100644 index 000000000..73157eb01 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php @@ -0,0 +1,137 @@ +content; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getNotification(): ?Notification + { + return $this->notification; + } + + public function getUpdateAt(): ?DateTimeImmutable + { + return $this->updateAt; + } + + public function setContent(string $content): self + { + $this->content = $content; + + return $this; + } + + public function setCreatedAt(DateTimeInterface $datetime): self + { + $this->createdAt = $datetime; + + return $this; + } + + public function setCreatedBy(User $user): self + { + $this->createdBy = $user; + + return $this; + } + + /** + * @internal use Notification::addComment + */ + public function setNotification(?Notification $notification): self + { + $this->notification = $notification; + + return $this; + } + + public function setUpdateAt(?DateTimeImmutable $updateAt): self + { + $this->updateAt = $updateAt; + + return $this; + } + + public function setUpdatedAt(DateTimeInterface $datetime): self + { + $this->updateAt = $datetime; + + return $this; + } + + public function setUpdatedBy(User $user): self + { + $this->updatedBy = $user; + + return $this; + } +} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php b/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php new file mode 100644 index 000000000..12e7b747d --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20211228215919.php @@ -0,0 +1,43 @@ +addSql('DROP SEQUENCE chill_main_notification_comment_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_main_notification_comment'); + } + + public function getDescription(): string + { + return 'Notifications: add comment on notifications'; + } + + public function up(Schema $schema): void + { + $this->addSql('CREATE SEQUENCE chill_main_notification_comment_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_main_notification_comment (id INT NOT NULL, notification_id INT NOT NULL, content TEXT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updateAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_983BD2CFEF1A9D84 ON chill_main_notification_comment (notification_id)'); + $this->addSql('CREATE INDEX IDX_983BD2CF3174800F ON chill_main_notification_comment (createdBy_id)'); + $this->addSql('CREATE INDEX IDX_983BD2CF65FF1AEC ON chill_main_notification_comment (updatedBy_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_notification_comment.createdAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_main_notification_comment.updateAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('ALTER TABLE chill_main_notification_comment ADD CONSTRAINT FK_983BD2CFEF1A9D84 FOREIGN KEY (notification_id) REFERENCES chill_main_notification (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification_comment ADD CONSTRAINT FK_983BD2CF3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification_comment ADD CONSTRAINT FK_983BD2CF65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } +} From cb88a378859db4213c970782a652a1082097e7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 Dec 2021 23:25:12 +0100 Subject: [PATCH 13/71] notification: add comment in show and append comment --- .../Controller/NotificationController.php | 19 ++++++++++++ .../Entity/NotificationComment.php | 15 +++++++++ .../Form/NotificationCommentType.php | 26 ++++++++++++++++ .../views/Notification/show.html.twig | 31 +++++++++++++++++++ .../Authorization/NotificationVoter.php | 29 ++++++++++++----- 5 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Form/NotificationCommentType.php diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index df38c15d9..a2b26832e 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -12,7 +12,9 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\Entity\Notification; +use Chill\MainBundle\Entity\NotificationComment; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Form\NotificationCommentType; use Chill\MainBundle\Form\NotificationType; use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound; use Chill\MainBundle\Notification\NotificationHandlerManager; @@ -177,11 +179,28 @@ class NotificationController extends AbstractController { $this->denyAccessUnlessGranted(NotificationVoter::SEE, $notification); + $notification->addComment($appendComment = new NotificationComment()); + $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment); + $appendCommentForm->handleRequest($request); + + if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) { + $this->em->persist($appendComment); + $this->em->flush(); + + $this->addFlash('success', $this->translator->trans('notification.comment_appended')); + + return $this->redirectToRoute('chill_main_notification_show', [ + 'id' => $notification->getId(), + ]); + } + $response = $this->render('@ChillMain/Notification/show.html.twig', [ 'notification' => $notification, 'handler' => $this->notificationHandlerManager->getHandler($notification), + 'appendCommentForm' => $appendCommentForm->createView(), ]); + // we mark the notification as read after having computed the response if ($this->getUser() instanceof User && !$notification->isReadBy($this->getUser())) { $notification->markAsReadBy($this->getUser()); $this->em->flush(); diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php index 73157eb01..792e4abcc 100644 --- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php +++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php @@ -68,6 +68,16 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac return $this->content; } + public function getCreatedAt(): ?DateTimeImmutable + { + return $this->createdAt; + } + + public function getCreatedBy(): ?User + { + return $this->createdBy; + } + public function getId(): ?int { return $this->id; @@ -83,6 +93,11 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac return $this->updateAt; } + public function getUpdatedBy(): ?User + { + return $this->updatedBy; + } + public function setContent(string $content): self { $this->content = $content; diff --git a/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php new file mode 100644 index 000000000..7aa3a6cb1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/NotificationCommentType.php @@ -0,0 +1,26 @@ +add('content', ChillTextareaType::class, [ + 'required' => false, + ]); + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 1fbe7693b..9dd1c7cf6 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -16,6 +16,37 @@ {{ notification.message|chill_markdown_to_html }}
    + {% if notification.comments|length > 0 %} + {% for comment in notification.comments %} +
    +
    + {{ comment.content|chill_markdown_to_html }} +
    + + {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %} +
      +
    • + +
      • +
    + {% endif %} +
    + {% endfor %} + {% endif %} + + {% if appendCommentForm is defined %} +
    + {{ form_start(appendCommentForm) }} + {{ form_widget(appendCommentForm) }} +
      +
    • + +
      • +
    + {{ form_end(appendCommentForm) }} +
    + {% endif %} +
      -
    • - -
      • + {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %} +
    • + +
      • + {% endif %} + {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', notification) %} +
    • + +
      • + {% endif %}
    diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php index 547a39f82..bc68d906b 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php @@ -22,9 +22,9 @@ final class NotificationVoter extends Voter { public const COMMENT_EDIT = 'CHILL_MAIN_NOTIFICATION_COMMENT_EDIT'; - public const SEE = 'chill_main_notification_see'; + public const SEE = 'CHILL_MAIN_NOTIFICATION_SEE'; - public const UPDATE = 'chill_main_notification_update'; + public const UPDATE = 'CHILL_MAIN_NOTIFICATION_UPDATE'; protected function supports($attribute, $subject): bool { @@ -48,6 +48,9 @@ final class NotificationVoter extends Voter case self::SEE: return $subject->getSender() === $user || $subject->getAddressees()->contains($user); + case self::UPDATE: + return $subject->getSender() === $user; + default: throw new UnexpectedValueException("this subject {$attribute} is not implemented"); } From 8fe94bd117e38d73ad79e564e9de8605d66c952c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 29 Dec 2021 17:36:14 +0100 Subject: [PATCH 19/71] notification: update comment and api endpoint for marking as read/unread --- .../Controller/NotificationApiController.php | 87 +++++++++++++++++ .../Controller/NotificationController.php | 56 ++++++++--- .../views/Notification/show.html.twig | 26 ++++- .../Authorization/NotificationVoter.php | 11 ++- .../NotificationApiControllerTest.php | 96 +++++++++++++++++++ .../ChillMainBundle/chill.api.specs.yaml | 39 ++++++++ .../translations/messages.fr.yml | 3 + 7 files changed, 302 insertions(+), 16 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Controller/NotificationApiController.php create mode 100644 src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php new file mode 100644 index 000000000..8751aa50a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php @@ -0,0 +1,87 @@ +entityManager = $entityManager; + $this->security = $security; + } + + /** + * @Route("/{id}/mark/read", name="chill_api_main_notification_mark_read", methods={"POST"}) + */ + public function markAsRead(Notification $notification): JsonResponse + { + return $this->markAs('read', $notification); + } + + /** + * @Route("/{id}/mark/unread", name="chill_api_main_notification_mark_unread", methods={"POST"}) + */ + public function markAsUnread(Notification $notification): JsonResponse + { + return $this->markAs('unread', $notification); + } + + private function markAs(string $target, Notification $notification): JsonResponse + { + if (!$this->security->isGranted(NotificationVoter::NOTIFICATION_TOGGLE_READ_STATUS, $notification)) { + throw new AccessDeniedException('Not allowed to toggle read status of notification'); + } + + $user = $this->security->getUser(); + + if (!$user instanceof User) { + throw new RuntimeException('not possible to mark as read by this user'); + } + + switch ($target) { + case 'read': + $notification->markAsReadBy($user); + + break; + + case 'unread': + $notification->markAsUnreadBy($user); + + break; + + default: + throw new UnexpectedValueException("target not supported: {$target}"); + } + + $this->entityManager->flush(); + + return new JsonResponse(null, JsonResponse::HTTP_ACCEPTED, [], false); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index be6b60492..dddaf306f 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -125,7 +125,7 @@ class NotificationController extends AbstractController */ public function editAction(Notification $notification, Request $request): Response { - $this->denyAccessUnlessGranted(NotificationVoter::UPDATE, $notification); + $this->denyAccessUnlessGranted(NotificationVoter::NOTIFICATION_UPDATE, $notification); $form = $this->createForm(NotificationType::class, $notification); @@ -207,27 +207,61 @@ class NotificationController extends AbstractController */ public function showAction(Notification $notification, Request $request): Response { - $this->denyAccessUnlessGranted(NotificationVoter::SEE, $notification); + $this->denyAccessUnlessGranted(NotificationVoter::NOTIFICATION_SEE, $notification); - $notification->addComment($appendComment = new NotificationComment()); + $appendComment = new NotificationComment(); $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment); - $appendCommentForm->handleRequest($request); - if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) { - $this->em->persist($appendComment); - $this->em->flush(); + if ($request->query->has('edit')) { + $commentId = $request->query->getInt('edit'); + $editedComment = $notification->getComments()->filter(static function (NotificationComment $c) use ($commentId) { + return $c->getId() === $commentId; + })->first(); - $this->addFlash('success', $this->translator->trans('notification.comment_appended')); + if (false === $editedComment) { + throw $this->createNotFoundException("Comment with id {$commentId} does not exists nor belong to this notification"); + } - return $this->redirectToRoute('chill_main_notification_show', [ - 'id' => $notification->getId(), - ]); + $editedCommentForm = $this->createForm(NotificationCommentType::class, $editedComment); + + if (Request::METHOD_POST === $request->getMethod() && 'edit' === $request->request->get('form')) { + $editedCommentForm->handleRequest($request); + + if ($editedCommentForm->isSubmitted() && $editedCommentForm->isValid()) { + $this->em->flush(); + + $this->addFlash('success', $this->translator->trans('notification.comment_updated')); + + return $this->redirectToRoute('chill_main_notification_show', [ + 'id' => $notification->getId(), + '_fragment' => 'comment-' . $commentId, + ]); + } + } + } + + if (Request::METHOD_POST === $request->getMethod() && 'append' === $request->request->get('form')) { + $appendCommentForm->handleRequest($request); + + if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) { + $notification->addComment($appendComment); + $this->em->persist($appendComment); + $this->em->flush(); + + $this->addFlash('success', $this->translator->trans('notification.comment_appended')); + + return $this->redirectToRoute('chill_main_notification_show', [ + 'id' => $notification->getId(), + ]); + } } $response = $this->render('@ChillMain/Notification/show.html.twig', [ 'notification' => $notification, 'handler' => $this->notificationHandlerManager->getHandler($notification), 'appendCommentForm' => $appendCommentForm->createView(), + 'editedCommentForm' => isset($editedCommentForm) ? $editedCommentForm->createView() : null, + 'editedCommentId' => $commentId ?? null, ]); // we mark the notification as read after having computed the response diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 9dd1c7cf6..86fafd031 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -18,7 +18,9 @@ {% if notification.comments|length > 0 %} {% for comment in notification.comments %} + {% if editedCommentForm is null or editedCommentId != comment.id %}
    +
    {{ comment.content|chill_markdown_to_html }}
    @@ -26,11 +28,30 @@ {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
    • - +
    {% endif %}
    + {% else %} +
    + + {{ form_start(editedCommentForm) }} + {{ form_widget(editedCommentForm) }} + + + +
      +
    • + +
      • +
    • + +
      • +
    + {{ form_end(editedCommentForm) }} +
    + {% endif %} {% endfor %} {% endif %} @@ -38,6 +59,9 @@
    {{ form_start(appendCommentForm) }} {{ form_widget(appendCommentForm) }} + + +
    • diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php index bc68d906b..d0b283c24 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php @@ -22,9 +22,11 @@ final class NotificationVoter extends Voter { public const COMMENT_EDIT = 'CHILL_MAIN_NOTIFICATION_COMMENT_EDIT'; - public const SEE = 'CHILL_MAIN_NOTIFICATION_SEE'; + public const NOTIFICATION_SEE = 'CHILL_MAIN_NOTIFICATION_SEE'; - public const UPDATE = 'CHILL_MAIN_NOTIFICATION_UPDATE'; + public const NOTIFICATION_TOGGLE_READ_STATUS = 'CHILL_MAIIN_NOTIFICATION_TOGGLE_READ_STATUS'; + + public const NOTIFICATION_UPDATE = 'CHILL_MAIN_NOTIFICATION_UPDATE'; protected function supports($attribute, $subject): bool { @@ -45,10 +47,11 @@ final class NotificationVoter extends Voter if ($subject instanceof Notification) { switch ($attribute) { - case self::SEE: + case self::NOTIFICATION_SEE: + case self::NOTIFICATION_TOGGLE_READ_STATUS: return $subject->getSender() === $user || $subject->getAddressees()->contains($user); - case self::UPDATE: + case self::NOTIFICATION_UPDATE: return $subject->getSender() === $user; default: diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php new file mode 100644 index 000000000..ea06f1e4f --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php @@ -0,0 +1,96 @@ +get(EntityManagerInterface::class); + + foreach ($this->toDelete as [$className, $id]) { + $object = $em->find($className, $id); + $em->remove($object); + } + + $em->flush(); + } + + public function generateDataMarkAsRead() + { + self::bootKernel(); + $em = self::$container->get(EntityManagerInterface::class); + $userRepository = self::$container->get(UserRepository::class); + $userA = $userRepository->findOneBy(['username' => 'center a_social']); + $userB = $userRepository->findOneBy(['username' => 'center b_social']); + + $notification = new Notification(); + $notification + ->setMessage('Test generated') + ->setRelatedEntityClass(AccompanyingPeriod::class) + ->setRelatedEntityId(0) + ->setSender($userB) + ->addAddressee($userA); + $em->persist($notification); + $em->refresh($notification); + $em->flush(); + + $this->toDelete[] = [Notification::class, $notification->getId()]; + + yield [$notification->getId()]; + } + + /** + * @dataProvider generateDataMarkAsRead + */ + public function testMarkAsReadOrUnRead(int $notificationId) + { + $client = $this->getClientAuthenticated(); + $client->request('POST', "/api/1.0/main/notification/{$notificationId}/mark/read"); + + $this->assertResponseIsSuccessful('test marking as read'); + + $em = self::$container->get(EntityManagerInterface::class); + /** @var Notification $notification */ + $notification = $em->find(Notification::class, $notificationId); + $user = self::$container->get(UserRepository::class)->findOneBy(['username' => 'center a_social']); + + $this->assertTrue($notification->isReadBy($user)); + + $client->request('POST', "/api/1.0/main/notification/{$notificationId}/mark/unread"); + + $this->assertResponseIsSuccessful('test marking as unread'); + + $notification = $em->find(Notification::class, $notificationId); + $user = $em->find(User::class, $user->getId()); + $em->refresh($notification); + $em->refresh($user); + + $this->assertFalse($notification->isReadBy($user)); + } +} diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml index db4430e48..753cb855c 100644 --- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml +++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml @@ -733,4 +733,43 @@ paths: class: 'Chill\PersonBundle\Entity\AccompanyingPeriod' roles: - 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE' + /1.0/main/notification/{id}/mark/read: + post: + tags: + - notification + summary: mark a notification as read + parameters: + - name: id + in: path + required: true + description: The notification id + schema: + type: integer + format: integer + minimum: 1 + responses: + 202: + description: "accepted" + 403: + description: "unauthorized" + /1.0/main/notification/{id}/mark/unread: + post: + tags: + - notification + summary: mark a notification as unread + parameters: + - name: id + in: path + required: true + description: The notification id + schema: + type: integer + format: integer + minimum: 1 + responses: + 202: + description: "accepted" + 403: + description: "unauthorized" + diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 9b810a837..2094e42fe 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -359,3 +359,6 @@ notification: Any notification sent: Aucune notification envoyée Notifications received: Notifications reçues Notifications sent: Notification envoyées + comment_appended: Commentaire ajouté + comment_updated: Commentaire mis à jour + From 9ddfd194befe17df06276ab0ac8cbcf6fe8bcaf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 29 Dec 2021 18:51:25 +0100 Subject: [PATCH 20/71] notification: small vue component to toggle read status of a notification --- .../public/module/notification/toggle_read.js | 38 +++++++++++++++++ .../Notification/NotificationReadToggle.vue | 42 +++++++++++++++++++ .../views/Notification/list.html.twig | 13 ++++++ .../views/Notification/show.html.twig | 13 ++++++ .../Resources/views/layout.html.twig | 2 +- .../ChillMainBundle/chill.webpack.config.js | 4 +- 6 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js new file mode 100644 index 000000000..6d1637494 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js @@ -0,0 +1,38 @@ +import {createApp} from "vue"; +import NotificationReadToggle from "ChillMainAssets/vuejs/_components/Notification/NotificationReadToggle.vue"; + +const App = { + template: '', + components: { + NotificationReadToggle, + }, + methods: { + onMarkRead() { + this.isRead = true; + }, + onMarkUnread() { + this.isRead = false; + }, + } +} + +window.addEventListener('DOMContentLoaded', function (e) { + document.querySelectorAll('.notification_toggle_read_status') + .forEach(function (app) { + console.log('app', app); + const myApp = Object.assign(App, { + data() { + return { + notificationId: +app.dataset.notificationId, + isRead: 1 === +app.dataset.notificationCurrentIsRead, + } + } + }) + + createApp(myApp).mount(app); + }); +}) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue new file mode 100644 index 000000000..d88c9916c --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 064adcee1..915f42c25 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -2,6 +2,16 @@ {% block title 'notification.List'|trans %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% block content %}
      @@ -66,6 +76,9 @@
        +
      • + +
        • {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %}
      • diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 86fafd031..4fa354e67 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -2,6 +2,16 @@ {% block title 'notification.show notification from %sender%'|trans({ '%sender%': notification.sender|chill_entity_render_string }) %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% block content %}
        @@ -77,6 +87,9 @@ {{ 'Cancel'|trans|chill_return_path_label }}
        • +
      • + +
      diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 07b7970d8..a123ce405 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -106,6 +106,6 @@ }); - {% block js%}{% endblock %} + {% block js %}{% endblock %} diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index dfa113206..adc4ba3c8 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -61,10 +61,10 @@ module.exports = function(encore, entries) encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/module/ckeditor5/index.js'); encore.addEntry('mod_disablebuttons', __dirname + '/Resources/public/module/disable-buttons/index.js'); encore.addEntry('mod_blur', __dirname + '/Resources/public/module/blur/index.js'); - encore.addEntry('mod_input_address', __dirname + '/Resources/public/vuejs/Address/mod_input_address_index.js'); + encore.addEntry('mod_notification_toggle_read_status', __dirname + '/Resources/public/module/notification/toggle_read.js'); + // Vue entrypoints encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js'); encore.addEntry('vue_onthefly', __dirname + '/Resources/public/vuejs/OnTheFly/index.js'); - }; From 1576507f7efa0b1d250f7a48c9ff91ac4992daaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 29 Dec 2021 23:09:26 +0100 Subject: [PATCH 21/71] notification: fix widget toggle read status --- .../public/module/notification/toggle_read.js | 49 +++++++++---------- .../Notification/NotificationReadToggle.vue | 4 +- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js index 6d1637494..48bbf20fa 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js @@ -1,38 +1,35 @@ import {createApp} from "vue"; import NotificationReadToggle from "ChillMainAssets/vuejs/_components/Notification/NotificationReadToggle.vue"; -const App = { - template: '', - components: { - NotificationReadToggle, - }, - methods: { - onMarkRead() { - this.isRead = true; - }, - onMarkUnread() { - this.isRead = false; - }, - } -} - window.addEventListener('DOMContentLoaded', function (e) { document.querySelectorAll('.notification_toggle_read_status') - .forEach(function (app) { - console.log('app', app); - const myApp = Object.assign(App, { + .forEach(function (el) { + console.log('app', el); + const App = { + template: '', + components: { + NotificationReadToggle, + }, data() { return { - notificationId: +app.dataset.notificationId, - isRead: 1 === +app.dataset.notificationCurrentIsRead, + notificationId: +el.dataset.notificationId, + isRead: 1 === +el.dataset.notificationCurrentIsRead, } + }, + methods: { + onMarkRead() { + this.isRead = false; + }, + onMarkUnread() { + this.isRead = true; + }, } - }) + } - createApp(myApp).mount(app); + createApp(App).mount(el); }); }) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue index d88c9916c..730ba2881 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue @@ -23,14 +23,12 @@ export default { methods: { markAsUnread() { makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/unread`, []).then(response => { - console.log('marked as unread', this.notificationId); this.$emit('markRead', { notificationId: this.notificationId }); }) }, markAsRead() { makeFetch('POST', `/api/1.0/main/notification/${this.notificationId}/mark/read`, []).then(response => { - console.log('marked as read', this.notificationId); - this.$emit('markRead', { notificationId: this.notificationId }); + this.$emit('markUnread', { notificationId: this.notificationId }); }) }, }, From 7bc4ad97799e1ed5d8be0a50a5a8581feefea885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 30 Dec 2021 01:02:16 +0100 Subject: [PATCH 22/71] twig extension for listing notification on a given entity --- .../Notification/NotificationPresence.php | 40 +++++++++++++++++++ .../Templating/NotificationTwigExtension.php | 19 +++++++++ .../NotificationTwigExtensionRuntime.php | 31 ++++++++++++++ .../Repository/NotificationRepository.php | 23 +++++++++++ ...extension_list_notifications_for.html.twig | 17 ++++++++ .../config/services/notification.yaml | 6 +++ .../views/AccompanyingCourse/index.html.twig | 15 +++++-- 7 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Notification/NotificationPresence.php create mode 100644 src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php create mode 100644 src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php new file mode 100644 index 000000000..e003a5afc --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php @@ -0,0 +1,40 @@ +security = $security; + $this->notificationRepository = $notificationRepository; + } + + /** + * @return array|Notification[] + */ + public function getNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId): array + { + if ($this->security->getUser() instanceof User) { + return $this->notificationRepository->findNotificationAsAddresseeByRelatedEntityAndUser( + $relatedEntityClass, + $relatedEntityId, + $this->security->getUser() + ); + } + + return []; + } +} diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php new file mode 100644 index 000000000..529da2bc1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php @@ -0,0 +1,19 @@ + true, + 'is_safe' => ['html'], + ]), + ]; + } +} diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php new file mode 100644 index 000000000..b3ef0f84e --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php @@ -0,0 +1,31 @@ +notificationPresence = $notificationPresence; + } + + public function listNotificationsFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string + { + $notifications = $this->notificationPresence->getNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId); + + if ([] === $notifications) { + return ''; + } + + return $environment->render('@ChillMain/Notification/extension_list_notifications_for.html.twig', [ + 'notifications' => $notifications, + ]); + } + +} diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index eea2d41e1..755b5f2dd 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -133,6 +133,29 @@ final class NotificationRepository implements ObjectRepository return $query->getQuery()->getResult(); } + /** + * @param string $relatedEntityClass + * @param int $relatedEntityId + * @param User $user + * @return array|Notification[] + */ + public function findNotificationAsAddresseeByRelatedEntityAndUser(string $relatedEntityClass, int $relatedEntityId, User $user): array + { + $qb = $this->repository->createQueryBuilder('n'); + + $qb + ->select('n') + ->where($qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass')) + ->andWhere($qb->expr()->eq('n.relatedEntityId', ':relatedEntityId')) + ->andWhere($qb->expr()->isMemberOf(':user', 'n.addressees')) + ->setParameter('relatedEntityClass', $relatedEntityClass) + ->setParameter('relatedEntityId', $relatedEntityId) + ->setParameter('user', $user) + ; + + return $qb->getQuery()->getResult(); + } + /** * @param mixed|null $limit * @param mixed|null $offset diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig new file mode 100644 index 000000000..db6aa5d13 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -0,0 +1,17 @@ +
      + {% for notification in notifications %} +
      +
      {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
      +
      +
        +
      • + +
        • +
      • + +
        • +
      +
      +
      + {% endfor %} +
      diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index 5d4390877..4ec90de41 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -16,3 +16,9 @@ services: Chill\MainBundle\Notification\NotificationHandlerManager: arguments: $handlers: !tagged_iterator chill_main.notification_handler + + Chill\MainBundle\Notification\NotificationPresence: ~ + + Chill\MainBundle\Notification\Templating\NotificationTwigExtension: ~ + + Chill\MainBundle\Notification\Templating\NotificationTwigExtensionRuntime: ~ diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 6b143469b..821b80b12 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -13,14 +13,23 @@ {% endmacro %} {% block js %} -{{ parent() }} -{{ encore_entry_script_tags('page_accompanying_course_index_person_locate') }} -{{ encore_entry_script_tags('page_accompanying_course_index_masonry') }} + {{ parent() }} + {{ encore_entry_script_tags('page_accompanying_course_index_person_locate') }} + {{ encore_entry_script_tags('page_accompanying_course_index_masonry') }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} + {% endblock %} {% block content %}
      + {{ chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} +
      {% if 'DRAFT' == accompanyingCourse.step %}
      From 5bf1b9d8bd3acf5d38549f935945e1425b9c07fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 30 Dec 2021 02:10:35 +0100 Subject: [PATCH 23/71] send system notification on period confirmation --- .../ChillMainBundle/Entity/Notification.php | 26 ++++++- .../Notification/NotificationPresence.php | 15 +++- .../Templating/NotificationTwigExtension.php | 9 +++ .../NotificationTwigExtensionRuntime.php | 10 ++- .../Repository/NotificationRepository.php | 28 +++---- ...extension_list_notifications_for.html.twig | 6 +- .../migrations/Version20211230003532.php | 38 +++++++++ .../Workflow/WorkflowEventSubscriber.php | 77 +++++++++++++++++++ .../accompanying_course_designation.md.twig | 12 +++ .../Workflow/WorkflowEventSubscriberTest.php | 22 ++++++ .../config/services/accompanyingPeriod.yaml | 6 ++ .../translations/messages.fr.yml | 7 ++ 12 files changed, 233 insertions(+), 23 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20211230003532.php create mode 100644 src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig create mode 100644 src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index bf7aac4b3..e566a8d78 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -74,9 +74,14 @@ class Notification implements TrackUpdateInterface /** * @ORM\ManyToOne(targetEntity=User::class) - * @ORM\JoinColumn(nullable=false) + * @ORM\JoinColumn(nullable=true) */ - private User $sender; + private ?User $sender = null; + + /** + * @ORM\Column(type="text", options={"default": ""}) + */ + private string $title = ''; /** * @ORM\ManyToMany(targetEntity=User::class) @@ -179,6 +184,11 @@ class Notification implements TrackUpdateInterface return $this->sender; } + public function getTitle(): string + { + return $this->title; + } + public function getUnreadBy(): Collection { return $this->unreadBy; @@ -199,6 +209,11 @@ class Notification implements TrackUpdateInterface return !$this->unreadBy->contains($user); } + public function isSystem(): bool + { + return null === $this->sender; + } + public function markAsReadBy(User $user): self { return $this->removeUnreadBy($user); @@ -299,6 +314,13 @@ class Notification implements TrackUpdateInterface return $this; } + public function setTitle(string $title): Notification + { + $this->title = $title; + + return $this; + } + public function setUpdatedAt(DateTimeInterface $datetime): self { $this->updatedAt = $datetime; diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php index e003a5afc..afb6eba19 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php @@ -1,5 +1,14 @@ security = $security; diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php index 529da2bc1..115adf06b 100644 --- a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php +++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtension.php @@ -1,5 +1,14 @@ $notifications, ]); } - } diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index 755b5f2dd..68c6b8be6 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -134,9 +134,17 @@ final class NotificationRepository implements ObjectRepository } /** - * @param string $relatedEntityClass - * @param int $relatedEntityId - * @param User $user + * @param mixed|null $limit + * @param mixed|null $offset + * + * @return Notification[] + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + /** * @return array|Notification[] */ public function findNotificationAsAddresseeByRelatedEntityAndUser(string $relatedEntityClass, int $relatedEntityId, User $user): array @@ -150,23 +158,11 @@ final class NotificationRepository implements ObjectRepository ->andWhere($qb->expr()->isMemberOf(':user', 'n.addressees')) ->setParameter('relatedEntityClass', $relatedEntityClass) ->setParameter('relatedEntityId', $relatedEntityId) - ->setParameter('user', $user) - ; + ->setParameter('user', $user); return $qb->getQuery()->getResult(); } - /** - * @param mixed|null $limit - * @param mixed|null $offset - * - * @return Notification[] - */ - public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array - { - return $this->repository->findBy($criteria, $orderBy, $limit, $offset); - } - public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification { return $this->repository->findOneBy($criteria, $orderBy); diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index db6aa5d13..5e5d1dba8 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -1,7 +1,11 @@
      {% for notification in notifications %}
      -
      {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
      + {% if not notification.isSystem %} +
      {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
      + {% else %} +
      {{ 'notification.you were notified by system'|trans }}
      + {% endif %}
      • diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php b/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php new file mode 100644 index 000000000..20d75749c --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20211230003532.php @@ -0,0 +1,38 @@ +addSql('ALTER TABLE chill_main_notification DROP title'); + $this->addSql('ALTER TABLE chill_main_notification ALTER sender_id SET NOT NULL'); + $this->addSql('ALTER TABLE chill_main_notification ALTER updatedAt DROP NOT NULL'); + } + + public function getDescription(): string + { + return 'Add title and allow system notification (sender is null)'; + } + + public function up(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_main_notification ADD title TEXT DEFAULT \'\' NOT NULL'); + $this->addSql('ALTER TABLE chill_main_notification ALTER sender_id DROP NOT NULL'); + $this->addSql('UPDATE chill_main_notification set updatedat="date"'); + $this->addSql('ALTER TABLE chill_main_notification ALTER updatedat SET NOT NULL'); + } +} diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php new file mode 100644 index 000000000..d49cc8c0a --- /dev/null +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php @@ -0,0 +1,77 @@ +security = $security; + $this->translator = $translator; + $this->engine = $engine; + $this->em = $em; + } + + public static function getSubscribedEvents() + { + return [ + 'workflow.accompanying_period_lifecycle.entered' => [ + 'onStateEntered', + ], + ]; + } + + public function onStateEntered(EnteredEvent $enteredEvent): void + { + if ($enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)) { + $this->onPeriodConfirmed($enteredEvent->getSubject()); + } + } + + private function onPeriodConfirmed(AccompanyingPeriod $period) + { + if ($period->getUser() instanceof User + && $period->getUser() !== $this->security->getUser()) { + $notification = new Notification(); + $notification + ->setRelatedEntityId($period->getId()) + ->setRelatedEntityClass(AccompanyingPeriod::class) + ->setTitle($this->translator->trans('period_notification.period designated_subject')) + ->setMessage($this->engine->render( + '@ChillPerson/Notification/accompanying_course_designation.md.twig', + [ + 'accompanyingCourse' => $period, + ] + )) + ->addAddressee($period->getUser()); + $this->em->persist($notification); + } + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig new file mode 100644 index 000000000..515f57b0c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig @@ -0,0 +1,12 @@ +{{ 'period_notification.You are designated to a new period.'|trans }} + +{{ 'period_notification.See it online'|trans }}: {{ path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, true) }} + +{{ 'period_notification.Persons are'|trans }}: + +{% for p in accompanyingCourse.getCurrentParticipations %} +* {{ p.person|chill_entity_render_string }} +{% endfor %} + +{{ 'period_notification.Social issues are'|trans }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}. + diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php new file mode 100644 index 000000000..8867872d3 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php @@ -0,0 +1,22 @@ + Date: Mon, 3 Jan 2022 15:42:24 +0100 Subject: [PATCH 24/71] add component and type to add user dynamically --- .../ChillMainBundle/Form/NotificationType.php | 6 +- .../DataTransformer/UserToJsonTransformer.php | 70 +++++++++++++ .../Form/Type/PickUserDynamicType.php | 59 +++++++++++ .../public/module/pick-entity/index.js | 59 +++++++++++ .../public/vuejs/PickEntity/PickEntity.vue | 97 +++++++++++++++++++ .../Resources/public/vuejs/PickEntity/i18n.js | 17 ++++ .../Resources/views/Form/fields.html.twig | 5 + .../views/Notification/create.html.twig | 10 ++ .../views/Notification/edit.html.twig | 10 ++ .../ChillMainBundle/chill.webpack.config.js | 1 + .../ChillMainBundle/config/services.yaml | 4 +- .../public/vuejs/_components/AddPersons.vue | 2 + 12 files changed, 334 insertions(+), 6 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php create mode 100644 src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php create mode 100644 src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php index b54752cde..fa06007a2 100644 --- a/src/Bundle/ChillMainBundle/Form/NotificationType.php +++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php @@ -14,6 +14,7 @@ namespace Chill\MainBundle\Form; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Form\Type\ChillTextareaType; +use Chill\MainBundle\Form\Type\PickUserDynamicType; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -24,11 +25,8 @@ class NotificationType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('addressees', EntityType::class, [ - 'class' => User::class, - 'choice_label' => 'label', + ->add('addressees', PickUserDynamicType::class, [ 'multiple' => true, - 'by_reference' => true, ]) ->add('message', ChillTextareaType::class, [ 'required' => false, diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php new file mode 100644 index 000000000..497cbcdd9 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php @@ -0,0 +1,70 @@ +denormalizer = $denormalizer; + $this->serializer = $serializer; + $this->multiple = $multiple; + } + + /** + * @param User|User[] $value + */ + public function transform($value): string + { + if (null === $value) { + return $this->multiple ? "null" : "[]"; + } + + return $this->serializer->serialize($value, 'json', [ + AbstractNormalizer::GROUPS => ['read'], + ]); + } + + public function reverseTransform($value) + { + if ($this->multiple) { + return \array_map( + function($item) { return $this->denormalizeOne($item);}, + json_decode($value, true) + ); + } + + return $this->denormalizeOne(json_decode($value, true)); + } + + private function denormalizeOne(array $item): User + { + if (!array_key_exists('type', $item)) { + throw new TransformationFailedException('the key "type" is missing on element'); + } + if (!array_key_exists('id', $item)) { + throw new TransformationFailedException('the key "id" is missing on element'); + } + + return + $this->denormalizer->denormalize( + ['type' => $item['type'], 'id' => $item['id']], + User::class, + 'json', + [AbstractNormalizer::GROUPS => ['read']], + ); + } +} diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php new file mode 100644 index 000000000..0ddff7b1e --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php @@ -0,0 +1,59 @@ +denormalizer = $denormalizer; + $this->serializer = $serializer; + } + + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->addViewTransformer(new UserToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'])); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('multiple', false) + ->setAllowedTypes('multiple', ['bool']) + ->setDefault('compound', false) + ; + } + + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['multiple'] = $options['multiple']; + $view->vars['types'] = ['user']; + $view->vars['uniqid'] = uniqid('pick_user_dyn'); + } + + public function getBlockPrefix() + { + return 'pick_user_dynamic'; + } + +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js new file mode 100644 index 000000000..26cbff735 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js @@ -0,0 +1,59 @@ +import {createApp} from 'vue'; +import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue'; +import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n' +import {activityMessages} from "../../../../../ChillActivityBundle/Resources/public/vuejs/Activity/i18n"; + +window.addEventListener('DOMContentLoaded', function(e) { + let + apps = document.querySelectorAll('[data-module="pick-dynamic"]'); + + apps.forEach(function(el) { + const + isMultiple = parseInt(el.dataset.multiple) === 1, + input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'), + picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)], + i18n = _createI18n({}); + + createApp({ + template: '', + components: { + PickEntity, + }, + data() { + return { + multiple: isMultiple, + types: JSON.parse(el.dataset.types), + picked, + uniqid: el.dataset.uniqid, + } + }, + methods: { + addNewEntity(entity) { + console.log('addNewEntity', entity); + if (this.multiple) { + console.log('adding multiple'); + if (!this.picked.some(el => { + return el.type === entity.type && el.id === entity.id; + })) { + this.picked.push(entity); + input.value = JSON.stringify(this.picked); + } + } else { + if (!this.picked.some(el => { + return el.type === entity.type && el.id === entity.id; + })) { + this.picked.splice(0, this.picked.length); + this.picked.push(entity); + input.value = JSON.stringify(this.picked[0]); + } + } + }, + removeEntity(entity) { + console.log('removeEntity', entity); + this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id)); + input.value = JSON.stringify(this.picked); + }, + } + }).use(i18n).mount(el); + }); +}); diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue new file mode 100644 index 000000000..32dad3c36 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js new file mode 100644 index 000000000..78a0a9c90 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js @@ -0,0 +1,17 @@ +import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' + +const messages = { + fr: { + pick_entity: { + add: 'Ajouter', + modal_title: 'Ajouter des', + user: 'Utilisateurs', + person: 'Usagers', + thirdparty: 'Tiers', + } + } +} + +const full = Object.assign(messages, personMessages); + +export default full; diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig index 1426841bb..25f1363c3 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig @@ -215,3 +215,8 @@ {{ form_widget(form.center) }} {% endif %} {% endblock %} + +{% block pick_user_dynamic_widget %} + +
        +{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig index a6a52acf7..db06caefa 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig @@ -1,5 +1,15 @@ {% extends "@ChillMain/layout.html.twig" %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_pickentity_type') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_pickentity_type') }} +{% endblock %} + {% block content %}
        diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig index a6a52acf7..db06caefa 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig @@ -1,5 +1,15 @@ {% extends "@ChillMain/layout.html.twig" %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_pickentity_type') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_pickentity_type') }} +{% endblock %} + {% block content %}
        diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index adc4ba3c8..47aa32865 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -63,6 +63,7 @@ module.exports = function(encore, entries) encore.addEntry('mod_blur', __dirname + '/Resources/public/module/blur/index.js'); encore.addEntry('mod_input_address', __dirname + '/Resources/public/vuejs/Address/mod_input_address_index.js'); encore.addEntry('mod_notification_toggle_read_status', __dirname + '/Resources/public/module/notification/toggle_read.js'); + encore.addEntry('mod_pickentity_type', __dirname + '/Resources/public/module/pick-entity/index.js'); // Vue entrypoints encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js'); diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml index 8ee24d7b7..adf38988e 100644 --- a/src/Bundle/ChillMainBundle/config/services.yaml +++ b/src/Bundle/ChillMainBundle/config/services.yaml @@ -18,8 +18,8 @@ services: Chill\MainBundle\Form\Type\: resource: '../Form/Type' - tags: - - { name: form.type } + autoconfigure: true + autowire: true Chill\MainBundle\Doctrine\Event\: resource: '../Doctrine/Event/' diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index f118671ed..f384aae54 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -93,9 +93,11 @@ import PersonSuggestion from './AddPersons/PersonSuggestion'; import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons'; import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly"; import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly"; +import {messages} from 'ChillPersonAssets/vuejs/_js/i18n.js'; export default { name: 'AddPersons', + messages, components: { Modal, PersonSuggestion, From 0edd5667e00faaf0fe675254ac99b9cacba87902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 11:09:59 +0100 Subject: [PATCH 25/71] fix cs --- .../ChillMainBundle/Form/NotificationType.php | 2 - .../DataTransformer/UserToJsonTransformer.php | 47 ++++++++++++------- .../Form/Type/PickUserDynamicType.php | 36 +++++++------- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php index fa06007a2..09d6a0341 100644 --- a/src/Bundle/ChillMainBundle/Form/NotificationType.php +++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php @@ -12,10 +12,8 @@ declare(strict_types=1); namespace Chill\MainBundle\Form; use Chill\MainBundle\Entity\Notification; -use Chill\MainBundle\Entity\User; use Chill\MainBundle\Form\Type\ChillTextareaType; use Chill\MainBundle\Form\Type\PickUserDynamicType; -use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php index 497cbcdd9..df670f891 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php +++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php @@ -1,5 +1,14 @@ denormalizer = $denormalizer; @@ -24,25 +34,11 @@ class UserToJsonTransformer implements DataTransformerInterface $this->multiple = $multiple; } - /** - * @param User|User[] $value - */ - public function transform($value): string - { - if (null === $value) { - return $this->multiple ? "null" : "[]"; - } - - return $this->serializer->serialize($value, 'json', [ - AbstractNormalizer::GROUPS => ['read'], - ]); - } - public function reverseTransform($value) { if ($this->multiple) { - return \array_map( - function($item) { return $this->denormalizeOne($item);}, + return array_map( + function ($item) { return $this->denormalizeOne($item); }, json_decode($value, true) ); } @@ -50,11 +46,26 @@ class UserToJsonTransformer implements DataTransformerInterface return $this->denormalizeOne(json_decode($value, true)); } + /** + * @param User|User[] $value + */ + public function transform($value): string + { + if (null === $value) { + return $this->multiple ? 'null' : '[]'; + } + + return $this->serializer->serialize($value, 'json', [ + AbstractNormalizer::GROUPS => ['read'], + ]); + } + private function denormalizeOne(array $item): User { if (!array_key_exists('type', $item)) { throw new TransformationFailedException('the key "type" is missing on element'); } + if (!array_key_exists('id', $item)) { throw new TransformationFailedException('the key "id" is missing on element'); } diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php index 0ddff7b1e..52798608e 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php +++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php @@ -1,29 +1,35 @@ denormalizer = $denormalizer; @@ -35,15 +41,6 @@ class PickUserDynamicType extends AbstractType $builder->addViewTransformer(new UserToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'])); } - public function configureOptions(OptionsResolver $resolver) - { - $resolver - ->setDefault('multiple', false) - ->setAllowedTypes('multiple', ['bool']) - ->setDefault('compound', false) - ; - } - public function buildView(FormView $view, FormInterface $form, array $options) { $view->vars['multiple'] = $options['multiple']; @@ -51,9 +48,16 @@ class PickUserDynamicType extends AbstractType $view->vars['uniqid'] = uniqid('pick_user_dyn'); } + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('multiple', false) + ->setAllowedTypes('multiple', ['bool']) + ->setDefault('compound', false); + } + public function getBlockPrefix() { return 'pick_user_dynamic'; } - } From 5fead5b467be07492e1a009319e666b6100bb728 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 4 Jan 2022 11:18:56 +0100 Subject: [PATCH 26/71] fix translation, disable throw exception --- .../Controller/AccompanyingCourseCommentController.php | 7 ++++--- .../views/AccompanyingCourse/comment_list.html.twig | 2 +- src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php index 65e83cdbc..c71be5f94 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php @@ -55,9 +55,10 @@ class AccompanyingCourseCommentController extends AbstractController } } - if (null === $editForm) { - throw new NotFoundHttpException('Unable to find an edit form.'); - } + dump($editForm); + //if (null === $editForm) { + // throw new NotFoundHttpException('Unable to find an edit form.'); + //} if ($request->getMethod() === Request::METHOD_POST) { $currentForm = $editForm->handleRequest($request); diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig index 9fc9a1c77..a45aef6bb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/comment_list.html.twig @@ -20,7 +20,7 @@
        • {% endif %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index f461e5bec..c05500205 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -412,6 +412,7 @@ fix it: Compléter Accompanying Course Comment: Commentaire Accompanying Course Comment list: Commentaires du parcours pinned: épinglé +Pin comment: Épingler Post a new comment: Poster un nouveau commentaire Write a new comment: Écrire un nouveau commentaire Edit a comment: Modifier le commentaire From 5bb54681987c3d30b0119c96fde3d692f57d3afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 11:32:15 +0100 Subject: [PATCH 27/71] notificaiton: add title to list and forms --- .../ChillMainBundle/Form/NotificationType.php | 5 ++++ .../views/Notification/create.html.twig | 1 + .../views/Notification/edit.html.twig | 1 + .../views/Notification/list.html.twig | 23 ++++++++++++------- .../views/Notification/show.html.twig | 4 ++-- .../translations/messages.fr.yml | 1 + 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php index 09d6a0341..b24513524 100644 --- a/src/Bundle/ChillMainBundle/Form/NotificationType.php +++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php @@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Form\Type\ChillTextareaType; use Chill\MainBundle\Form\Type\PickUserDynamicType; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -23,6 +24,10 @@ class NotificationType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder + ->add('title', TextType::class, [ + 'label' => 'Title', + 'required' => true, + ]) ->add('addressees', PickUserDynamicType::class, [ 'multiple' => true, ]) diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig index db06caefa..edf9f3581 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig @@ -17,6 +17,7 @@ {{ form_start(form, { 'attr': { 'id': 'notification' }}) }} + {{ form_row(form.title) }} {{ form_row(form.addressees) }} {{ form_row(form.message) }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig index db06caefa..edf9f3581 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig @@ -17,6 +17,7 @@ {{ form_start(form, { 'attr': { 'id': 'notification' }}) }} + {{ form_row(form.title) }} {{ form_row(form.addressees) }} {{ form_row(form.message) }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 915f42c25..836883846 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -53,16 +53,23 @@ {% set notification = data.notification %}
        -
        +

        + + {{ notification.title }} + + {% if not notification.isReadBy(app.user) %} +
        {{ 'notification.is_unread'|trans }}
        + {% endif %} +

        +
        +
        +
        {% if step == 'inbox' %} {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }} {% endif %} - {% if not notification.isReadBy(app.user) %} -
        {{ 'notification.is_unread'|trans }}
        - {% endif %}
        -
        {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
        -
        {{ notification.date|format_datetime('long', 'short') }}
        +
        {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
        +
        {{ notification.date|format_datetime('long', 'short') }}
        @@ -71,10 +78,10 @@
        -
        +
        {% include data.template with data.template_data %}
        -
        +
        • diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 4fa354e67..96357233a 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -1,6 +1,6 @@ {% extends "@ChillMain/layout.html.twig" %} -{% block title 'notification.show notification from %sender%'|trans({ '%sender%': notification.sender|chill_entity_render_string }) %} +{% block title 'notification.show notification from %sender%'|trans({ '%sender%': notification.sender|chill_entity_render_string })~' '~notification.title %} {% block js %} {{ parent() }} @@ -15,7 +15,7 @@ {% block content %}
          -

          {{ 'notification.Notification'|trans }}

          +

          {{ notification.title }}

          {% include handler.getTemplate(notification) with handler.getTemplateData(notification) %} diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 2094e42fe..0bd15b74b 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -361,4 +361,5 @@ notification: Notifications sent: Notification envoyées comment_appended: Commentaire ajouté comment_updated: Commentaire mis à jour + is_unread: Non-lue From 68ea0a1086051bf4f645daa19c4b1a46c610463e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 4 Jan 2022 12:07:37 +0100 Subject: [PATCH 28/71] wip delete comment --- .../AccompanyingCourseCommentController.php | 38 ++++++++++++++++++- .../confirm_delete_comment.html.twig | 16 ++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_comment.html.twig diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php index c71be5f94..55bb936b0 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php @@ -16,6 +16,7 @@ use Chill\PersonBundle\Form\AccompanyingCourseCommentType; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -27,7 +28,7 @@ use function array_key_exists; class AccompanyingCourseCommentController extends AbstractController { /** - * Comments page of Accompanying Course section. + * Page of comments in Accompanying Course section. * * @Route("/{_locale}/parcours/{accompanying_period_id}/comments", name="chill_person_accompanying_period_comment_list") * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"}) @@ -101,4 +102,39 @@ class AccompanyingCourseCommentController extends AbstractController return $form; } + + ////////////// building + /** + * Delete an existing comment + * + * @Route( + * "/{_locale}/parcours/{accompanying_period_id}/comment/{comment_id}/delete", + * name="chill_person_accompanying_period_comment_delete" + * ) + * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"}) + * @ParamConverter("comment", options={"id": "comment_id"}) + */ + public function deleteAction(AccompanyingPeriod $accompanyingCourse, AccompanyingPeriod\Comment $comment, Request $request) + { + $form = $this->createDeleteForm($comment->getId(), $accompanyingCourse); + + return $this->render('@ChillPerson/AccompanyingCourse/confirm_delete_comment.html.twig', [ + 'comment' => $comment, + 'delete_form' => $form->createView(), + 'accompanyingCourse' => $accompanyingCourse, + ]); + } + + private function createDeleteForm(int $id, ?AccompanyingPeriod $accompanyingCourse): FormInterface + { + $form = $this->createForm($type); + + return $this->createFormBuilder() + ->setAction($this->generateUrl('chill_person_accompanying_period_comment_delete', $params)) + ->setMethod('DELETE') + ->add('submit', SubmitType::class, ['label' => 'Delete']) + ->getForm(); + } + + //// end } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_comment.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_comment.html.twig new file mode 100644 index 000000000..fd5259c70 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_comment.html.twig @@ -0,0 +1,16 @@ +{% extends "@ChillPerson/Person/layout.html.twig" %} + +{% set person = activity.person %} + +{% block title 'Remove comment'|trans %} + +{% block personcontent %} + {{ include('@ChillMain/Util/confirmation_template.html.twig', + { + 'title' : 'Remove comment'|trans, + 'confirm_question' : 'Are you sure you want to remove comment ?'|trans, + 'cancel_route' : 'chill_activity_activity_list', + 'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id }, + 'form' : delete_form + } ) }} +{% endblock %} From 3a207b2c5df2c4739fce2812bf35b881331d4f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 16:44:01 +0100 Subject: [PATCH 29/71] Notification: add a counter for notifications --- .../ChillMainBundle/ChillMainBundle.php | 3 + .../Controller/NotificationController.php | 32 ++++--- .../Counter/NotificationByUserCounter.php | 95 +++++++++++++++++++ .../Repository/NotificationRepository.php | 5 +- .../views/Notification/list.html.twig | 20 +++- .../views/Notification/show.html.twig | 2 +- .../Routing/MenuBuilder/UserMenuBuilder.php | 16 +++- .../Authorization/NotificationVoter.php | 21 +++- .../config/services/notification.yaml | 27 ++++++ .../translations/messages+intl-icu.fr.yaml | 11 ++- .../translations/messages.fr.yml | 3 + .../config/services/templating.yaml | 5 +- 12 files changed, 211 insertions(+), 29 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php index 0416edf76..7a4e563bb 100644 --- a/src/Bundle/ChillMainBundle/ChillMainBundle.php +++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php @@ -30,6 +30,7 @@ use Chill\MainBundle\Security\Resolver\CenterResolverInterface; use Chill\MainBundle\Security\Resolver\ScopeResolverInterface; use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface; use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass; +use Chill\MainBundle\Templating\UI\NotificationCounterInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -53,6 +54,8 @@ class ChillMainBundle extends Bundle ->addTag('chill.search_api_provider'); $container->registerForAutoconfiguration(NotificationHandlerInterface::class) ->addTag('chill_main.notification_handler'); + $container->registerForAutoconfiguration(NotificationCounterInterface::class) + ->addTag('chill.count_notification.user'); $container->addCompilerPass(new SearchableServicesCompilerPass()); $container->addCompilerPass(new ConfigConsistencyCompilerPass()); diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index dddaf306f..52f58ed68 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -209,9 +209,6 @@ class NotificationController extends AbstractController { $this->denyAccessUnlessGranted(NotificationVoter::NOTIFICATION_SEE, $notification); - $appendComment = new NotificationComment(); - $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment); - if ($request->query->has('edit')) { $commentId = $request->query->getInt('edit'); $editedComment = $notification->getComments()->filter(static function (NotificationComment $c) use ($commentId) { @@ -222,6 +219,8 @@ class NotificationController extends AbstractController throw $this->createNotFoundException("Comment with id {$commentId} does not exists nor belong to this notification"); } + $this->denyAccessUnlessGranted(NotificationVoter::COMMENT_EDIT, $editedComment); + $editedCommentForm = $this->createForm(NotificationCommentType::class, $editedComment); if (Request::METHOD_POST === $request->getMethod() && 'edit' === $request->request->get('form')) { @@ -240,26 +239,31 @@ class NotificationController extends AbstractController } } - if (Request::METHOD_POST === $request->getMethod() && 'append' === $request->request->get('form')) { - $appendCommentForm->handleRequest($request); + if ($this->isGranted(NotificationVoter::COMMENT_ADD, $notification)) { + $appendComment = new NotificationComment(); + $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment); - if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) { - $notification->addComment($appendComment); - $this->em->persist($appendComment); - $this->em->flush(); + if (Request::METHOD_POST === $request->getMethod() && 'append' === $request->request->get('form')) { + $appendCommentForm->handleRequest($request); - $this->addFlash('success', $this->translator->trans('notification.comment_appended')); + if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) { + $notification->addComment($appendComment); + $this->em->persist($appendComment); + $this->em->flush(); - return $this->redirectToRoute('chill_main_notification_show', [ - 'id' => $notification->getId(), - ]); + $this->addFlash('success', $this->translator->trans('notification.comment_appended')); + + return $this->redirectToRoute('chill_main_notification_show', [ + 'id' => $notification->getId(), + ]); + } } } $response = $this->render('@ChillMain/Notification/show.html.twig', [ 'notification' => $notification, 'handler' => $this->notificationHandlerManager->getHandler($notification), - 'appendCommentForm' => $appendCommentForm->createView(), + 'appendCommentForm' => isset($appendCommentForm) ? $appendCommentForm->createView() : null, 'editedCommentForm' => isset($editedCommentForm) ? $editedCommentForm->createView() : null, 'editedCommentId' => $commentId ?? null, ]); diff --git a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php new file mode 100644 index 000000000..8dfd2df8a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php @@ -0,0 +1,95 @@ +cacheItemPool = $cacheItemPool; + $this->notificationRepository = $notificationRepository; + } + + public function addNotification(UserInterface $u): int + { + if (!$u instanceof User) { + return 0; + } + + return $this->countUnreadByUser($u); + } + + public function countUnreadByUser(User $user): int + { + $key = self::generateCacheKeyUnreadNotificationByUser($user); + + $item = $this->cacheItemPool->getItem($key); + + if ($item->isHit()) { + return $item->get(); + } + + $unreads = $this->notificationRepository->countUnreadByUser($user); + + $item + ->set($unreads) + // keep in cache for 15 minutes + ->expiresAfter(60 * 15); + $this->cacheItemPool->save($item); + + return $unreads; + } + + public static function generateCacheKeyUnreadNotificationByUser(User $user): string + { + return 'chill_main_notif_unread_by_' . $user->getId(); + } + + public function onEditNotificationComment(NotificationComment $notificationComment, LifecycleEventArgs $eventArgs): void + { + $this->resetCacheForNotification($notificationComment->getNotification()); + } + + public function onPreFlushNotification(Notification $notification, PreFlushEventArgs $eventArgs): void + { + $this->resetCacheForNotification($notification); + } + + private function resetCacheForNotification(Notification $notification): void + { + $keys = []; + + if (null !== $notification->getSender()) { + $keys[] = self::generateCacheKeyUnreadNotificationByUser($notification->getSender()); + } + + foreach ($notification->getAddressees() as $addressee) { + $keys[] = self::generateCacheKeyUnreadNotificationByUser($addressee); + } + + $this->cacheItemPool->deleteItems($keys); + } +} diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index 68c6b8be6..ce9e3b9e9 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -50,12 +50,13 @@ final class NotificationRepository implements ObjectRepository public function countUnreadByUser(User $user): int { - $sql = 'SELECT count(*) AS c FROM chill_main_notification_addresses_unread WHERE user_id = ?'; + $sql = 'SELECT count(*) AS c FROM chill_main_notification_addresses_unread WHERE user_id = :userId'; $rsm = new Query\ResultSetMapping(); $rsm->addScalarResult('c', 'c', Types::INTEGER); - $nq = $this->em->createNativeQuery($sql, $rsm); + $nq = $this->em->createNativeQuery($sql, $rsm) + ->setParameter('userId', $user->getId()); return $nq->getSingleScalarResult(); } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 836883846..0c0a75312 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -60,15 +60,29 @@ {% if not notification.isReadBy(app.user) %}
          {{ 'notification.is_unread'|trans }}
          {% endif %} + {% if notification.isSystem %} +
          {{ 'notification.is_system'|trans }}
          + {% endif %} +
          - {% if step == 'inbox' %} - {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }} + {% if step == 'inbox' and not notification.isSystem %} + {{ 'notification.from'|trans }}: {{ notification.sender|chill_entity_render_string }} + {% else %} +   {% endif %}
          -
          {{ 'notification.adressees'|trans }}{% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
          +
          {{ 'notification.adressees'|trans }} +
            + {% for a in notification.addressees %} +
          • + {{ a|chill_entity_render_string }} +
            • + {% endfor %} +
          +
          {{ notification.date|format_datetime('long', 'short') }}
          diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 96357233a..271def828 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -65,7 +65,7 @@ {% endfor %} {% endif %} - {% if appendCommentForm is defined %} + {% if appendCommentForm is not null %}
          {{ form_start(appendCommentForm) }} {{ form_widget(appendCommentForm) }} diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php index 74a8ff31d..ae2eb1f2c 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php @@ -12,18 +12,25 @@ declare(strict_types=1); namespace Chill\MainBundle\Routing\MenuBuilder; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Notification\Counter\NotificationByUserCounter; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; class UserMenuBuilder implements LocalMenuBuilderInterface { + private NotificationByUserCounter $notificationByUserCounter; + private Security $security; private TranslatorInterface $translator; - public function __construct(Security $security, TranslatorInterface $translator) - { + public function __construct( + NotificationByUserCounter $notificationByUserCounter, + Security $security, + TranslatorInterface $translator + ) { + $this->notificationByUserCounter = $notificationByUserCounter; $this->security = $security; $this->translator = $translator; } @@ -49,14 +56,17 @@ class UserMenuBuilder implements LocalMenuBuilderInterface 'icon' => 'map-marker', ]); + $nbNotifications = $this->notificationByUserCounter->countUnreadByUser($user); + $menu ->addChild( - $this->translator->trans('My notifications'), + $this->translator->trans('notification.My notifications with counter', ['nb' => $nbNotifications]), ['route' => 'chill_main_notification_my'] ) ->setExtras([ 'order' => 600, 'icon' => 'envelope', + 'counter' => $nbNotifications, ]); $menu diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php index d0b283c24..0a6c239f4 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php @@ -20,6 +20,13 @@ use UnexpectedValueException; final class NotificationVoter extends Voter { + /** + * Allow to add a comment on a notification. + * + * May apply on both @see{NotificationComment::class} and @see{Notification::class}. + */ + public const COMMENT_ADD = 'CHILL_MAIN_NOTIFICATION_COMMENT_ADD'; + public const COMMENT_EDIT = 'CHILL_MAIN_NOTIFICATION_COMMENT_EDIT'; public const NOTIFICATION_SEE = 'CHILL_MAIN_NOTIFICATION_SEE'; @@ -47,20 +54,30 @@ final class NotificationVoter extends Voter if ($subject instanceof Notification) { switch ($attribute) { + case self::COMMENT_ADD: + return false === $subject->isSystem() && ( + $subject->getAddressees()->contains($user) || $subject->getSender() === $user + ); + case self::NOTIFICATION_SEE: case self::NOTIFICATION_TOGGLE_READ_STATUS: return $subject->getSender() === $user || $subject->getAddressees()->contains($user); case self::NOTIFICATION_UPDATE: - return $subject->getSender() === $user; + return $subject->getSender() === $user && false === $subject->isSystem(); default: throw new UnexpectedValueException("this subject {$attribute} is not implemented"); } } elseif ($subject instanceof NotificationComment) { switch ($attribute) { + case self::COMMENT_ADD: + return false === $subject->getNotification()->isSystem() && ( + $subject->getNotification()->getAddressees()->contains($user) || $subject->getNotification()->getSender() === $user + ); + case self::COMMENT_EDIT: - return $subject->getCreatedBy() === $user; + return $subject->getCreatedBy() === $user && false === $subject->getNotification()->isSystem(); default: throw new UnexpectedValueException("this subject {$attribute} is not implemented"); diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index 4ec90de41..f98561bd9 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -22,3 +22,30 @@ services: Chill\MainBundle\Notification\Templating\NotificationTwigExtension: ~ Chill\MainBundle\Notification\Templating\NotificationTwigExtensionRuntime: ~ + + Chill\MainBundle\Notification\Counter\NotificationByUserCounter: + autoconfigure: true + autowire: true + tags: + - + name: 'doctrine.orm.entity_listener' + event: 'preFlush' + entity: 'Chill\MainBundle\Entity\Notification' + # set the 'lazy' option to TRUE to only instantiate listeners when they are used + lazy: true + method: 'onPreFlushNotification' + + - + name: 'doctrine.orm.entity_listener' + event: 'postUpdate' + entity: 'Chill\MainBundle\Entity\NotificationComment' + # set the 'lazy' option to TRUE to only instantiate listeners when they are used + lazy: true + method: 'onEditNotificationComment' + - + name: 'doctrine.orm.entity_listener' + event: 'postPersist' + entity: 'Chill\MainBundle\Entity\NotificationComment' + # set the 'lazy' option to TRUE to only instantiate listeners when they are used + lazy: true + method: 'onEditNotificationComment' diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml index d5dedbb9f..4f25b46da 100644 --- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml @@ -1,6 +1,15 @@ years_old: >- - {age, plural, + {age, plural, one {# an} many {# ans} other {# ans} } + +notification: + My notifications with counter: >- + {nb, plural, + =0 {Mes notifications} + one {Une notification} + few {# notifications} + other {# notifications} + } diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 0bd15b74b..7efda04d1 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -360,6 +360,9 @@ notification: Notifications received: Notifications reçues Notifications sent: Notification envoyées comment_appended: Commentaire ajouté + append_comment: Ajouter un commentaire comment_updated: Commentaire mis à jour is_unread: Non-lue + is_system: Notification automatique + list: Notifications diff --git a/src/Bundle/ChillTaskBundle/config/services/templating.yaml b/src/Bundle/ChillTaskBundle/config/services/templating.yaml index 401bef6d5..0fb98cc19 100644 --- a/src/Bundle/ChillTaskBundle/config/services/templating.yaml +++ b/src/Bundle/ChillTaskBundle/config/services/templating.yaml @@ -4,10 +4,9 @@ services: $taskWorkflowManager: '@Chill\TaskBundle\Workflow\TaskWorkflowManager' tags: - { name: 'twig.extension' } - + Chill\TaskBundle\Templating\UI\CountNotificationTask: + autoconfigure: true arguments: $singleTaskRepository: '@Chill\TaskBundle\Repository\SingleTaskRepository' $cachePool: '@cache.user_data' - tags: - - { name: chill.count_notification.user } From a8fe049ecd3ee56b9c9535de9577196c4bfe8bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 17:00:31 +0100 Subject: [PATCH 30/71] notification: add more variable in twig template --- ...nderer.php => ActivityNotificationHandler.php} | 15 +++++++++++++-- .../views/Activity/showInNotification.html.twig | 12 ++++++++++-- ... => AccompanyingPeriodNotificationHandler.php} | 15 +++++++++++++-- .../showInNotification.html.twig | 15 ++++++++++++--- .../config/services/notification.yaml | 2 +- 5 files changed, 49 insertions(+), 10 deletions(-) rename src/Bundle/ChillActivityBundle/Notification/{ActivityNotificationRenderer.php => ActivityNotificationHandler.php} (60%) rename src/Bundle/ChillPersonBundle/Notification/{AccompanyingPeriodNotificationRenderer.php => AccompanyingPeriodNotificationHandler.php} (57%) diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php similarity index 60% rename from src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php rename to src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php index 2d3d333d9..31e68f95b 100644 --- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php +++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php @@ -12,11 +12,19 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Notification; use Chill\ActivityBundle\Entity\Activity; +use Chill\ActivityBundle\Repository\ActivityRepository; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Notification\NotificationHandlerInterface; -final class ActivityNotificationRenderer implements NotificationHandlerInterface +final class ActivityNotificationHandler implements NotificationHandlerInterface { + private ActivityRepository $activityRepository; + + public function __construct(ActivityRepository $activityRepository) + { + $this->activityRepository = $activityRepository; + } + public function getTemplate() { return '@ChillActivity/Activity/showInNotification.html.twig'; @@ -24,7 +32,10 @@ final class ActivityNotificationRenderer implements NotificationHandlerInterface public function getTemplateData(Notification $notification) { - return ['notification' => $notification]; + return [ + 'notification' => $notification, + 'activity' => $this->activityRepository->find($notification->getRelatedEntityId()), + ]; } public function supports(Notification $notification, array $options = []): bool diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig index 79badfe26..af1b5d884 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig @@ -1,2 +1,10 @@ - -Go to Activity +{# available variables: notification, activity #} +{% if activity is not null %} + {% if is_granted('CHILL_ACTIVITY_SEE', activity) %} + Go to Activity + {% else %} + you are not allowed to see it details. This is the minimal data: {{ activity.id }} + {% endif %} +{% else %} + You get notified of an activity which does not exists any more. +{% endif %} diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php similarity index 57% rename from src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php rename to src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php index 934f3f1c0..0297c5f39 100644 --- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php +++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php @@ -14,9 +14,17 @@ namespace Chill\PersonBundle\Notification; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Notification\NotificationHandlerInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Repository\AccompanyingPeriodRepository; -final class AccompanyingPeriodNotificationRenderer implements NotificationHandlerInterface +final class AccompanyingPeriodNotificationHandler implements NotificationHandlerInterface { + private AccompanyingPeriodRepository $accompanyingPeriodRepository; + + public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository) + { + $this->accompanyingPeriodRepository = $accompanyingPeriodRepository; + } + public function getTemplate() { return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig'; @@ -24,7 +32,10 @@ final class AccompanyingPeriodNotificationRenderer implements NotificationHandle public function getTemplateData(Notification $notification) { - return ['notification' => $notification]; + return [ + 'notification' => $notification, + 'period' => $this->accompanyingPeriodRepository->find($notification->getRelatedEntityId()), + ]; } public function supports(Notification $notification) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig index d92de8cba..92eb251b0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig @@ -1,3 +1,12 @@ - - Go to Acc. period. - +{# variables availables: notification, period. #} +{% if period is not null %} + {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %} + + Go to Acc. period. + + {% else %} + You are getting a notification for a period you are not allowed to see. This is the minimal details: {{ period.id }} + {% endif %} +{% else %} +
          You are getting a notification for a period which does not exists any more
          +{% endif %} diff --git a/src/Bundle/ChillPersonBundle/config/services/notification.yaml b/src/Bundle/ChillPersonBundle/config/services/notification.yaml index c5d04f983..a7c9f4142 100644 --- a/src/Bundle/ChillPersonBundle/config/services/notification.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/notification.yaml @@ -1,4 +1,4 @@ services: - Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer: + Chill\PersonBundle\Notification\AccompanyingPeriodNotificationHandler: autowire: true autoconfigure: true From 160d382e075c3924754f93119845d7269e6cbb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 17:14:09 +0100 Subject: [PATCH 31/71] notification: add notification sent to widget which list notifications ont an entity --- .../Notification/NotificationPresence.php | 8 +++++--- .../Repository/NotificationRepository.php | 9 +++++++-- .../extension_list_notifications_for.html.twig | 6 +++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php index afb6eba19..91bea3197 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php @@ -36,11 +36,13 @@ class NotificationPresence */ public function getNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId): array { - if ($this->security->getUser() instanceof User) { - return $this->notificationRepository->findNotificationAsAddresseeByRelatedEntityAndUser( + $user = $this->security->getUser(); + + if ($user instanceof User) { + return $this->notificationRepository->findNotificationByRelatedEntityAndUserAssociated( $relatedEntityClass, $relatedEntityId, - $this->security->getUser() + $user ); } diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index ce9e3b9e9..e2452dced 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -148,7 +148,7 @@ final class NotificationRepository implements ObjectRepository /** * @return array|Notification[] */ - public function findNotificationAsAddresseeByRelatedEntityAndUser(string $relatedEntityClass, int $relatedEntityId, User $user): array + public function findNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): array { $qb = $this->repository->createQueryBuilder('n'); @@ -156,7 +156,12 @@ final class NotificationRepository implements ObjectRepository ->select('n') ->where($qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass')) ->andWhere($qb->expr()->eq('n.relatedEntityId', ':relatedEntityId')) - ->andWhere($qb->expr()->isMemberOf(':user', 'n.addressees')) + ->andWhere( + $qb->expr()->orX( + $qb->expr()->isMemberOf(':user', 'n.addressees'), + $qb->expr()->eq('n.sender', ':user') + ) + ) ->setParameter('relatedEntityClass', $relatedEntityClass) ->setParameter('relatedEntityId', $relatedEntityId) ->setParameter('user', $user); diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index 5e5d1dba8..b57aab322 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -2,7 +2,11 @@ {% for notification in notifications %}
          {% if not notification.isSystem %} -
          {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
          + {% if notification.sender == app.user %} +
          You sent notification to: {% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
          + {% else %} +
          {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
          + {% endif %} {% else %}
          {{ 'notification.you were notified by system'|trans }}
          {% endif %} From f76f7a164104b376389311d7db790a0ac953dca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 17:40:47 +0100 Subject: [PATCH 32/71] notification: handle activities --- .../Resources/views/Activity/list.html.twig | 14 +++++++++++++- .../Activity/listAccompanyingCourse.html.twig | 11 +++++++++++ .../views/Activity/listPerson.html.twig | 10 ++++++++++ .../Resources/views/Activity/show.html.twig | 19 +++++++++++-------- .../Activity/showAccompanyingCourse.html.twig | 10 ++++++++++ .../views/Activity/showPerson.html.twig | 10 ++++++++++ .../views/AccompanyingCourse/index.html.twig | 1 - 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index 3f49e67cc..5c5e135b3 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -141,7 +141,7 @@
          {% endif %} - + {# Only if ACL SEE_DETAILS AND/OR only on template SHOW ?? durationTime travelTime @@ -152,8 +152,20 @@
          + {% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %} + {% if notifications is not empty %} +
          + {{ notifications|raw }} +
          + {% endif %} +
            + {% if no_action is not defined or no_action == false %} +
          • + {{ 'notification.Notify'|trans }} +
            • + {% endif %} {% if context == 'person' and activity.accompanyingPeriod is not empty %} {# Disable person_id in following links, for redirect to accompanyingCourse context diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig index 431a06ba6..a666f183d 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig @@ -4,6 +4,17 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} + +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% block content %} {% set person_id = null %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig index 158bd0e1b..ac4266f8c 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig @@ -20,6 +20,16 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% block personcontent %} {% set person_id = null %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index cb5b135b3..9fba77a7b 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -3,9 +3,15 @@

            {{ "Activity"|trans }}

            +{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} +{% if notifications is not empty %} + {{ notifications|raw }} +{% endif %} +
            +
            @@ -197,9 +203,12 @@ {{ 'Back to the list'|trans }} - {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
          • - + {{ 'notification.Notify'|trans }} +
            • + {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %} +
          • + {{ 'Edit'|trans }}
            • @@ -212,9 +221,3 @@ {% endif %}
          - diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig index b74b315a3..bf3728280 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig @@ -4,6 +4,16 @@ {% block title 'Show the activity'|trans %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} {% block content -%} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig index 5e92f8fa2..c90b069ed 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig @@ -4,6 +4,16 @@ {% block title 'Show the activity'|trans %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} +{% endblock %} + {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} {% block personcontent -%} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 821b80b12..11445270a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -22,7 +22,6 @@ {% block css %} {{ parent() }} {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} - {% endblock %} {% block content %} From d31661ae7a63137d3e31e2778581dd711aeb8755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 17:55:34 +0100 Subject: [PATCH 33/71] notification: fix NotificationHandlerInterface --- .../Notification/ActivityNotificationHandler.php | 4 ++-- .../NotificationHandlerInterface.php | 16 ++++++++++++++++ .../Notification/NotificationHandlerManager.php | 12 ++++++------ .../AccompanyingPeriodNotificationHandler.php | 6 +++--- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php index 31e68f95b..01d6d537d 100644 --- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php +++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php @@ -25,12 +25,12 @@ final class ActivityNotificationHandler implements NotificationHandlerInterface $this->activityRepository = $activityRepository; } - public function getTemplate() + public function getTemplate(array $options = []): string { return '@ChillActivity/Activity/showInNotification.html.twig'; } - public function getTemplateData(Notification $notification) + public function getTemplateData(Notification $notification, array $options = []): array { return [ 'notification' => $notification, diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php index 89983266d..9ad462d9b 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php @@ -11,6 +11,22 @@ declare(strict_types=1); namespace Chill\MainBundle\Notification; +use Chill\MainBundle\Entity\Notification; + interface NotificationHandlerInterface { + /** + * Return the template path (twig file). + */ + public function getTemplate(array $options = []): string; + + /** + * Return an array which will be passed as data for the template. + */ + public function getTemplateData(Notification $notification, array $options = []): array; + + /** + * Return true if the handler supports the handling for this notification. + */ + public function supports(Notification $notification, array $options = []): bool; } diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php index 214f24239..724c9a479 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php @@ -32,10 +32,10 @@ final class NotificationHandlerManager /** * @throw NotificationHandlerNotFound if handler is not found */ - public function getHandler(Notification $notification): NotificationHandlerInterface + public function getHandler(Notification $notification, array $options = []): NotificationHandlerInterface { foreach ($this->handlers as $renderer) { - if ($renderer->supports($notification)) { + if ($renderer->supports($notification, $options)) { return $renderer; } } @@ -43,13 +43,13 @@ final class NotificationHandlerManager throw new NotificationHandlerNotFound(); } - public function getTemplate(Notification $notification): string + public function getTemplate(Notification $notification, array $options = []): string { - return $this->getHandler($notification)->getTemplate(); + return $this->getHandler($notification, $options)->getTemplate($options); } - public function getTemplateData(Notification $notification): array + public function getTemplateData(Notification $notification, array $options = []): array { - return $this->getHandler($notification)->getTemplateData($notification); + return $this->getHandler($notification, $options)->getTemplateData($notification, $options); } } diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php index 0297c5f39..0370fc00e 100644 --- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php +++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php @@ -25,12 +25,12 @@ final class AccompanyingPeriodNotificationHandler implements NotificationHandler $this->accompanyingPeriodRepository = $accompanyingPeriodRepository; } - public function getTemplate() + public function getTemplate(array $options = []): string { return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig'; } - public function getTemplateData(Notification $notification) + public function getTemplateData(Notification $notification, array $options = []): array { return [ 'notification' => $notification, @@ -38,7 +38,7 @@ final class AccompanyingPeriodNotificationHandler implements NotificationHandler ]; } - public function supports(Notification $notification) + public function supports(Notification $notification, array $options = []): bool { return $notification->getRelatedEntityClass() === AccompanyingPeriod::class; } From ebc6d21ba6c19df58ce330019db3bce61bdfb05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 18:38:08 +0100 Subject: [PATCH 34/71] notification: order notification by date desc in inbox and sent --- .../ChillMainBundle/Repository/NotificationRepository.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index e2452dced..38262f95e 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -116,6 +116,8 @@ final class NotificationRepository implements ObjectRepository $query = $query->setFirstResult($offset); } + $query->addOrderBy('n.date', 'DESC'); + return $query->getQuery()->getResult(); } @@ -131,6 +133,8 @@ final class NotificationRepository implements ObjectRepository $query = $query->setFirstResult($offset); } + $query->addOrderBy('n.date', 'DESC'); + return $query->getQuery()->getResult(); } From 4ef024516cb525c58111d75c64140d2783483265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 19:02:03 +0100 Subject: [PATCH 35/71] notificaiton: improve NotificationHandlerInterface + mark notification as unread if a comment is appended --- .../ActivityNotificationHandler.php | 2 +- .../Entity/NotificationComment.php | 36 +++++++++++++++++++ .../NotificationHandlerInterface.php | 2 +- .../NotificationHandlerManager.php | 2 +- .../AccompanyingPeriodNotificationHandler.php | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php index 01d6d537d..f391de1ff 100644 --- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php +++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php @@ -25,7 +25,7 @@ final class ActivityNotificationHandler implements NotificationHandlerInterface $this->activityRepository = $activityRepository; } - public function getTemplate(array $options = []): string + public function getTemplate(Notification $notification, array $options = []): string { return '@ChillActivity/Activity/showInNotification.html.twig'; } diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php index 792e4abcc..a26c41916 100644 --- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php +++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php @@ -15,11 +15,14 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use DateTimeImmutable; use DateTimeInterface; +use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\PreFlushEventArgs; use Doctrine\ORM\Mapping as ORM; /** * @ORM\Entity * @ORM\Table("chill_main_notification_comment") + * @ORM\HasLifecycleCallbacks */ class NotificationComment implements TrackCreationInterface, TrackUpdateInterface { @@ -52,6 +55,13 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac */ private ?Notification $notification = null; + /** + * Internal variable which detect if the comment is just persisted. + * + * @internal + */ + private bool $recentlyPersisted = false; + /** * @ORM\Column(type="datetime_immutable", nullable=true) */ @@ -98,6 +108,32 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac return $this->updatedBy; } + /** + * @ORM\PreFlush + */ + public function onFlushMarkNotificationAsUnread(PreFlushEventArgs $eventArgs): void + { + if ($this->recentlyPersisted) { + foreach ($this->getNotification()->getAddressees() as $addressee) { + if ($this->getCreatedBy() !== $addressee) { + $this->getNotification()->markAsUnreadBy($addressee); + } + } + + if ($this->getNotification()->getSender() !== $this->getCreatedBy()) { + $this->getNotification()->markAsUnreadBy($this->getNotification()->getSender()); + } + } + } + + /** + * @ORM\PrePersist + */ + public function onPrePersist(LifecycleEventArgs $eventArgs): void + { + $this->recentlyPersisted = true; + } + public function setContent(string $content): self { $this->content = $content; diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php index 9ad462d9b..774609512 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerInterface.php @@ -18,7 +18,7 @@ interface NotificationHandlerInterface /** * Return the template path (twig file). */ - public function getTemplate(array $options = []): string; + public function getTemplate(Notification $notification, array $options = []): string; /** * Return an array which will be passed as data for the template. diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php index 724c9a479..45ebcd30c 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php @@ -45,7 +45,7 @@ final class NotificationHandlerManager public function getTemplate(Notification $notification, array $options = []): string { - return $this->getHandler($notification, $options)->getTemplate($options); + return $this->getHandler($notification, $options)->getTemplate($notification, $options); } public function getTemplateData(Notification $notification, array $options = []): array diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php index 0370fc00e..384daf07b 100644 --- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php +++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php @@ -25,7 +25,7 @@ final class AccompanyingPeriodNotificationHandler implements NotificationHandler $this->accompanyingPeriodRepository = $accompanyingPeriodRepository; } - public function getTemplate(array $options = []): string + public function getTemplate(Notification $notification, array $options = []): string { return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig'; } From 6f561f57a674ce6eb608a0afd01dbcc8c7a26258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 22:35:23 +0100 Subject: [PATCH 36/71] Notification: send an email when a notification is created --- .../Notification/Email/NotificationMailer.php | 110 ++++++++++++++++++ ...non_system_notification_content.fr.md.twig | 20 ++++ ...il_notification_comment_persist.fr.md.twig | 19 +++ .../config/services/notification.yaml | 19 +++ .../accompanying_course_designation.md.twig | 4 +- 5 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php new file mode 100644 index 000000000..658764c26 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php @@ -0,0 +1,110 @@ +mailer = $mailer; + $this->logger = $logger; + $this->translator = $translator; + } + + public function postPersistComment(NotificationComment $comment, LifecycleEventArgs $eventArgs): void + { + foreach ( + array_merge( + $comment->getNotification()->getAddressees()->toArray(), + [$comment->getNotification()->getSender()] + ) as $dest + ) { + if (null === $dest->getEmail() || $comment->getCreatedBy() !== $dest) { + continue; + } + $email = new TemplatedEmail(); + $email + ->to($dest->getEmail()) + ->subject('Re: [Chill] ' . $comment->getNotification()->getTitle()) + ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig') + ->context([ + 'comment' => $comment, + 'dest' => $dest, + ]); + + try { + $this->mailer->send($email); + } catch (TransportExceptionInterface $e) { + $this->logger->warning('[NotificationMailer] could not send an email notification about comment', [ + 'to' => $dest->getEmail(), + 'error_message' => $e->getMessage(), + 'error_trace' => $e->getTraceAsString(), + ]); + } + } + } + + /** + * Send a email after a notification is persisted. + */ + public function postPersistNotification(Notification $notification, LifecycleEventArgs $eventArgs): void + { + foreach ($notification->getAddressees() as $addressee) { + if (null === $addressee->getEmail()) { + continue; + } + + if ($notification->isSystem()) { + $email = new Email(); + $email + ->text($notification->getMessage()) + ->subject('[Chill] ' . $notification->getTitle()); + } else { + $email = new TemplatedEmail(); + $email + ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig') + ->context([ + 'notification' => $notification, + 'dest' => $addressee, + ]); + } + + $email->to($addressee->getEmail()); + + try { + $this->mailer->send($email); + } catch (TransportExceptionInterface $e) { + $this->logger->warning('[NotificationMailer] could not send an email notification', [ + 'to' => $addressee->getEmail(), + 'error_message' => $e->getMessage(), + 'error_trace' => $e->getTraceAsString(), + ]); + } + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig new file mode 100644 index 000000000..62e41860b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig @@ -0,0 +1,20 @@ +{{ dest.label }}, + +{{ notification.sender.label }} a créé une notification pour vous: + +> {{ notification.title }} +> +> +{%- for line in notification.message|split("\n") %} +> {{ line }} +{%- if not loop.last %} +> +{%- endif %} +{%- endfor %} + +Vous pouvez visualiser la notification et y répondre ici: + +{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': notification.id }, false)) }} + +-- +Le logiciel Chill diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig new file mode 100644 index 000000000..b1244da39 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig @@ -0,0 +1,19 @@ +{{ dest.label }}, + +{{ comment.createdBy.label }} a créé un commentaire sur la notification "{{ comment.notification.title }}". + +Commentaire: + +{% for line in comment.content|split("\n") %} +> {{ line }} +{%- if not loop.last %} +> +{%- endif %} +{%- endfor %} + +Vous pouvez visualiser la notification et y répondre ici: + +{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': comment.notification.id }, false)) }} + +-- +Le logiciel Chill diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index f98561bd9..8bfb41ad7 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -49,3 +49,22 @@ services: # set the 'lazy' option to TRUE to only instantiate listeners when they are used lazy: true method: 'onEditNotificationComment' + + Chill\MainBundle\Notification\Email\NotificationMailer: + autowire: true + autoconfigure: true + tags: + - + name: 'doctrine.orm.entity_listener' + event: 'postPersist' + entity: 'Chill\MainBundle\Entity\Notification' + # set the 'lazy' option to TRUE to only instantiate listeners when they are used + lazy: true + method: 'postPersistNotification' + - + name: 'doctrine.orm.entity_listener' + event: 'postPersist' + entity: 'Chill\MainBundle\Entity\NotificationComment' + # set the 'lazy' option to TRUE to only instantiate listeners when they are used + lazy: true + method: 'postPersistComment' diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig index 515f57b0c..ce28da8f8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig @@ -1,6 +1,8 @@ {{ 'period_notification.You are designated to a new period.'|trans }} -{{ 'period_notification.See it online'|trans }}: {{ path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, true) }} +{{ 'period_notification.See it online'|trans }}: + +{{ absolute_url(path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, false)) }} {{ 'period_notification.Persons are'|trans }}: From c17fd968be95d563b543c7ddca49fbc9d6dddf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 22:40:48 +0100 Subject: [PATCH 37/71] notification: do not show system notification in UI --- src/Bundle/ChillMainBundle/Repository/NotificationRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index 38262f95e..35ec64114 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -160,6 +160,7 @@ final class NotificationRepository implements ObjectRepository ->select('n') ->where($qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass')) ->andWhere($qb->expr()->eq('n.relatedEntityId', ':relatedEntityId')) + ->andWhere($qb->expr()->isNotNull('n.sender')) ->andWhere( $qb->expr()->orX( $qb->expr()->isMemberOf(':user', 'n.addressees'), From 66aac8908c1d4f38c6ae50cfbb8dfdf9a2970a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 22:41:04 +0100 Subject: [PATCH 38/71] notification: fix translations --- .../AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php | 2 +- .../views/Notification/accompanying_course_designation.md.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php index d49cc8c0a..3b7626903 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Workflow/WorkflowEventSubscriber.php @@ -63,7 +63,7 @@ class WorkflowEventSubscriber implements EventSubscriberInterface $notification ->setRelatedEntityId($period->getId()) ->setRelatedEntityClass(AccompanyingPeriod::class) - ->setTitle($this->translator->trans('period_notification.period designated_subject')) + ->setTitle($this->translator->trans('period_notification.period_designated_subject')) ->setMessage($this->engine->render( '@ChillPerson/Notification/accompanying_course_designation.md.twig', [ diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig index ce28da8f8..879df495e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig @@ -1,4 +1,4 @@ -{{ 'period_notification.You are designated to a new period.'|trans }} +{{ 'period_notification.You are designated to a new period'|trans }} {{ 'period_notification.See it online'|trans }}: From 40a457ba69c85012a4a305f98fdf7728e676c39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jan 2022 22:41:17 +0100 Subject: [PATCH 39/71] notificaiton: add mailer component --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 312cd1cee..9d7a30800 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "symfony/expression-language": "^4.4", "symfony/form": "^4.4", "symfony/intl": "^4.4", + "symfony/mailer": "^5.4", "symfony/mime": "^4.4", "symfony/monolog-bundle": "^3.5", "symfony/security-bundle": "^4.4", From f5f5d66f3d03222bd505325ee12b942c0b6bee0d Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 5 Jan 2022 14:39:00 +0100 Subject: [PATCH 40/71] design notification box in post menu area --- .../public/module/notification/toggle_read.js | 18 +++- .../public/module/pick-entity/index.js | 20 ++-- .../public/vuejs/PickEntity/PickEntity.vue | 4 - .../Notification/NotificationReadToggle.vue | 98 ++++++++++++++++++- ...extension_list_notifications_for.html.twig | 44 ++++++--- .../translations/messages.fr.yml | 7 +- .../views/AccompanyingCourse/index.html.twig | 21 ++-- .../views/Household/summary.html.twig | 2 +- .../Resources/views/Person/layout.html.twig | 4 +- 9 files changed, 174 insertions(+), 44 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js index 48bbf20fa..1ece0c0ad 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js @@ -1,13 +1,18 @@ import {createApp} from "vue"; import NotificationReadToggle from "ChillMainAssets/vuejs/_components/Notification/NotificationReadToggle.vue"; +import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n"; + +const i18n = _createI18n({}); window.addEventListener('DOMContentLoaded', function (e) { document.querySelectorAll('.notification_toggle_read_status') .forEach(function (el) { - console.log('app', el); - const App = { + createApp({ template: '', @@ -17,6 +22,9 @@ window.addEventListener('DOMContentLoaded', function (e) { data() { return { notificationId: +el.dataset.notificationId, + buttonClass: el.dataset.buttonClass, + buttonNoText: 'true' === el.dataset.buttonNoText, + showUrl: el.dataset.showUrl, isRead: 1 === +el.dataset.notificationCurrentIsRead, } }, @@ -28,8 +36,8 @@ window.addEventListener('DOMContentLoaded', function (e) { this.isRead = true; }, } - } - - createApp(App).mount(el); + }) + .use(i18n) + .mount(el); }); }) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js index 26cbff735..21cc672b7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js @@ -1,13 +1,13 @@ -import {createApp} from 'vue'; +import { createApp } from 'vue'; import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue'; import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n' -import {activityMessages} from "../../../../../ChillActivityBundle/Resources/public/vuejs/Activity/i18n"; window.addEventListener('DOMContentLoaded', function(e) { - let - apps = document.querySelectorAll('[data-module="pick-dynamic"]'); + + let apps = document.querySelectorAll('[data-module="pick-dynamic"]'); apps.forEach(function(el) { + const isMultiple = parseInt(el.dataset.multiple) === 1, input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'), @@ -15,7 +15,13 @@ window.addEventListener('DOMContentLoaded', function(e) { i18n = _createI18n({}); createApp({ - template: '', + template: '', components: { PickEntity, }, @@ -54,6 +60,8 @@ window.addEventListener('DOMContentLoaded', function(e) { input.value = JSON.stringify(this.picked); }, } - }).use(i18n).mount(el); + }) + .use(i18n) + .mount(el); }); }); diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue index 32dad3c36..eb4ca96ba 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue @@ -91,7 +91,3 @@ export default { }, } - - diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue index 730ba2881..976046db7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue @@ -1,10 +1,42 @@ - diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index b57aab322..f36a2d147 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -1,25 +1,43 @@ -
          +
          +
          +

          {{ 'notification.Sent'|trans }}

          +
          + {# TODO pagination or limit #} {% for notification in notifications %} -
          +
          + {% if not notification.isSystem %} {% if notification.sender == app.user %} -
          You sent notification to: {% for a in notification.addressees %}{{ a|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
          + +
          + + {{ notification.date|format_datetime('short','short') }} + + +
          + {% if notification.addressees|length > 0 %} + {{ 'notification.to'|trans }}: + {% endif %} + {% for a in notification.addressees %} + + {{ a|chill_entity_render_string }} + + {% endfor %} + {% else %}
          {{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}
          {% endif %} {% else %}
          {{ 'notification.you were notified by system'|trans }}
          {% endif %} -
          -
            -
          • - -
            • -
          • - -
            • -
          -
          + +
          {% endfor %}
          diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 7efda04d1..f0e906058 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -353,7 +353,7 @@ Created for: Créé pour Created by: Créé par notification: - Notify: Notifier + Notify: Envoyer une notification Notification created: Notification envoyée Any notification received: Aucune notification reçue Any notification sent: Aucune notification envoyée @@ -365,4 +365,9 @@ notification: is_unread: Non-lue is_system: Notification automatique list: Notifications + Sent: Envoyé + sentto: Envoyé à + you were notified by %sender%: Vous avez été notifié par %sender% + you were notified by system: Vous avez été notifié automatiquement + to: À diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 8dac50f82..564ffc854 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -26,9 +26,6 @@ {% block content %}
          - - {{ chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} -
          {% if 'DRAFT' == accompanyingCourse.step %} @@ -134,10 +131,6 @@
          {% endif %} -
          - {{ 'notification.Notify'|trans }} -
          - {% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %}
          @@ -189,3 +182,17 @@
          {% endblock %} + +{% block block_post_menu %} +
          + +
          + + {{ 'notification.Notify'|trans }} + +
          + + {{ chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} + +
          +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index df1e45fce..bbb8ff52f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -3,7 +3,7 @@ {% block title 'household.Household summary'|trans %} {% block block_post_menu %} -
          +
          {% endblock %} {% block content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig index 350b73679..f04f9d702 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig @@ -1,5 +1,5 @@ {# - * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, / * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ }) }} {% block block_post_menu %} -
          +
          {{ chill_delegated_block('person_post_vertical_menu', { 'person': person } ) }}
          {% endblock %} From b9e5734039856a0857cfc42610960399efe1154b Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 5 Jan 2022 21:10:51 +0100 Subject: [PATCH 41/71] bouton bleu --- .../Notification/extension_list_notifications_for.html.twig | 2 +- .../Resources/views/AccompanyingCourse/index.html.twig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index f36a2d147..ec5149cbf 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -10,7 +10,7 @@ {% if notification.sender == app.user %}
          - + {{ notification.date|format_datetime('short','short') }}
          - + + {{ 'notification.Notify'|trans }}
          From 140f53b81f056f5601c0b596b632c04106e50eb6 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 Jan 2022 13:25:18 +0100 Subject: [PATCH 42/71] setting NotificationReadToggle options for several cases. improve options --- .../public/module/notification/toggle_read.js | 4 +-- .../Notification/NotificationReadToggle.vue | 28 ++++++++++++------- ...extension_list_notifications_for.html.twig | 18 ++++++------ .../views/Notification/list.html.twig | 5 +++- .../views/Notification/show.html.twig | 5 +++- .../translations/messages.fr.yml | 2 +- 6 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js index 1ece0c0ad..82a118f77 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js @@ -23,8 +23,8 @@ window.addEventListener('DOMContentLoaded', function (e) { return { notificationId: +el.dataset.notificationId, buttonClass: el.dataset.buttonClass, - buttonNoText: 'true' === el.dataset.buttonNoText, - showUrl: el.dataset.showUrl, + buttonNoText: 'false' === el.dataset.buttonText, + showUrl: el.dataset.showButtonUrl, isRead: 1 === +el.dataset.notificationCurrentIsRead, } }, diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue index 976046db7..c45cf1ba6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue @@ -1,5 +1,5 @@ @@ -50,6 +54,7 @@ export default { required: true, type: Number, }, + // Optional buttonClass: { required: false, type: String @@ -65,14 +70,17 @@ export default { }, emits: ['markRead', 'markUnread'], computed: { + /// [Option] override default button appearance (btn-misc) overrideClass() { - console.log('button', this.buttonClass); return this.buttonClass ? this.buttonClass : 'btn-misc' }, + /// [Option] don't display text on button buttonHideText() { return this.buttonNoText; }, - showButton() { + /// [Option] showUrl is href for show page second button. + // When passed, the component return a button-group with 2 buttons. + isButtonGroup() { return !!this.showUrl } }, diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index ec5149cbf..0235ab4f7 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -10,20 +10,23 @@ {% if notification.sender == app.user %}
          - + {{ notification.date|format_datetime('short','short') }}
          + {% if notification.addressees|length > 0 %} - {{ 'notification.to'|trans }}: + {{ 'notification.to'|trans }}: {% endif %} + {% for a in notification.addressees %} {{ a|chill_entity_render_string }} @@ -37,7 +40,6 @@
          {{ 'notification.you were notified by system'|trans }}
          {% endif %} -
          {% endfor %}
          diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index 0c0a75312..24fd4404a 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -98,7 +98,10 @@
          • - +
            • {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %}
          • diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 271def828..faab0a8cb 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -88,7 +88,10 @@
          • - +
          diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index f0e906058..542a1311c 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -366,7 +366,7 @@ notification: is_system: Notification automatique list: Notifications Sent: Envoyé - sentto: Envoyé à + sent_to: Envoyé à you were notified by %sender%: Vous avez été notifié par %sender% you were notified by system: Vous avez été notifié automatiquement to: À From c32b767d9b652e037961a382d16fd9505b4c710e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 Jan 2022 16:56:51 +0100 Subject: [PATCH 43/71] Notifications list template --- .../Notification/NotificationReadToggle.vue | 18 +- .../views/Notification/create.html.twig | 34 ++- .../views/Notification/edit.html.twig | 32 ++- ...extension_list_notifications_for.html.twig | 6 +- .../views/Notification/list.html.twig | 218 +++++++++--------- .../views/Notification/show.html.twig | 130 +++++------ .../translations/messages.fr.yml | 11 +- .../Resources/public/chill/scss/badge.scss | 5 + .../showInNotification.html.twig | 2 +- 9 files changed, 233 insertions(+), 223 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue index c45cf1ba6..467fd40ea 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue @@ -108,26 +108,28 @@ export default { diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig index abeb28af1..8123373f2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig @@ -1,6 +1,6 @@
          -

          +

          {{ notification.title }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index ea61b5dce..31267e135 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -9,7 +9,7 @@ {% if not notification.isSystem %} {% if notification.sender == app.user %} -

          +
          {{ notification.date|format_datetime('short','short') }} From fded08aaaab526e7554022a8dd07af8a6d1153eb Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 10 Jan 2022 16:01:22 +0100 Subject: [PATCH 64/71] include Activity in notification (ShowInNotification) --- .../views/Activity/showInNotification.html.twig | 17 ++++++++++++----- .../AccompanyingPeriod/_list_item.html.twig | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig index fc39696bf..721538271 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig @@ -1,11 +1,18 @@ -{# available variables: notification, activity #} +{% macro recordAction(activity) %} +
        • + +
          • +{% endmacro %} + {% if activity is not null %}
          {% if is_granted('CHILL_ACTIVITY_SEE', activity) %} - - Go to Activity - - + {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with { + 'recordAction': _self.recordAction(activity), + 'context': 'accompanyingCourse', + 'itemBlocClass': 'bg-chill-llight-gray' + } %} {% else %}
          {{ 'This is the minimal activity data'|trans ~ ': ' ~ activity.id }}
          diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig index 165e85c62..79e159596 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig @@ -1,4 +1,4 @@ -
          +
          From ae931b586955abc0c81ada8ef1202187e69ec9ac Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 10 Jan 2022 16:04:04 +0100 Subject: [PATCH 65/71] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b72e2b4..6d587e43b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,9 @@ and this project adheres to * address reference: add index for refid * [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time) * [accompanyingCourse] improve masonry on resume page, add origin +* [notification] new notification interface, can be associated to AccompanyingCourse/Period, Activities. + * List notifications, show, and comment in User section + * Notify button and contextual notification box on associated objects pages ## Test releases From 42a14fbd6b6f180136590b91e723a9e56bc83cf7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 10 Jan 2022 16:55:01 +0100 Subject: [PATCH 66/71] AccompanyingPeriod list: manage context entity variable in record_actions buttons (TO BE CHECKED) Need to pass context entity in record_actions buttons to use variables like 'person' ! --- .../views/AccompanyingPeriod/_list.html.twig | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 413080a78..307c462e2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -1,15 +1,22 @@ -{% macro recordAction(period, person = null) %} +{% if person is defined %} + {% set contextEntity = { 'type': 'person', 'entity': person } %}{% endif %} +{% if household is defined %} + {% set contextEntity = { 'type': 'household', 'entity': household } %}{% endif %} + +{% macro recordAction(period, contextEntity) %} {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
        • {# {{ 'See this period'|trans }} #}
          • - {% if period.step == 'DRAFT' %} + {% if period.step == 'DRAFT' and contextEntity.type == 'person' %} + {% set person = contextEntity.entity %}
        • {# {{ 'Delete this period'|trans }} #}
          • {% endif %} + {# DISABLED if new accompanying course, this is not necessary {% if person is defined %}
        • @@ -45,7 +52,7 @@ {% for period in accompanying_periods %} {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with { - 'recordAction': _self.recordAction(period, person) + 'recordAction': _self.recordAction(period, contextEntity) } %} {% endfor %} From 479e4ffe64c90aba65f75a3c72c7fe08060eb331 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 10 Jan 2022 17:08:56 +0100 Subject: [PATCH 67/71] add notification box in context person, page show activity --- .../views/Activity/showPerson.html.twig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig index c90b069ed..fa6cf2ea9 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig @@ -21,3 +21,21 @@ {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
          • {% endblock personcontent %} + +{% block block_post_menu %} +
          + +
          + + + {{ 'notification.Notify'|trans }} + +
          + + {% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} + {% if notifications is not empty %} + {{ notifications|raw }} + {% endif %} + +
          +{% endblock %} From e43770571485d25f13246f4d93f6b5227a60d1b1 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 11 Jan 2022 10:29:00 +0100 Subject: [PATCH 68/71] composer deps symfony/mime, change version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 75580b309..d3766bb65 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "symfony/framework-bundle": "^4.4", "symfony/intl": "^4.4", "symfony/mailer": "^5.4", - "symfony/mime": "^4.4", + "symfony/mime": "^5.4", "symfony/monolog-bundle": "^3.5", "symfony/security-bundle": "^4.4", "symfony/serializer": "^5.3", From f6386a13ac56c9c13af499f8c3f5f2f0e3b1869a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 11 Jan 2022 11:05:42 +0100 Subject: [PATCH 69/71] fix cs --- src/Bundle/ChillMainBundle/Entity/NotificationComment.php | 5 +++-- .../Controller/AccompanyingCourseCommentController.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php index bbcc565fb..01911c729 100644 --- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php +++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php @@ -63,7 +63,8 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac private bool $recentlyPersisted = false; /** - * TODO typo in property (hotfixed) + * TODO typo in property (hotfixed). + * * @ORM\Column(type="datetime_immutable", nullable=true) */ private ?DateTimeImmutable $updateAt = null; @@ -167,7 +168,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac } /** - * @deprecated use @link{self::setUpdatedAt} instead + * @deprecated use @see{self::setUpdatedAt} instead */ public function setUpdateAt(?DateTimeImmutable $updateAt): self { diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php index de038de3a..be6bcab07 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php @@ -190,5 +190,4 @@ class AccompanyingCourseCommentController extends AbstractController { return $this->formFactory->createNamed($step, AccompanyingCourseCommentType::class, $comment); } - } From 1650f30a5938b928601fd9cd83cf4147a8233665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 11 Jan 2022 11:22:46 +0100 Subject: [PATCH 70/71] upgrade app --- tests/app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app b/tests/app index 5952eda44..7a58754da 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit 5952eda44831896991989c2e4881adc26329140e +Subproject commit 7a58754daf4a82f3b5419b2fb17a2ea42f7f9e7a From 6b1310148fc828fd76db4d0f0c4d5fe35c3d3ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 11 Jan 2022 11:24:11 +0100 Subject: [PATCH 71/71] notification: fix test --- .../Tests/Controller/NotificationApiControllerTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php index ea06f1e4f..96b707ee7 100644 --- a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\User; use Chill\MainBundle\Repository\UserRepository; use Chill\MainBundle\Test\PrepareClientTrait; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use DateTimeImmutable; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; @@ -55,7 +56,8 @@ final class NotificationApiControllerTest extends WebTestCase ->setRelatedEntityClass(AccompanyingPeriod::class) ->setRelatedEntityId(0) ->setSender($userB) - ->addAddressee($userA); + ->addAddressee($userA) + ->setUpdatedAt(new DateTimeImmutable()); $em->persist($notification); $em->refresh($notification); $em->flush();