Feature message flexibility

.gitignore

@@ -8,3 +8,5 @@ npm-debug.log
 vagrant-credentials.rb
 ubuntu-bionic-18.04-cloudimg-console.log
 .phpunit.result.cache
+code/public/assets/
+

code/app/Athenia/Contracts/Services/Messaging/SendEmailServiceContract.php

@@ -3,5 +3,15 @@
 
 namespace App\Athenia\Contracts\Services\Messaging;
 
+use App\Models\Messaging\Message;
+
 interface SendEmailServiceContract extends BaseMessageSendingServiceContract
-{}
+{
+    /**
+     * Used when there is no to set on the message
+     *
+     * @param Message $message
+     * @return void
+     */
+    public function sendDirectMessage(Message $message);
+}

code/app/Athenia/Listeners/Messaging/MessageCreatedListener.php

@@ -8,6 +8,7 @@
 use App\Athenia\Contracts\Repositories\Messaging\MessageRepositoryContract;
 use App\Athenia\Contracts\Services\Messaging\BaseMessageSendingServiceContract;
 use App\Athenia\Contracts\Services\Messaging\MessageSendingSelectionServiceContract;
+use App\Athenia\Contracts\Services\Messaging\SendEmailServiceContract;
 use App\Athenia\Events\Messaging\MessageCreatedEvent;
 use App\Athenia\Events\Messaging\MessageSentEvent;
 use App\Models\Messaging\Message;
