Merge pull request #421 from BinaryStudioAcademy/develop

0.5.0
BinaryStudioAcademy · Sep 9, 2020 · 3ef278a · 3ef278a
2 parents 2bd0f3a + b872c29
commit 3ef278a
Show file tree

Hide file tree

Showing 21 changed files with 187 additions and 127 deletions.
diff --git a/api/app/Actions/Event/AddEventAction.php b/api/app/Actions/Event/AddEventAction.php
@@ -37,6 +37,7 @@ public function execute(AddEventRequest $request): UpdateEventResponse
             $event->invitee_email = $request->getInviteeEmail();
             $event->start_date = $request->getStartDate();
             $event->timezone = $request->getTimezone();
+            $event->invitee_information = $request->getInviteeInformation();
 
             $this->eventRepository->save($event);
 

diff --git a/api/app/Actions/Event/AddEventRequest.php b/api/app/Actions/Event/AddEventRequest.php
@@ -12,21 +12,24 @@ final class AddEventRequest
     private string $startDate;
     private string $timezone;
     private ?array $customFieldValues;
+    private ?string $inviteeInformation;
 
     public function __construct(
         int $eventTypeId,
         string $inviteeName,
         string $inviteeEmail,
         string $startDate,
         string $timezone,
-        ?array $customFieldValues
+        ?array $customFieldValues,
+        ?string $inviteeInformation
     ) {
         $this->eventTypeId = $eventTypeId;
         $this->inviteeName = $inviteeName;
         $this->inviteeEmail = $inviteeEmail;
         $this->startDate = $startDate;
         $this->timezone = $timezone;
         $this->customFieldValues = $customFieldValues;
+        $this->inviteeInformation = $inviteeInformation;
     }
 
     public function getEventTypeId(): int
@@ -58,4 +61,9 @@ public function getCustomFieldValues(): ?array
     {
         return $this->customFieldValues;
     }
+
+    public function getInviteeInformation(): ?string
+    {
+        return $this->inviteeInformation;
+    }
 }
diff --git a/api/app/Actions/SocialAccount/AuthResponse.php b/api/app/Actions/SocialAccount/AuthResponse.php
@@ -6,7 +6,7 @@
 
 class AuthResponse
 {
-    private string $urt;
+    private string $url;
     private ?array $data;
 
     public function __construct(string $url, array $data = [])

diff --git a/api/app/Entity/Event.php b/api/app/Entity/Event.php
@@ -17,7 +17,8 @@ class Event extends Model
         'timezone',
         'status',
         'location',
-        'created_at'
+        'created_at',
+        'invitee_information'
     ];
 
     protected $attributes = [

diff --git a/api/app/Exceptions/EventType/CoordinatesFieldIsRequiredException.php b/api/app/Exceptions/EventType/CoordinatesFieldIsRequiredException.php
@@ -9,6 +9,6 @@
 
 final class CoordinatesFieldIsRequiredException extends BaseException
 {
-    protected $message = "For 'location_type = address' field 'coordinates' is required!";
+    protected $message = "Please, choose address for your meeting";
     protected $code = ErrorCode::COORDINATES_FIELD_IS_REQUIRED;
 }
diff --git a/api/app/Http/Controllers/Api/EventController.php b/api/app/Http/Controllers/Api/EventController.php
@@ -54,7 +54,8 @@ public function store(EventRequest $request): JsonResponse
                 $request->invitee_email,
                 $request->start_date,
                 $request->timezone,
-                $request->custom_field_values
+                $request->custom_field_values,
+                $request->invitee_information
             )
         );
 

diff --git a/api/app/Jobs/SendNotificationToOwnerChatito.php b/api/app/Jobs/SendNotificationToOwnerChatito.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Entity\Event;
+use App\Notifications\EventCreatedNotificationToOwnerChatito;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SendNotificationToOwnerChatito implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    private Event $event;
+
+    public function __construct(Event $event)
+    {
+        $this->event = $event;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        new EventCreatedNotificationToOwnerChatito($this->event);
+    }
+}
diff --git a/api/app/Listeners/SendEventCreatedNotificationToOwner.php b/api/app/Listeners/SendEventCreatedNotificationToOwner.php
@@ -3,9 +3,11 @@
 namespace App\Listeners;
 
 use App\Events\EventCreated;
-use App\Notifications\EventCreatedNotification;
+use App\Jobs\SendNotificationToOwnerChatito;
+use App\Notifications\EventCreatedNotificationToOwnerChatito;
+use App\Notifications\EventCreatedNotificationToOwnerMail;
+use App\Notifications\EventCreatedNotificationToOwnerSlack;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendEventCreatedNotificationToOwner implements ShouldQueue
 {
@@ -26,6 +28,12 @@ public function __construct()
      */
     public function handle(EventCreated $eventCreated)
     {
-        $eventCreated->event->eventType->owner->notify(new EventCreatedNotification($eventCreated->event));
+        $eventCreated->event->eventType->owner->notify(new EventCreatedNotificationToOwnerMail($eventCreated->event));
+        if ($eventCreated->event->eventType->owner->slack_active) {
+            $eventCreated->event->eventType->owner->notify(new EventCreatedNotificationToOwnerSlack($eventCreated->event));
+        }
+        if ($eventCreated->event->eventType->owner->chatito_active) {
+            SendNotificationToOwnerChatito::dispatch($eventCreated->event);
+        }
     }
 }
