From 8b7404e5316bb8119d8f6bd7dc1c5b77d5802357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 20 Apr 2022 13:05:11 +0200 Subject: [PATCH 01/17] Email on designation: allow raw characters As the content-type of the email is text/plain, we should not escape special character. Add the raw filter on string which will be escaped by twig. --- CHANGELOG.md | 1 + .../Notification/accompanying_course_designation.md.twig | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f26e64a1..b7681e5e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list +* [notification email on course designation] allow raw string in email content generation ## Test releases 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 879df495e..8dd6558ac 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,14 +1,14 @@ -{{ 'period_notification.You are designated to a new period'|trans }} +{{ 'period_notification.You are designated to a new period'|trans|raw }} -{{ 'period_notification.See it online'|trans }}: +{{ 'period_notification.See it online'|trans|raw }}: {{ absolute_url(path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, false)) }} -{{ 'period_notification.Persons are'|trans }}: +{{ 'period_notification.Persons are'|trans|raw }}: {% 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 %}. +{{ 'period_notification.Social issues are'|trans|raw }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}. From bf0578b6d7a8b612263e4049089c67a413a6f901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 20 Apr 2022 13:49:47 +0200 Subject: [PATCH 02/17] [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older --- CHANGELOG.md | 1 + .../Entity/AccompanyingPeriod/AccompanyingPeriodWork.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7681e5e8..459f95005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list * [notification email on course designation] allow raw string in email content generation +* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php index 95ec008d9..055507162 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -57,6 +57,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues * orphanRemoval=true * ) * @Serializer\Groups({"read", "docgen:read"}) + * @ORM\OrderBy({"startDate": "DESC", "id": "DESC"}) * * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer` */ From daa3eabd438a847a9490d3e7c00f2f2242a0c00e Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 16:12:58 +0200 Subject: [PATCH 03/17] Change wording for save document button --- CHANGELOG.md | 1 + .../Resources/views/AccompanyingCourseDocument/new.html.twig | 2 +- .../Resources/views/PersonDocument/new.html.twig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 459f95005..da3ee1a3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to * [list with period] use "sameas" test operator to introduce requestor in list * [notification email on course designation] allow raw string in email content generation * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older +* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634) ## Test releases diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig index 94cfb8828..01be1a5d7 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig @@ -30,7 +30,7 @@
  • - +
    • {{ form_end(form) }} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig index df947c933..3187714a6 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig @@ -47,7 +47,7 @@
  • - +
    • {{ form_end(form) }} From a70c56159631ab8e18c48f231c33e982a1e52183 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 16:23:08 +0200 Subject: [PATCH 04/17] Number of parcours of user displayed in blue pill --- CHANGELOG.md | 1 + .../views/AccompanyingPeriod/user_periods_list.html.twig | 2 ++ src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da3ee1a3a..e8201ceb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to * [notification email on course designation] allow raw string in email content generation * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older * [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634) +* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572) ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig index 7395fceda..031e0728c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig @@ -17,6 +17,8 @@

    {{ 'My accompanying periods'|trans }}

    +

    {{ 'Number of periods'|trans }}: {{ pagination.totalItems }}

    +
    {% for period in accompanyingPeriods %} {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index c6baf9513..2a4077e1c 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -581,6 +581,7 @@ Linked evaluations: Évaluations associées # Accompanying period per user My accompanying periods: Mes parcours My accompanying periods in draft: Mes parcours brouillons +Number of periods: Nombre de parcours workflow: Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval% From 9a0eb1c74c60ca5d3623c22621aea3977e8a045f Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 16:33:05 +0200 Subject: [PATCH 05/17] Renaming of tabs and removal of social actions tab --- CHANGELOG.md | 1 + .../public/vuejs/HomepageWidget/App.vue | 6 +-- .../public/vuejs/HomepageWidget/MyWorks.vue | 1 + .../public/vuejs/HomepageWidget/js/i18n.js | 6 +-- .../public/vuejs/HomepageWidget/js/store.js | 50 +++++++++---------- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8201ceb6..e074d731f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older * [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634) * [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572) +* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570) ## Test releases diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue index 343b638da..fbf453b47 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue @@ -25,14 +25,14 @@ {{ $t('my_accompanying_courses.tab') }} -
  • +
  • {{ $t('my_works.description') }}
    diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js index b5ae78e34..edc781087 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js @@ -15,11 +15,11 @@ const appMessages = { description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.", }, my_accompanying_courses: { - tab: "Mes parcours", - description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.", + tab: "Mes nouveaux parcours", + description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.", }, my_notifications: { - tab: "Mes notifications", + tab: "Mes nouvelles notifications", description: "Liste des notifications reçues et non lues.", }, my_workflows: { diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js index c33ec2123..44127da1c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js @@ -13,7 +13,7 @@ const isEmpty = (obj) => { const store = createStore({ strict: debug, state: { - works: {}, + // works: {}, evaluations: {}, tasks: { warning: {}, @@ -26,9 +26,9 @@ const store = createStore({ loading: false }, getters: { - isWorksLoaded(state) { - return !isEmpty(state.works); - }, + // isWorksLoaded(state) { + // return !isEmpty(state.works); + // }, isEvaluationsLoaded(state) { return !isEmpty(state.evaluations); }, @@ -49,7 +49,7 @@ const store = createStore({ }, counter(state) { return { - works: state.works.count, + // works: state.works.count, evaluations: state.evaluations.count, tasksWarning: state.tasks.warning.count, tasksAlert: state.tasks.alert.count, @@ -60,10 +60,10 @@ const store = createStore({ } }, mutations: { - addWorks(state, works) { - //console.log('addWorks', works); - state.works = works; - }, + // addWorks(state, works) { + // //console.log('addWorks', works); + // state.works = works; + // }, addEvaluations(state, evaluations) { //console.log('addEvaluations', evaluations); state.evaluations = evaluations; @@ -99,22 +99,22 @@ const store = createStore({ switch (tab) { case 'MyCustoms': break; - case 'MyWorks': - if (!getters.isWorksLoaded) { - commit('setLoading', true); - const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`; - makeFetch('GET', url) - .then((response) => { - commit('addWorks', response); - commit('setLoading', false); - }) - .catch((error) => { - commit('catchError', error); - throw error; - }) - ; - } - break; + // case 'MyWorks': + // if (!getters.isWorksLoaded) { + // commit('setLoading', true); + // const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`; + // makeFetch('GET', url) + // .then((response) => { + // commit('addWorks', response); + // commit('setLoading', false); + // }) + // .catch((error) => { + // commit('catchError', error); + // throw error; + // }) + // ; + // } + // break; case 'MyEvaluations': if (!getters.isEvaluationsLoaded) { commit('setLoading', true); From 6cad0be1811454c9cd5e72c088babbf05dec0ac7 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 17:08:27 +0200 Subject: [PATCH 06/17] Ignore thirdparty for socialaction created via activity --- CHANGELOG.md | 1 + .../EntityListener/ActivityEntityListener.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e074d731f..afc8157c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to * [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634) * [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572) * [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570) +* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573) ## Test releases diff --git a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php index ab370e89e..88adf9723 100644 --- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php +++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php @@ -66,9 +66,6 @@ class ActivityEntityListener $newAction->addPerson($person); } - foreach ($associatedThirdparties as $thirdparty) { - $newAction->setHandlingThierparty($thirdparty); - } $this->em->persist($newAction); $this->em->flush(); } From 0fd23c61a1a6a38be6be21c956b8a70241571478 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 17:19:20 +0200 Subject: [PATCH 07/17] Wording changed when user is not associated to household --- CHANGELOG.md | 1 + .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afc8157c5..d5a997f05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to * [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572) * [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570) * [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573) +* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943) ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index f1e2de958..5bebdb52a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -59,8 +59,8 @@ const appMessages = { ok: "Oui, l'usager quitte le parcours", show_household_number: "Voir le ménage (n° {id})", show_household: "Voir le ménage", - person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.", - update_household: "Renseigner l'appartenance", + person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Veuillez les associer à un ménage dès que possible.", + update_household: "Associer à un ménage", participation_not_valid: "Sélectionnez ou créez au minimum 1 usager", }, requestor: { From 44b537f05e592589cf6b96cffb9d56d773bbadc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 20 Apr 2022 13:52:48 +0200 Subject: [PATCH 08/17] [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older --- CHANGELOG.md | 2 +- .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5a997f05..15a2164ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ and this project adheres to * [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570) * [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573) * [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943) - +* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php index ed3200370..615c33825 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php @@ -77,6 +77,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU * cascade={"remove", "persist"}, * orphanRemoval=true * ) + * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"}) * @Serializer\Groups({"read"}) */ private Collection $documents; From e246ccbcd9ac45a0159723680e4ae1a6565931d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 20 Apr 2022 18:33:08 +0200 Subject: [PATCH 09/17] [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error --- CHANGELOG.md | 1 + .../ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php | 3 +++ .../Resources/views/AccompanyingCourse/Comment/index.html.twig | 1 + 3 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a2164ce..a19aa9495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to * [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573) * [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943) * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older +* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php index 105633e43..25851965f 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php @@ -19,6 +19,7 @@ use DateTimeInterface; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Validator\Constraints as Assert; /** * @ORM\Entity @@ -40,6 +41,8 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface /** * @ORM\Column(type="text") * @Groups({"read", "write"}) + * @Assert\NotBlank() + * @Assert\NotNull() */ private $content; diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig index a8a5d78b8..d5ece68a9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig @@ -40,6 +40,7 @@ {% endif %} {{ form_start(form) }} {{ form_errors(form) }} + {{ form_errors(form.content) }} {{ form_widget(form.content) }}
    • From 33f93d484d409d3d7ce31145305ff24a2c88a5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 11:34:41 +0200 Subject: [PATCH 10/17] deferring the sending of notification to kernel.terminate: prepare --- ...NotificationOnTerminateEventSubscriber.php | 47 +++++++++++++++++++ .../Notification/NotificationPersister.php | 23 +++++++++ .../NotificationPersisterInterface.php | 22 +++++++++ ...ficationOnTerminateEventSubscriberTest.php | 34 ++++++++++++++ .../config/services/notification.yaml | 11 ++--- .../Events/UserRefEventSubscriber.php | 13 +++-- 6 files changed, 137 insertions(+), 13 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php create mode 100644 src/Bundle/ChillMainBundle/Notification/NotificationPersister.php create mode 100644 src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php create mode 100644 src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php new file mode 100644 index 000000000..2739930f5 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php @@ -0,0 +1,47 @@ +em = $em; + $this->persister = $persister; + } + + public static function getSubscribedEvents() + { + return [ + 'kernel.terminate' => [ + ['onKernelTerminate', 1024], // we must ensure that the priority is before sending email + ] + ]; + } + + public function onKernelTerminate(TerminateEvent $event): void + { + if ($event->isMasterRequest()) { + $this->persistNotifications(); + } + } + + private function persistNotifications(): void + { + foreach ($this->persister->getWaitingNotifications() as $notification) { + $this->em->persist($notification); + } + + $this->em->flush(); + } +} diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php new file mode 100644 index 000000000..b8bd132ed --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php @@ -0,0 +1,23 @@ +waitingNotifications[] = $notification; + } + + /** + * @return array|Notification[] + */ + public function getWaitingNotifications(): array + { + return $this->waitingNotifications; + } +} diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php new file mode 100644 index 000000000..a87b5f90a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php @@ -0,0 +1,22 @@ +prophesize(EntityManagerInterface::class); + $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); + $em->flush()->shouldBeCalledTimes(1); + $event = $this->prophesize(TerminateEvent::class); + $event->isMasterRequest()->willReturn(true); + + $eventSubscriber = new PersistNotificationOnTerminateEventSubscriber($em->reveal(), $persister); + + $notification = new Notification(); + $persister->persist($notification); + + $eventSubscriber->onKernelTerminate($event->reveal()); + } +} diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index 544f5544c..bb0b6bb8c 100644 --- a/src/Bundle/ChillMainBundle/config/services/notification.yaml +++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml @@ -3,6 +3,11 @@ services: autowire: true autoconfigure: true + Chill\MainBundle\Notification\: + resource: ../../Notification/ + autoconfigure: true + autowire: true + Chill\MainBundle\Notification\Mailer: arguments: $logger: '@Psr\Log\LoggerInterface' @@ -17,12 +22,6 @@ services: arguments: $handlers: !tagged_iterator chill_main.notification_handler - Chill\MainBundle\Notification\NotificationPresence: ~ - - Chill\MainBundle\Notification\Templating\NotificationTwigExtension: ~ - - Chill\MainBundle\Notification\Templating\NotificationTwigExtensionRuntime: ~ - Chill\MainBundle\Notification\Counter\NotificationByUserCounter: autoconfigure: true autowire: true diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php index ce52fe5e0..6b0004f9b 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php @@ -13,6 +13,7 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Notification\NotificationPersisterInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\Event\LifecycleEventArgs; @@ -24,7 +25,8 @@ use Symfony\Contracts\Translation\TranslatorInterface; class UserRefEventSubscriber implements EventSubscriberInterface { - private EntityManagerInterface $em; + + private NotificationPersisterInterface $notificationPersister; private EngineInterface $engine; @@ -32,12 +34,12 @@ class UserRefEventSubscriber implements EventSubscriberInterface private TranslatorInterface $translator; - public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, EntityManagerInterface $em) + public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, NotificationPersisterInterface $notificationPersister) { $this->security = $security; $this->translator = $translator; $this->engine = $engine; - $this->em = $em; + $this->notificationPersister = $notificationPersister; } public static function getSubscribedEvents() @@ -65,9 +67,6 @@ class UserRefEventSubscriber implements EventSubscriberInterface ) { $this->generateNotificationToUser($period); } - - // we are just out of a flush operation. Launch a new one - $this->em->flush(); } private function generateNotificationToUser(AccompanyingPeriod $period) @@ -89,7 +88,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface )) ->addAddressee($period->getUser()); - $this->em->persist($notification); + $this->notificationPersister->persist($notification); } private function onPeriodConfirmed(AccompanyingPeriod $period) From abc3caee00aee53323314370b6406d6be67b1896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 11:40:29 +0200 Subject: [PATCH 11/17] AccompanyingPeriod: fix method hasPreviousUser --- src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index bd3211c5d..ff26d7b20 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -975,7 +975,7 @@ class AccompanyingPeriod implements public function hasPreviousUser(): bool { - return null !== $this->userPrevious; + return $this->user !== $this->userPrevious; } /** From f7d9551dc13e5131d445b5618875a02b713c95ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 11:41:38 +0200 Subject: [PATCH 12/17] fix cs --- ...NotificationOnTerminateEventSubscriber.php | 12 ++++++++++-- .../Notification/NotificationPersister.php | 19 ++++++++++++++----- .../NotificationPersisterInterface.php | 15 ++++++++++++--- ...ficationOnTerminateEventSubscriberTest.php | 15 ++++++++++++++- .../Events/UserRefEventSubscriber.php | 4 +--- .../Entity/AccompanyingPeriod/Comment.php | 4 ++-- 6 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php index 2739930f5..1f19def23 100644 --- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php +++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php @@ -1,5 +1,14 @@ [ ['onKernelTerminate', 1024], // we must ensure that the priority is before sending email - ] + ], ]; } diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php index b8bd132ed..d426e3cd7 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersister.php @@ -1,5 +1,14 @@ waitingNotifications[] = $notification; - } - /** * @return array|Notification[] */ @@ -20,4 +24,9 @@ class NotificationPersister implements NotificationPersisterInterface { return $this->waitingNotifications; } + + public function persist(Notification $notification): void + { + $this->waitingNotifications[] = $notification; + } } diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php index a87b5f90a..da98e305b 100644 --- a/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php +++ b/src/Bundle/ChillMainBundle/Notification/NotificationPersisterInterface.php @@ -1,11 +1,20 @@ Date: Fri, 22 Apr 2022 12:12:30 +0200 Subject: [PATCH 13/17] period: fix method hasPreviousUser and create method isChangedUser, and use it in Notification --- .../Events/UserRefEventSubscriber.php | 2 +- .../Entity/AccompanyingPeriod.php | 18 +++++++++++++- .../Tests/Entity/AccompanyingPeriodTest.php | 24 +++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php index 45fe4db70..aacb283c3 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php @@ -58,7 +58,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface public function postUpdate(AccompanyingPeriod $period, LifecycleEventArgs $args): void { - if ($period->hasPreviousUser() + if ($period->isChangedUser() && $period->getUser() !== $this->security->getUser() && null !== $period->getUser() && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index ff26d7b20..7615e59fe 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -361,6 +361,8 @@ class AccompanyingPeriod implements */ private Collection $userHistories; + private bool $userIsChanged = false; + /** * Temporary field, which is filled when the user is changed. * @@ -975,7 +977,12 @@ class AccompanyingPeriod implements public function hasPreviousUser(): bool { - return $this->user !== $this->userPrevious; + return null !== $this->userPrevious; + } + + public function isChangedUser(): bool + { + return $this->userIsChanged && $this->user !== $this->userPrevious; } /** @@ -1103,6 +1110,14 @@ class AccompanyingPeriod implements $this->setStep(AccompanyingPeriod::STEP_CONFIRMED); } + public function resetPreviousUser(): self + { + $this->userPrevious = null; + $this->userIsChanged = false; + + return $this; + } + /** * @Groups({"write"}) */ @@ -1329,6 +1344,7 @@ class AccompanyingPeriod implements { if ($this->user !== $user) { $this->userPrevious = $this->user; + $this->userIsChanged = true; foreach ($this->userHistories as $history) { if (null === $history->getEndDate()) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php index 0b66d8648..542144bc2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php @@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Tests\Entity; use ArrayIterator; use Chill\MainBundle\Entity\Address; +use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment; use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation; @@ -62,6 +63,29 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase $this->assertFalse($period->isClosingAfterOpening()); } + public function testHasChangedUser() + { + $period = new AccompanyingPeriod(); + + $this->assertFalse($period->isChangedUser()); + $this->assertFalse($period->hasPreviousUser()); + + $period->setUser($user1 = new User()); + + $this->assertTrue($period->isChangedUser()); + $this->assertFalse($period->hasPreviousUser()); + + $period->resetPreviousUser(); + $this->assertFalse($period->isChangedUser()); + $this->assertFalse($period->hasPreviousUser()); + + $period->setUser($user2 = new User()); + + $this->assertTrue($period->isChangedUser()); + $this->assertTrue($period->hasPreviousUser()); + $this->assertSame($user1, $period->getPreviousUser()); + } + public function testHistoryLocation() { $period = new AccompanyingPeriod(); From 354f130e9e620c374ea48e0b394e6e4b6701d6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 12:12:50 +0200 Subject: [PATCH 14/17] use NotificationPersister into PersonMoveEventSubscriber --- .../PersonAddressMoveEventSubscriber.php | 10 ++--- .../Controller/HouseholdApiController.php | 1 - .../Events/PersonMoveEventSubscriberTest.php | 42 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php index 3eff58dc7..04dfb25cc 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php @@ -13,10 +13,10 @@ namespace Chill\PersonBundle\AccompanyingPeriod\Events; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Notification; +use Chill\MainBundle\Notification\NotificationPersisterInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent; use DateTimeImmutable; -use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Security\Core\Security; use Symfony\Component\Templating\EngineInterface; @@ -26,7 +26,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface { private EngineInterface $engine; - private EntityManagerInterface $entityManager; + private NotificationPersisterInterface $notificationPersister; private Security $security; @@ -34,12 +34,12 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface public function __construct( EngineInterface $engine, - EntityManagerInterface $entityManager, + NotificationPersisterInterface $notificationPersister, Security $security, TranslatorInterface $translator ) { $this->engine = $engine; - $this->entityManager = $entityManager; + $this->notificationPersister = $notificationPersister; $this->security = $security; $this->translator = $translator; } @@ -87,7 +87,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface 'period' => $period, ])); - $this->entityManager->persist($notification); + $this->notificationPersister->persist($notification); } } } diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php index 470094507..f10c1229f 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php @@ -102,7 +102,6 @@ class HouseholdApiController extends ApiController $event ->setPreviousAddress($household->getPreviousAddressOf($address)) ->setNextAddress($address); - dump($event); $this->eventDispatcher->dispatch($event); } diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php index 321d69aac..892bd29f5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php @@ -14,6 +14,8 @@ namespace AccompanyingPeriod\Events; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Notification; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Notification\NotificationPersister; +use Chill\MainBundle\Notification\NotificationPersisterInterface; use Chill\PersonBundle\AccompanyingPeriod\Events\PersonAddressMoveEventSubscriber; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Household\Household; @@ -22,7 +24,6 @@ use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent; use DateTime; use DateTimeImmutable; -use Doctrine\ORM\EntityManagerInterface; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; use ReflectionClass; @@ -73,9 +74,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase ->setPreviousMembership($previousMembership) ->setNextMembership($nextMembership); - $em = $this->prophesize(EntityManagerInterface::class); - $em->persist(Argument::type(Notification::class))->shouldNotBeCalled(); - $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null); + $notificationPersister = $this->prophesize(NotificationPersisterInterface::class); + $notificationPersister->persist(Argument::type(Notification::class))->shouldNotBeCalled(); + $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null); $eventSubscriber->resetPeriodLocation($event); } @@ -115,9 +116,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase ->setPreviousMembership($previousMembership) ->setNextMembership($nextMembership); - $em = $this->prophesize(EntityManagerInterface::class); - $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); - $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null); + $notificationPersister = $this->prophesize(NotificationPersisterInterface::class); + $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); + $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null); $eventSubscriber->resetPeriodLocation($event); @@ -160,9 +161,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase ->setPreviousMembership($previousMembership) ->setNextMembership($nextMembership); - $em = $this->prophesize(EntityManagerInterface::class); - $em->persist(Argument::type(Notification::class))->shouldBeCalled(1); - $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null); + $notificationPersister = $this->prophesize(NotificationPersisterInterface::class); + $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled(1); + $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null); $eventSubscriber->resetPeriodLocation($event); @@ -195,9 +196,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase $event ->setPreviousMembership($previousMembership); - $em = $this->prophesize(EntityManagerInterface::class); - $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); - $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null); + $notificationPersister = $this->prophesize(NotificationPersisterInterface::class); + $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); + $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null); $eventSubscriber->resetPeriodLocation($event); @@ -235,9 +236,9 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase ->setPreviousAddress($household->getPreviousAddressOf($newAddress)) ->setNextAddress($newAddress); - $em = $this->prophesize(EntityManagerInterface::class); - $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); - $eventSubscriber = $this->buildSubscriber(null, $em->reveal(), null, null); + $notificationPersister = $this->prophesize(NotificationPersisterInterface::class); + $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); + $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null); $eventSubscriber->resetPeriodLocation($event); @@ -247,7 +248,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase private function buildSubscriber( ?EngineInterface $engine = null, - ?EntityManagerInterface $entityManager = null, + ?NotificationPersisterInterface $notificationPersister = null, ?Security $security = null, ?TranslatorInterface $translator = null ): PersonAddressMoveEventSubscriber { @@ -267,14 +268,13 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase $engine = $double->reveal(); } - if (null === $entityManager) { - $double = $this->prophesize(EntityManagerInterface::class); - $entityManager = $double->reveal(); + if (null === $notificationPersister) { + $notificationPersister = new NotificationPersister(); } return new PersonAddressMoveEventSubscriber( $engine, - $entityManager, + $notificationPersister, $security, $translator ); From 19561c63cbff8a5e507a2b031abcb3da6d738ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 12:31:23 +0200 Subject: [PATCH 15/17] do not persist if no notification is scheduled --- .../PersistNotificationOnTerminateEventSubscriber.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php index 1f19def23..9a61043ff 100644 --- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php +++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php @@ -46,10 +46,12 @@ class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberIn private function persistNotifications(): void { - foreach ($this->persister->getWaitingNotifications() as $notification) { - $this->em->persist($notification); - } + if (0 < count($this->persister->getWaitingNotifications())) { + foreach ($this->persister->getWaitingNotifications() as $notification) { + $this->em->persist($notification); + } - $this->em->flush(); + $this->em->flush(); + } } } From 6dbe8068ae9e3bf4d2e9195f5be96f6033536218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 12:31:33 +0200 Subject: [PATCH 16/17] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a19aa9495..f7c1c3d1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ and this project adheres to * [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943) * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error +* [Notifications] delay the sending of notificaiton to kernel.terminate +* [Notifications / Period user change] fix the sending of notification when user changes ## Test releases From bd0b45b4ddd18bddc8616252c7cfaa130c23577f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 22 Apr 2022 12:47:50 +0200 Subject: [PATCH 17/17] fix cs --- .../PersistNotificationOnTerminateEventSubscriber.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php index 9a61043ff..cb9d2db92 100644 --- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php +++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php @@ -15,6 +15,7 @@ use Chill\MainBundle\Notification\NotificationPersisterInterface; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\TerminateEvent; +use function count; class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberInterface {