diff --git a/.env.example b/.env.example index 2a4a8b7..aae423a 100644 --- a/.env.example +++ b/.env.example @@ -46,14 +46,15 @@ REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -MAIL_MAILER=log -MAIL_HOST=127.0.0.1 -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="hello@example.com" +MAIL_MAILER=smtp +MAIL_HOST=mail.parsaaghayi.ir +MAIL_PORT=465 +MAIL_USERNAME=support-parsaaghayi +MAIL_PASSWORD= +MAIL_ENCRYPTION=ssl +MAIL_FROM_ADDRESS="support@parsaaghayi.ir" MAIL_FROM_NAME="${APP_NAME}" +CONTACT_NOTIFY_TO=support@parsaaghayi.ir,parsa.aghaee@gmail.com AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= diff --git a/app/Http/Controllers/Api/ContactMessageController.php b/app/Http/Controllers/Api/ContactMessageController.php index 9da339a..2b8c17a 100644 --- a/app/Http/Controllers/Api/ContactMessageController.php +++ b/app/Http/Controllers/Api/ContactMessageController.php @@ -3,9 +3,12 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; +use App\Mail\ContactMessageReceived; use App\Models\ContactMessage; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Mail; /** * @OA\Tag(name="Contact", description="Contact form submissions") @@ -15,8 +18,8 @@ class ContactMessageController extends Controller /** * Public contact form submission. * - * The site has no mail service of its own; messages are stored in the - * database and read from the admin panel instead of being emailed. + * Messages are stored for the admin panel and emailed to the support + * mailbox plus the owner notification address. */ public function store(Request $request): JsonResponse { @@ -32,6 +35,18 @@ class ContactMessageController extends Controller 'message' => $validated['message'], ]); + $recipients = config('contact.notify', []); + if ($recipients !== []) { + try { + Mail::to($recipients)->send(new ContactMessageReceived($message)); + } catch (\Throwable $e) { + Log::error('Contact form notification email failed', [ + 'contact_message_id' => $message->id, + 'error' => $e->getMessage(), + ]); + } + } + return response()->json(['message' => 'پیام شما با موفقیت ثبت شد.'], 201); } @@ -67,4 +82,4 @@ class ContactMessageController extends Controller return response()->json(null, 200); } -} \ No newline at end of file +} diff --git a/app/Mail/ContactMessageReceived.php b/app/Mail/ContactMessageReceived.php new file mode 100644 index 0000000..d26b92f --- /dev/null +++ b/app/Mail/ContactMessageReceived.php @@ -0,0 +1,41 @@ +contactMessage->email, + $this->contactMessage->name + ), + ], + ); + } + + public function content(): Content + { + return new Content( + html: 'mail.contact-message', + text: 'mail.contact-message-text', + ); + } +} diff --git a/config/contact.php b/config/contact.php new file mode 100644 index 0000000..815e9c9 --- /dev/null +++ b/config/contact.php @@ -0,0 +1,23 @@ + array_values(array_filter(array_map( + 'trim', + explode(',', (string) env( + 'CONTACT_NOTIFY_TO', + 'support@parsaaghayi.ir,parsa.aghaee@gmail.com' + )) + ))), + +]; diff --git a/resources/views/mail/contact-message-text.blade.php b/resources/views/mail/contact-message-text.blade.php new file mode 100644 index 0000000..92a4a28 --- /dev/null +++ b/resources/views/mail/contact-message-text.blade.php @@ -0,0 +1,8 @@ +پیام جدید از فرم تماس پارساآقایی + +نام: {{ $contactMessage->name }} +ایمیل: {{ $contactMessage->email }} +شناسه: #{{ $contactMessage->id }} + +پیام: +{{ $contactMessage->message }} diff --git a/resources/views/mail/contact-message.blade.php b/resources/views/mail/contact-message.blade.php new file mode 100644 index 0000000..9044785 --- /dev/null +++ b/resources/views/mail/contact-message.blade.php @@ -0,0 +1,34 @@ + + + + + پیام جدید از فرم تماس + + +

پیام جدید از فرم تماس پارساآقایی

+

یک نفر از طریق سایت پیام گذاشته است.

+ + + + + + + + + + + + + + + + + + +
نام{{ $contactMessage->name }}
ایمیل{{ $contactMessage->email }}
پیام{{ $contactMessage->message }}
شناسه#{{ $contactMessage->id }}
+ +

+ این ایمیل به‌صورت خودکار پس از ثبت فرم تماس ارسال شده است. +

+ + diff --git a/tests/Feature/ContactMessageTest.php b/tests/Feature/ContactMessageTest.php index f179c2b..93a5b5e 100644 --- a/tests/Feature/ContactMessageTest.php +++ b/tests/Feature/ContactMessageTest.php @@ -2,9 +2,11 @@ namespace Tests\Feature; +use App\Mail\ContactMessageReceived; use App\Models\User; -use Laravel\Sanctum\Sanctum; use Illuminate\Foundation\Testing\RefreshDatabase; +use Illuminate\Support\Facades\Mail; +use Laravel\Sanctum\Sanctum; use Tests\TestCase; class ContactMessageTest extends TestCase @@ -13,6 +15,8 @@ class ContactMessageTest extends TestCase public function test_the_public_form_stores_a_message(): void { + Mail::fake(); + $response = $this->postJson('/api/contact', [ 'name' => 'Ali', 'email' => 'ali@example.com', @@ -25,15 +29,24 @@ class ContactMessageTest extends TestCase 'email' => 'ali@example.com', 'read_at' => null, ]); + + Mail::assertSent(ContactMessageReceived::class, function (ContactMessageReceived $mail) { + return $mail->contactMessage->email === 'ali@example.com' + && $mail->hasTo('support@parsaaghayi.ir') + && $mail->hasTo('parsa.aghaee@gmail.com'); + }); } public function test_the_public_form_rejects_invalid_payloads(): void { + Mail::fake(); + $this->postJson('/api/contact', ['name' => '', 'email' => 'not-an-email', 'message' => '']) ->assertUnprocessable() ->assertJsonValidationErrors(['name', 'email', 'message']); $this->assertDatabaseCount('contact_messages', 0); + Mail::assertNothingSent(); } public function test_anonymous_requests_cannot_manage_messages(): void @@ -113,4 +126,4 @@ class ContactMessageTest extends TestCase $this->patchJson('/api/admin/messages/'.$message->id, ['read' => true])->assertForbidden(); $this->deleteJson('/api/admin/messages/'.$message->id)->assertForbidden(); } -} \ No newline at end of file +}