fix bugs

Author: aozisik

src/SendGridChannel.php

@@ -39,10 +39,12 @@ public function send($notifiable, Notification $notification)
             throw new Exception('toSendGrid must return an instance of SendGridMessage.');
         }
 
-        try {
-            $this->sendGrid->send($message->build());
-        } catch (Exception $e) {
-            throw CouldNotSendNotification::serviceRespondedWithAnError($e->getMessage());
+        $response = $this->sendGrid->send($message->build());
+
+        if ($response->statusCode() !== 200) {
+            throw CouldNotSendNotification::serviceRespondedWithAnError(
+                $response->body()
+            );
         }
     }
 }

src/SendGridMessage.php

@@ -88,6 +88,14 @@ public function payload($payload)
      */
     public function build(): Mail
     {
+        if (! $this->from) {
+            // If from is not defined, use the values set in Laravel config
+            $this->from(
+                config('mail.from.address'),
+                config('mail.from.name')
+            );
+        }
+
         $email = new Mail(
             $this->from,
             $this->tos

tests/SendGridChannelTest.php

@@ -9,6 +9,7 @@
 use NotificationChannels\SendGrid\SendGridMessage;
 use PHPUnit\Framework\TestCase;
 use SendGrid;
+use SendGrid\Response;
 
 class SendGridChannelTest extends TestCase
 {
@@ -26,6 +27,9 @@ public function testEmailIsSentViaSendGrid()
             $sendgrid = Mockery::mock(new SendGrid('x'))
         );
 
+        $response = Mockery::mock(Response::class);
+        $response->shouldReceive('statusCode')->once()->andReturn(200);
+
         $message = $notification->toSendGrid($notifiable);
 
         $this->assertEquals($message->templateId, 'sendgrid-template-id');
@@ -37,7 +41,7 @@ public function testEmailIsSentViaSendGrid()
         $this->assertEquals($message->payload['baz'], 'foo2');
 
         // TODO: Verify that the Mail instance passed contains all the info from above
-        $sendgrid->shouldReceive('send')->once();
+        $sendgrid->shouldReceive('send')->once()->andReturn($response);
 
         $channel->send($notifiable, $notification);
     }