Merge pull request #9 from OnrampLab/revert-8-3-feat-support-exclusion-criteria

Revert "3 feat support exclusion criteria"

Author: moon-brillar

database/factories/WebhookFactory.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use OnrampLab\Webhooks\Models\Webhook;
-use OnrampLab\Webhooks\ValueObjects\ExclusionCriterion;
+use OnrampLab\Webhooks\ValueObjects\ExclusionCriteria;
 
 class WebhookFactory extends Factory
 {
@@ -27,13 +27,13 @@ public function definition()
             'http_verb' => 'POST',
             'enabled' => true,
             'exclusion_criteria' => [
-                new ExclusionCriterion([
-                    'name' => 'account_ids',
+                new ExclusionCriteria([
+                    'name' => 'campaign_ids',
                     'values' => [1, 2]
                 ]),
-                new ExclusionCriterion([
+                new ExclusionCriteria([
                     'name' => 'events',
-                    'values' => ['test_event']
+                    'values' => ['sms_sent', 'sms_delivered']
                 ])
             ],
             'contextable_id' => $this->faker->randomNumber(),

src/AttributeCastors/ExclusionCriteriaCastor.php

@@ -26,9 +26,4 @@ public function getWebhookPayload(): array
     {
         return [];
     }
-
-    public function getExclusionCriteria(): array
-    {
-        return [];
-    }
 }

src/Concerns/Webhookable.php

@@ -12,6 +12,4 @@ public function getWebhookPayload(): array;
     public function getWebhookContext(): ?Model;
 
     public function getEventOccurredAt(): ?Carbon;
-
-    public function getExclusionCriteria(): array;
 }

src/Contracts/Webhookable.php

@@ -6,7 +6,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use OnrampLab\Webhooks\AttributeCastors\ExclusionCriteriaCastor;
 use OnrampLab\Webhooks\Database\Factories\WebhookFactory;
 
 
@@ -37,7 +36,7 @@ class Webhook extends Model
      */
     protected $casts = [
         'enabled' => 'boolean',
-        'exclusion_criteria' => ExclusionCriteriaCastor::class,
+        'exclusion_criteria' => 'array',
         'headers' => 'array'
     ];
 

src/Models/Webhook.php

@@ -4,7 +4,7 @@
 
 use JsonSerializable;
 
-class ExclusionCriterion implements JsonSerializable
+class ExclusionCriteria implements JsonSerializable
 {
     public string $name;
 
@@ -33,14 +33,4 @@ public function jsonSerialize(): array
     {
         return $this->toArray();
     }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getValues(): array
-    {
-        return $this->values;
-    }
 }

src/ValueObjects/ExclusionCriterion.php src/ValueObjects/ExclusionCriteria.phpsrc/ValueObjects/ExclusionCriterion.php renamed to src/ValueObjects/ExclusionCriteria.php

@@ -14,13 +14,8 @@ class WebhookDispatcher
 
     public function handle(Webhookable $event)
     {
-        $webhooks = $this->getWebhooks($event);
-
-        if ($webhooks->isEmpty()) {
-            return;
-        }
-
         $payload = $event->getWebhookPayload();
+        $webhooks = $this->getWebhooks($event);
         $this->eventOccurredAt = $event->getEventOccurredAt();
 
         foreach ($webhooks as $webhook) {
@@ -50,26 +45,7 @@ protected function getWebhooks(Webhookable $event): Collection
 
     protected function areExclusionCriteriaMatched(Webhookable $event, Webhook $webhook): bool
     {
-        $webhookExclusionCriteria = $webhook->exclusion_criteria;
-        $eventExclusionCriteria = $event->getExclusionCriteria();
-
-        if (is_null($webhookExclusionCriteria) || empty($eventExclusionCriteria))  {
-            return false;
-        }
-
-        foreach ($eventExclusionCriteria as $eventExclusionCriterion) {
-            $eventExclusionCriteriaName = $eventExclusionCriterion->getName();
-            $eventExclusionCriteriaValues = $eventExclusionCriterion->getValues();
-
-            foreach ($webhookExclusionCriteria as $webhookExclusionCriterion) {
-                $webhookExclusionCriteriaName = $webhookExclusionCriterion->getName();
-                $webhookExclusionCriteriaValues = $webhookExclusionCriterion->getValues();
-                if ($eventExclusionCriteriaName === $webhookExclusionCriteriaName && count(array_intersect($webhookExclusionCriteriaValues, $eventExclusionCriteriaValues)) > 0) {
-                    return true;
-                }
-            }
-        }
-
+        //to be implemented
         return  false;
     }
 

src/WebhookDispatcher.php

@@ -2,9 +2,9 @@
 
 namespace OnrampLab\Webhooks\Tests\Classes;
 
+use Illuminate\Database\Eloquent\Model;
 use OnrampLab\Webhooks\Contracts\Webhookable as WebhookableContract;
 use \OnrampLab\Webhooks\Concerns\Webhookable as WebhookableTrait;
-use OnrampLab\Webhooks\ValueObjects\ExclusionCriterion;
 
 class TestEvent implements WebhookableContract
 {
@@ -20,14 +20,4 @@ public function getWebhookContext(): ?Account
     {
         return $this->account;
     }
-
-    public function getExclusionCriteria(): array
-    {
-        return [
-            new ExclusionCriterion([
-                'name' => 'events',
-                'values' => ['test_event']
-            ]),
-        ];
-    }
 }

tests/Classes/TestEvent.php

@@ -31,6 +31,7 @@ protected function setUp(): void
      */
     public function should_dispatch_webhook_according_to_context(): void
     {
+
         Queue::fake();
 
         $dispatcher = new WebhookDispatcher();

tests/Feature/WebhookDispatcherTest.php

@@ -2,35 +2,7 @@
 
 namespace OnrampLab\Webhooks\Tests\Unit;
 
-use OnrampLab\Webhooks\CallWebhookJob;
-use OnrampLab\Webhooks\Models\Webhook;
-use OnrampLab\Webhooks\Tests\Classes\Account;
-use OnrampLab\Webhooks\Tests\Classes\TestEvent;
-use OnrampLab\Webhooks\Tests\TestCase;
-use OnrampLab\Webhooks\WebhookDispatcher;
-
-class WebhookDispatcherTest extends TestCase
+class WebhookDispatcherTest
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->account = Account::factory()->create();
-        $attributes = [
-            'contextable_id' => $this->account->id,
-            'contextable_type' => get_class($this->account)
-        ];
-        $this->webhook = Webhook::factory()->create($attributes);
-        $this->event = new TestEvent($this->account);
-        $this->callWebhookJobMock = $this->mock(CallWebhookJob::class);
-    }
 
-    /**
-     * @test
-     */
-    public function should_not_dispatch_webhook_when_exclusion_criteria_are_matched(): void
-    {
-        $dispatcher = new WebhookDispatcher();
-        $dispatcher->handle($this->event);
-    }
 }
-