diff --git a/api/app/Mail/EventCreatedMailToInvitee.php b/api/app/Mail/EventCreatedMailToInvitee.php
@@ -49,8 +49,7 @@ public function build()
                 'owner' => $this->owner,
                 'inviteeName' => $this->inviteeName,
                 'inviteeEmail' => $this->inviteeEmail,
-                'customFieldValues' => $this->event->customFieldValues,
-                'location' => $this->event->location
+                'customFieldValues' => $this->event->customFieldValues
             ]);
     }
 }
diff --git a/api/app/Mail/EventCreatedMailToOwner.php b/api/app/Mail/EventCreatedMailToOwner.php
@@ -19,23 +19,13 @@ class EventCreatedMailToOwner extends Mailable
     public EventType $eventType;
     public User $owner;
 
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
     public function __construct(Event $event)
     {
         $this->event = $event;
         $this->eventType = $event->eventType;
         $this->owner = $event->eventType->owner;
     }
 
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
     public function build()
     {
         $this->to($this->owner->getEmail());
@@ -47,8 +37,7 @@ public function build()
             'event' => $this->event,
             'eventType' => $this->eventType,
             'user' => $this->owner,
-            'customFieldValues' => $this->event->customFieldValues,
-            'location' => $this->event->location
+            'customFieldValues' => $this->event->customFieldValues
         ]);
     }
 }
diff --git a/api/app/Notifications/Chatito/BeforeEventChatitoMessage.php b/api/app/Notifications/Chatito/BeforeEventChatitoMessage.php
@@ -25,7 +25,7 @@ protected function generateMessage()
             "{$this->user->name}<br><br>" .
             "<b>Organizator Email:</b><br>" .
             "{$this->user->email}<br><br>" .
-            "<b>Event Date/Time:</b><br>" .
+            "<b>Event Date/Time (UTC):</b><br>" .
             "{$this->event->start_date}<br><br>";
 
         if ($this->event->eventType->location_type == 'zoom') {

diff --git a/api/app/Notifications/Chatito/EventCreatedChatitoMessage.php b/api/app/Notifications/Chatito/EventCreatedChatitoMessage.php
@@ -8,7 +8,7 @@ final class EventCreatedChatitoMessage extends ChatitoMessage
 {
     protected function generateMessage()
     {
-        $message = "Hi, <b>{$this->event->invitee_name}</b> and <b>{$this->user->name}</b><br>" .
+        return "Hi, <b>{$this->event->invitee_name}</b> and <b>{$this->user->name}</b><br>" .
             "A new event was scheduled!<br><br>" .
             "<b>Event Type:</b><br>" .
             "{$this->eventType->name}<br><br>" .
@@ -22,11 +22,7 @@ protected function generateMessage()
             "{$this->user->name}<br><br>" .
             "<b>Organizator Email:</b><br>" .
             "{$this->user->email}<br><br>" .
-            "<b>Event Date/Time:</b><br>" .
+            "<b>Event Date/Time (UTC):</b><br>" .
             "{$this->event->start_date}<br>";
-        if ($this->event->location) {
-            $message .= "<b>Location:</b><br>{$this->event->location}<br>";
-        }
-        return $message;
     }
 }
diff --git a/api/app/Notifications/EventCreatedNotification.php b/api/app/Notifications/EventCreatedNotification.php
diff --git a/api/app/Notifications/EventCreatedNotificationToOwnerChatito.php b/api/app/Notifications/EventCreatedNotificationToOwnerChatito.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Entity\Event;
+use App\Entity\EventType;
+use App\Entity\User;
+use App\Notifications\Chatito\EventCreatedChatitoMessage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class EventCreatedNotificationToOwnerChatito extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    private Event $event;
+
+    public function __construct(Event $event)
+    {
+        $this->event = $event;
+        $this->toChatito();
+    }
+
+    private function toChatito()
+    {
+        return new EventCreatedChatitoMessage($this->event);
+    }
+
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/api/app/Notifications/EventCreatedNotificationToOwnerMail.php b/api/app/Notifications/EventCreatedNotificationToOwnerMail.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Entity\Event;
+use App\Mail\EventCreatedMailToOwner;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class EventCreatedNotificationToOwnerMail extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    private Event $event;
+
+    public function __construct(Event $event)
+    {
+        $this->event = $event;
+    }
+
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    public function toMail($notifiable)
+    {
+        return new EventCreatedMailToOwner($this->event);
+    }
+
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}