Merge pull request #60 from BinaryStudioAcademy/feature/invitation-email

nemoipaha · web-flow · commit 3f041377fd18 · 2019-05-13T17:10:53.000+03:00
Implement mail queue
diff --git a/backend/.env.example b/backend/.env.example
@@ -29,6 +29,8 @@ MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=
+MAIL_FROM_NAME=
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -48,3 +50,5 @@ JWT_SECRET=
 MYSQL_PORT=33061
 APP_PORT=7777
 MYSQL_PORT_TEST_DB=33062
+
+BEANSTALKD_HOST=
diff --git a/backend/app/Action/Auth/RegisterAction.php b/backend/app/Action/Auth/RegisterAction.php
@@ -5,14 +5,18 @@
 namespace App\Action\Auth;
 
 use App\Repository\UserRepository;
+use Illuminate\Mail\Mailer;
+use App\Mail\WelcomeEmail;
 
 final class RegisterAction
 {
     private $userRepository;
+    private $mailer;
 
-    public function __construct(UserRepository $userRepository)
+    public function __construct(UserRepository $userRepository, Mailer $mailer)
     {
         $this->userRepository = $userRepository;
+        $this->mailer = $mailer;
     }
 
     public function execute(RegisterRequest $request): AuthenticationResponse
@@ -23,13 +27,14 @@ public function execute(RegisterRequest $request): AuthenticationResponse
             'name' => $request->getName(),
             'nickname' => $request->getNickname()
         ]);
-
         $token = auth()->login($user);
 
+        $this->mailer->to($user)->send(new WelcomeEmail());
+
         return new AuthenticationResponse(
             $token,
             'bearer',
             auth()->factory()->getTTL() * 60
         );
     }
-}
+}
diff --git a/backend/app/Mail/WelcomeEmail.php b/backend/app/Mail/WelcomeEmail.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class WelcomeEmail extends Mailable implements ShouldQueue
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->subject('Welcome!')->view('emails.welcome');
+    }
+}
diff --git a/backend/composer.json b/backend/composer.json
@@ -15,6 +15,7 @@
         "fideloper/proxy": "^4.0",
         "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0",
+        "pda/pheanstalk": "^4.0",
         "tymon/jwt-auth": "1.0.*"
     },
     "require-dev": {
diff --git a/backend/composer.lock b/backend/composer.lock
diff --git a/backend/config/queue.php b/backend/config/queue.php
@@ -43,7 +43,7 @@
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host' => 'localhost',
+            'host' => env('BEANSTALKD_HOST', 'localhost'),
             'queue' => 'default',
             'retry_after' => 90,
             'block_for' => 0,
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
@@ -46,3 +46,7 @@ services:
         - MYSQL_DATABASE=thread-testing
         - MYSQL_USER=user
         - MYSQL_PASSWORD=secret
+
+    beanstalkd:
+      image: schickling/beanstalkd
+      container_name: thread-beanstalkd
diff --git a/backend/resources/views/emails/welcome.blade.php b/backend/resources/views/emails/welcome.blade.php
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Welcome!</title>
+  </head>
+  <body>
+    Welcome to Thread application!
+  </body>
+</html>
