From 236dade55fa35b1f64a0d7318ea398d3de816708 Mon Sep 17 00:00:00 2001 From: Matus Kalafut Date: Mon, 4 Sep 2023 10:52:47 +0200 Subject: [PATCH] Fix Mailer segment provider users acquiring - Provided segment code needs to be processed before fetching users from database. remp/mnt#114 (cherry picked from commit bb6784725f0601d3b070b3413596282bd0ff5a83) --- Mailer/extensions/mailer-module/src/Models/Segment/Mailer.php | 3 ++- changelogs/CHANGELOG-v3.2.md | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Mailer/extensions/mailer-module/src/Models/Segment/Mailer.php b/Mailer/extensions/mailer-module/src/Models/Segment/Mailer.php index b871941cf..40600a6f1 100644 --- a/Mailer/extensions/mailer-module/src/Models/Segment/Mailer.php +++ b/Mailer/extensions/mailer-module/src/Models/Segment/Mailer.php @@ -37,6 +37,7 @@ public function list(): array public function users(array $segment): array { - return $this->userSubscriptionsRepository->findSubscribedUserIdsByMailTypeCode($segment['code']); + $code = preg_replace('/^subscribers-/', '', $segment['code']); + return $this->userSubscriptionsRepository->findSubscribedUserIdsByMailTypeCode($code); } } diff --git a/changelogs/CHANGELOG-v3.2.md b/changelogs/CHANGELOG-v3.2.md index 360e7a9a3..e39df298d 100644 --- a/changelogs/CHANGELOG-v3.2.md +++ b/changelogs/CHANGELOG-v3.2.md @@ -1,5 +1,7 @@ ## [3.2] - 2023-08-24 +- [3.2.1] [Mailer]: Fixed Mailer segment provider users acquiring. Provided segment code needs to be processed before fetching users from database. remp/mnt#114 + ### Project - Removed `dockerize` from Dockerfiles across the project. It's been replaced by native Docker Compose healthcheck feature. @@ -27,6 +29,7 @@ --- [3.2]: https://github.com/remp2020/remp/compare/3.1.0...3.2.0 +[3.2.1]: https://github.com/remp2020/remp/compare/3.2.0...3.2.1 [Beam]: https://github.com/remp2020/remp/tree/master/Beam [Campaign]: https://github.com/remp2020/remp/tree/master/Campaign