@@ -56,16 +57,22 @@ public function handle(MessageCreatedEvent $event): void
                 ->filter(fn (?BaseMessageSendingServiceContract $maybeService) => $maybeService);
         foreach ($availableServices as $service) {
 
-            $to = $message->to;
-            if ($to instanceof CanReceiveMessageContract) {
-                $service->sendMessage($to, $message);
+            $to = $message->to_id ? $message->to : null;
+            if (!$to && $message->email && $service instanceof SendEmailServiceContract) {
+                $service->sendDirectMessage($message);
                 $sent = true;
             }
-            if ($to instanceof HasMessageReceiversContract) {
-                foreach ($to->messageReceivers($message) as $messageReceiver) {
-                    $service->sendMessage($messageReceiver, $message);
+            else {
+                if ($to instanceof CanReceiveMessageContract) {
+                    $service->sendMessage($to, $message);
                     $sent = true;
                 }
+                if ($to instanceof HasMessageReceiversContract) {
+                    foreach ($to->messageReceivers($message) as $messageReceiver) {
+                        $service->sendMessage($messageReceiver, $message);
+                        $sent = true;
+                    }
+                }
             }
         }
 

code/app/Athenia/Mail/MessageMailer.php

@@ -21,10 +21,10 @@ class MessageMailer extends Mailable implements ShouldQueue
 
     /**
      * NotificationMailer constructor.
-     * @param CanReceiveEmailsContract $receiver
      * @param Message $message
+     * @param CanReceiveEmailsContract|null $receiver
      */
-    public function __construct(private CanReceiveEmailsContract $receiver, private Message $message)
+    public function __construct(private Message $message, private ?CanReceiveEmailsContract $receiver = null)
     {
         $this->chain([new MessageSentEvent($message)]);
     }
@@ -37,7 +37,7 @@ public function __construct(private CanReceiveEmailsContract $receiver, private
     public function build()
     {
         $email = $this->message->email ?? $this->receiver->getEmailAddress();
-        $name = $this->receiver->getEmailToName();
+        $name = $this->receiver?->getEmailToName();
         $data = $this->message->data;
         if (isset ($data['message'])) {
             $data['message_content'] = $data['message'];

code/app/Athenia/Services/Messaging/SendEmailService.php

@@ -27,11 +27,22 @@ public function __construct(private Mailer $mailer) {}
     public function sendMessage(CanReceiveMessageContract $receiver, Message $message): bool
     {
         if ($receiver instanceof CanReceiveEmailsContract && $receiver->canReceiveMessage($message)) {
-            $this->mailer->send(new MessageMailer($receiver, $message));
+            $this->mailer->send(new MessageMailer($message, $receiver));
 
             return true;
         }
 
         return false;
     }
+
+    /**
+     * Used when there is no to set on the message
+     *
+     * @param Message $message
+     * @return void
+     */
+    public function sendDirectMessage(Message $message)
+    {
+        $this->mailer->send(new MessageMailer($message));
+    }
 }

code/app/Policies/Wiki/ArticlePolicy.php

@@ -22,10 +22,7 @@ class ArticlePolicy extends BasePolicyAbstract
      */
     public function all(User $user)
     {
-        return $user->hasRole([
-            Role::ARTICLE_VIEWER,
-            Role::ARTICLE_EDITOR,
-        ]);
+        return true;
     }
 
     /**
@@ -37,10 +34,7 @@ public function all(User $user)
      */
     public function view(User $user, Article $model)
     {
-        return $user->hasRole([
-            Role::ARTICLE_VIEWER,
-            Role::ARTICLE_EDITOR,
-        ]);
+        return true;
     }
 
     /**

code/config/app.php

@@ -54,7 +54,7 @@
 
     'url' => env('APP_URL', 'http://localhost'),
 
-    'asset_url' => env('ASSET_URL', 'http://dev-assets.localhost'),
+    'asset_url' => env('ASSET_URL', 'http://localhost:8081'),
 
     /*
     |--------------------------------------------------------------------------
@@ -67,7 +67,7 @@
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------

code/config/filesystems.php

@@ -50,8 +50,8 @@
 
         'public' => [
             'driver' => 'local',
-            'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'root' => public_path(),
+            'url' => env('APP_URL'),
             'visibility' => 'public',
         ],
 

code/phpunit.xml

@@ -6,8 +6,6 @@
         colors="true"
         processIsolation="false"
         beStrictAboutTestsThatDoNotTestAnything="false"
-        stopOnFailure="true"
-        stopOnError="true"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
         cacheDirectory=".phpunit.cache"
         backupStaticProperties="false"

code/tests/Athenia/Feature/Http/Article/ArticleIndexTest.php

@@ -37,16 +37,6 @@ public function testNotLoggedUserBlocked(): void
         $response->assertStatus(403);
     }
 
-    public function testIncorrectUserRoleBlocked(): void
-    {
-        foreach ($this->rolesWithoutAdmins([Role::ARTICLE_VIEWER, Role::ARTICLE_EDITOR]) as $role ) {
-            $this->actAs($role);
-            $response = $this->json('GET', $this->path);
-
-            $response->assertStatus(403);
-        }
-    }
-
     public function testGetPaginationEmpty(): void
     {
         foreach ([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER] as $role) {

code/tests/Athenia/Feature/Http/Article/ArticleViewTest.php

@@ -47,17 +47,6 @@ public function testNotLoggedInUserBlocked(): void
         $response->assertStatus(403);
     }
 
-    public function testIncorrectUserRoleBlocked(): void
-    {
-        foreach ($this->rolesWithoutAdmins([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER]) as $role) {
-            $this->actAs($role);
-
-            $response = $this->json('GET', $this->path);
-
-            $response->assertStatus(403);
-        }
-    }
-
     public function testNotFound(): void
     {
         $this->actAsUser();

code/tests/Athenia/Feature/Http/Authentication/LogoutTest.php

@@ -34,6 +34,9 @@ public function handle($request, $next) {
             }
         });
 
+        $log = app('log');
+        $log->shouldReceive('channel')->andReturn($log);
+
         $user = User::factory()->create();
         $token = JWTAuth::fromUser($user);
         $response = $this->json('POST', '/v1/auth/logout', [], ['Authorization' => 'Bearer ' . $token]);

code/tests/Athenia/Integration/Policies/Wiki/ArticlePolicyTest.php

@@ -4,6 +4,7 @@
 namespace Tests\Athenia\Integration\Policies\Wiki;
 
 use App\Models\Role;
+use App\Models\User\User;
 use App\Models\Wiki\Article;
 use App\Policies\Wiki\ArticlePolicy;
 use Tests\DatabaseSetupTrait;
@@ -22,44 +23,14 @@ public function testAllSuccess(): void
     {
         $policy = new ArticlePolicy();
 
-        foreach ([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER] as $role) {
-            $user = $this->getUserOfRole($role);
-
-            $this->assertTrue($policy->all($user));
-        }
-    }
-
-    public function testAllBlocks(): void
-    {
-        $policy = new ArticlePolicy();
-
-        foreach ($this->rolesWithoutAdmins([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER]) as $role) {
-            $user = $this->getUserOfRole($role);
-
-            $this->assertFalse($policy->all($user));
-        }
+        $this->assertTrue($policy->all(new User()));
     }
 
     public function testViewSuccess(): void
     {
         $policy = new ArticlePolicy();
 
-        foreach ([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER] as $role) {
-            $user = $this->getUserOfRole($role);
-
-            $this->assertTrue($policy->view($user, new Article()));
-        }
-    }
-
-    public function testViewBlocks(): void
-    {
-        $policy = new ArticlePolicy();
-
-        foreach ($this->rolesWithoutAdmins([Role::ARTICLE_EDITOR, Role::ARTICLE_VIEWER]) as $role) {
-            $user = $this->getUserOfRole($role);
-
-            $this->assertFalse($policy->view($user, new Article()));
-        }
+        $this->assertTrue($policy->view(new User(),  new Article()));
     }
 
     public function testCreateSuccess(): void

code/tests/Athenia/Unit/Mail/MessageMailerTest.php

@@ -31,7 +31,7 @@ public function testBuild(): void
             ],
         ]);
 
-        $messageMailer = new MessageMailer($user, $message);
+        $messageMailer = new MessageMailer($message, $user);
 
         $builtMailer = $messageMailer->build();