Add email queue

Author: ymhuang0808

app/Http/Controllers/Api/V1_0/VolunteerAuthController.php

@@ -5,8 +5,11 @@
 use App\Http\Requests\Api\V1_0\VolunteerRegistrationRequest;
 use App\Http\Controllers\Controller;
 use Dingo\Api\Routing\Helpers;
-use App\Vounteer;
+use App\Volunteer;
 use App\City;
+use App\VerificationCode;
+use App\Jobs\SendVerificationEmail;
+use App\Utils\StringUtil;
 
 class VolunteerAuthController extends Controller
 {
@@ -31,14 +34,20 @@ public function register(VolunteerRegistrationRequest $request)
         // Get volunteer data, except city object
         $volunteerInput = $request->except(['city']);
         // Get city ID
-        //$cityId = $request->input('city.id');
+        $cityId = $request->input('city.id');
+        $verificationCodeString = StringUtil::generateHashToken();
 
         // Create a new volunteer
-        //$volunteer = Volunteer::create($volunteerInput);
-        //$city = City::find($cityId);
-        //$volunteer->cities()->save($city);
+        $volunteer = Volunteer::create($volunteerInput);
+        $city = City::find($cityId);
+        $volunteer->cities()->save($city);
+        
+        // Save verification code into the volunteer
+        $verificationCode = new VerificationCode(['code' => $verificationCodeString]);
+        $volunteer->verificationCode()->save($verificationCode);
 
-        // Send verification email
+        // Send verification email to an queue
+        $this->dispatch(new SendVerificationEmail($volunteer, $verificationCodeString, 'Verification email'));
 
         // Get authentication token
 

app/Jobs/SendVerificationEmail.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Jobs\Job;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Bus\SelfHandling;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Mail\Mailer;
+use App\Volunteer;
+
+class SendVerificationEmail extends Job implements SelfHandling, ShouldQueue
+{
+    use InteractsWithQueue, SerializesModels;
+
+    protected $volunteer;
+    protected $verificationCode;
+    protected $subject;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Volunteer $volunteer, $verificationCode, $subject)
+    {
+        $this->volunteer = $volunteer;
+        $this->verificationCode = $verificationCode;
+        $this->subject = $subject;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(Mailer $mailer)
+    {
+        if ($this->attempts() < 10 ) {
+            $data = [
+                    'name' => $this->volunteer->last_name, 
+                    'verifcationUrl' => $this->verificationCode
+                ];
+            $lastName = $this->volunteer->last_name;
+            $emailAddress = $this->volunteer->email;
+            $subject = $this->subject;
+
+            $mailer->send('emails.verify', 
+                            $data, 
+                            function ($message) use ($lastName, $emailAddress, $subject) {
+                                $message->to($emailAddress, $lastName)->subject($subject);
+                        });
+        }
+    }
+}

app/Utils/StringUtil.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Utils;
+
+use Hash;
+
+class StringUtil
+{
+    public static function generateHashToken()
+    {
+        // generate 
+        $randomString = str_random(100) . time();
+        return Hash::make($randomString);
+    }
+}

app/VerificationCode.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class VerificationCode extends Model
+{
+    protected $table = 'verification_codes';
+
+    public function volunteer()
+    {
+        return $this->belongsTo('App\Volunteer');
+    }
+}

app/Volunteer.php

@@ -25,4 +25,9 @@ public function cities()
     {
         return $this->belongsToMany('App\City');
     }
+
+    public function verificationToken()
+    {
+        return $this->hasOne('App\VerificationCode');
+    }
 }

config/mail.php

@@ -54,7 +54,7 @@
     |
     */
 
-    'from' => ['address' => null, 'name' => null],
+    'from' => ['address' => env('MAIL_FROM', null), 'name' => env('MAIL_NAME', null)],
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2015_09_15_055905_create_volunteers_table.php

@@ -7,7 +7,6 @@ class CreateVolunteersTable extends Migration
 {
     /**
      * Run the migrations.
-     *
      * @return void
      */
     public function up()

database/migrations/2015_10_02_091444_create_verification_codes_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateVerificationCodesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('verification_codes', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('code')->unique();
+            $table->integer('volunteer_id')->unique();
+            $table->dateTime('created_at');
+            $table->dateTime('updated_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('verification_codes');
+    }
+}

resources/views/emails/verify.blade.php

@@ -0,0 +1,2 @@
+Hi, {{ $name }}
+Link: {{ $verifcationUrl }}