Code review fixes

.gitignore

@@ -1,4 +1,3 @@
-/.idea
 /vendor/
 /node_modules/
 /composer.lock

src/Form/Model/SendPushNotificationFormModel.php

@@ -4,27 +4,27 @@
 
 namespace SpearDevs\SyliusPushNotificationsPlugin\Form\Model;
 
-use SpearDevs\SyliusPushNotificationsPlugin\Validator\Constraints\PushNotificationUser;
+use SpearDevs\SyliusPushNotificationsPlugin\Validator\Constraints\PushNotificationUserSubscriptionExists;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Customer\Model\CustomerGroupInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 
-/** @PushNotificationUser() */
+/** @PushNotificationUserSubscriptionExists() */
 final class SendPushNotificationFormModel
 {
     /** @Assert\NotBlank() */
-    public ?string $title = null;
+    public string $title;
 
     /** @Assert\NotBlank() */
-    public ?string $body = null;
+    public string $body;
 
     /** @Assert\NotBlank() */
-    public ?ChannelInterface $channel = null;
+    public ChannelInterface $channel;
 
-    public ?string $receiver = null;
+    public string $receiver;
 
     public ?CustomerGroupInterface $group = null;
 
     /** @Assert\Email() */
-    public ?string $userEmail = null;
+    public string $userEmail;
 }

src/Validator/Constraints/PushNotificationUser.php → src/Validator/Constraints/PushNotificationUserSubscriptionExists.php

@@ -9,7 +9,7 @@
 /**
  * @Annotation
  */
-class PushNotificationUser extends Constraint
+class PushNotificationUserSubscriptionExists extends Constraint
 {
     public string $message = 'push_notifications.send.user_subscription_not_exist';
 

src/Validator/Constraints/PushNotificationUserValidator.php → src/Validator/Constraints/PushNotificationUserSubscriptionExistsValidator.php

@@ -12,7 +12,7 @@
 use Symfony\Component\Validator\ConstraintValidator;
 use Traversable;
 
-final class PushNotificationUserValidator extends ConstraintValidator
+final class PushNotificationUserSubscriptionExistsValidator extends ConstraintValidator
 {
     public function __construct(
         private UserSubscriptionRepositoryInterface $userSubscriptionRepository,
@@ -24,7 +24,7 @@ public function __construct(
      */
     public function validate($value, Constraint $constraint): void
     {
-        if (!$constraint instanceof PushNotificationUser) {
+        if (!$constraint instanceof PushNotificationUserSubscriptionExists) {
             throw new UnexpectedTypeException($constraint, PushNotificationUser::class);
         }
 

src/WebPushSender/WebPushSender.php

@@ -51,17 +51,17 @@ public function sendWebPush(SendPushNotificationFormModel $sendPushNotificationF
         $pushContent = $sendPushNotificationFormModel->body;
         $receiver = $sendPushNotificationFormModel->receiver;
         $channel = $sendPushNotificationFormModel->channel;
-        $userEmail = $sendPushNotificationFormModel->userEmail;
-        $customerGroup = $sendPushNotificationFormModel->group;
 
         $webPush = $this->webPushFactory->create($this->orderParameterMapper, null, null, $pushTitle, $pushContent);
 
         if ($receiver === self::USER_RECEIVER) {
+            $userEmail = $sendPushNotificationFormModel->userEmail;
             $this->sendToUser($webPush, $channel, $userEmail);
         }
 
         if ($receiver === self::GROUP_RECEIVER) {
-            $this->sendToGroup($webPush, $channel, $customerGroup);
+            $customerGroup = $sendPushNotificationFormModel->group;
+            $this->sendToGroup($webPush, $channel, $customerGroup?->getName());
         }
     }
 

translations/validators.en.yaml

@@ -1,4 +1,4 @@
 push_notifications:
     send:
-        user_subscription_not_exist: The user with the provided email address has not consented to receiving push notifications.
+        user_subscription_not_exist: The user with the provided email address do not consent to receive push notifications.