Merge pull request #23 from SpearDevs/extend-usersubscription

Extend usersubscription
SpearDevs · Aug 7, 2023 · 241a9be · 241a9be
2 parents df8f1b3 + 2f33b0f
commit 241a9be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/assets/admin/controllers/push-notifications-generate_controller.js b/assets/admin/controllers/push-notifications-generate_controller.js
@@ -30,7 +30,7 @@ export default class extends Controller {
 
         this.handleValueChange();
 
-        this.receiverInput.addEventListener('input', () => {
+        this.receiverInput.addEventListener('change', () => {
             this.handleValueChange();
         });
     }

diff --git a/src/Controller/Admin/SendPushNotificationAction.php b/src/Controller/Admin/SendPushNotificationAction.php
@@ -42,7 +42,7 @@ public function __invoke(Request $request): Response
             $pushContent = $data['body'] ?? '';
             $customerGroup = $data['groups']?->getName() ?? '';
             $receiver = $data['receiver'] ?? '';
-            $user = $data['user']?->getEmail() ?? '';
+            $user = $data['user']?->getUsername() ?? '';
 
             $this->channelContext->setChannelCode($data['channel']->getCode());
 

diff --git a/src/Repository/MySQLUserSubscriptionRepository.php b/src/Repository/MySQLUserSubscriptionRepository.php
@@ -34,7 +34,7 @@ public function getSubscriptionsForUsersInGroup(string $groupName, ChannelInterf
     public function getSubscriptionsForUserByEmail(string $email, ChannelInterface $channel): iterable
     {
         return $this->getQueryToGetUserSubscriptions()
-            ->where('user.username = :email')
+            ->where('customer.email = :email')
             ->setParameter('email', $email)
             ->andWhere('userSubscription.channel = :channel')
             ->setParameter('channel', $channel)
@@ -47,12 +47,11 @@ private function getQueryToGetUserSubscriptions(): QueryBuilder
         return $this->createQueryBuilder('userSubscription')
             ->select('userSubscription')
             ->leftJoin(
-                'userSubscription.user',
-                'user',
+                'userSubscription.customer',
+                'customer',
                 'WITH',
-                'user.id = userSubscription.user',
+                'customer.id = userSubscription.customer',
             )
-            ->where('userSubscription.user is not null')
-            ->join('user.customer', 'customer');
+            ->where('userSubscription.customer is not null');
     }
 }
diff --git a/tests/Application/assets/controllers/admin/push-notifications-generate_controller.js b/tests/Application/assets/controllers/admin/push-notifications-generate_controller.js
@@ -30,7 +30,7 @@ export default class extends Controller {
 
         this.handleValueChange();
 
-        this.receiverInput.addEventListener('input', () => {
+        this.receiverInput.addEventListener('change', () => {
             this.handleValueChange();
         });
     }