webhook attributes transformation fix

Author: Triplkrypl

src/Controller/Webhook/AddListener.php

@@ -29,7 +29,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $webhook = $this->repository->save($type, $params);
         if ($webhook === null) {
-            throw new ApiException('Webhook: \''.$params->listeningUrl().'\' with type: \''.$type.'\' and attribute array already exist', HttpCodes::HTTP_CONFLICT);
+            throw new ApiException('Webhook: \''.$params->listeningUrl().'\' with type: \''.$type.'\' already exist', HttpCodes::HTTP_CONFLICT);
         }
 
         return ResponseFactory::makeJson($webhook, new WebhookTransformer());

src/Controller/Webhook/Symfony.php

@@ -27,7 +27,7 @@ public function addListener(Request $request): Response
 
         $webhook = $this->repository->save($type, $params);
         if ($webhook === null) {
-            throw new ConflictHttpException('Webhook: \''.$params->listeningUrl().'\' with type: \''.$type.'\' and attribute array already exist');
+            throw new ConflictHttpException('Webhook: \''.$params->listeningUrl().'\' with type: \''.$type.'\' already exist');
         }
 
         return ResponseFactory::makeJson($webhook, new WebhookTransformer());

src/Model/Webhook/Params.php

@@ -9,7 +9,7 @@ final class Params
     /**
      * @param non-empty-string $listeningUrl
      * @param Priority::* $priority
-     * @param array<string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      */
     public function __construct(
         private string $listeningUrl,
@@ -35,7 +35,7 @@ public function priority(): int
     }
 
     /**
-     * @return array<string, string>
+     * @return array<non-empty-string, non-empty-string>
      */
     public function attributes(): array
     {

src/Service/Client/ApiClient.php

@@ -245,7 +245,7 @@ public function waitArray(ResponsePromise $promise, bool $allowInvalidJson = fal
      * @param non-empty-string $type
      * @param non-empty-string $listeningUrl example: https://example.com/listening/...
      * @param Priority::* $priority
-     * @param array<non-empty-string, string> $requiredAttributes without them can not be webhook dispatched
+     * @param array<non-empty-string, non-empty-string> $requiredAttributes without them can not be webhook dispatched
      * @param array<string, string|array<string>> $requestHeaders
      * @throws ApiException
      */

src/Service/Webhook/Dispatcher.php

@@ -16,7 +16,7 @@ public function __construct(
 
     /**
      * @param non-empty-string $type
-     * @param array<non-empty-string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      * @param array<non-empty-string, string|array<string>> $headers to apply for http request
      * @param array<RequestOptions::*, mixed> $options to apply for http request
      */
@@ -34,7 +34,7 @@ public function dispatch(string $type, array $attributes, bool $synchronouslyFir
 
     /**
      * @param non-empty-string $type
-     * @param array<non-empty-string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      * @param positive-int $delayInSeconds
      * @param array<non-empty-string, string|array<string>> $headers to apply on http requests
      * @param array<RequestOptions::*, mixed> $options to apply on http requests

src/Service/Webhook/LaravelMysqlRepository.php

@@ -22,7 +22,7 @@ public function __construct(
 
     /**
      * @param non-empty-string $type
-     * @param array<string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      * @return iterable<Webhook>
      */
     public function loadForDispatching(string $type, array $attributes): iterable
@@ -150,7 +150,7 @@ public function delete(string $webhookId): void
     }
 
     /**
-     * @param array<string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      * @return array<int>
      */
     private function getWebhooksForAttributes(ConnectionInterface $connection, array $attributes): array
@@ -183,7 +183,7 @@ private function getWebhooksForAttributes(ConnectionInterface $connection, array
     }
 
     /**
-     * @return array<string, string>
+     * @return array<non-empty-string, non-empty-string>
      */
     private function getWebhookRequiredAttributes(ConnectionInterface $connection, int $webhookId): array
     {
@@ -197,13 +197,13 @@ private function getWebhookRequiredAttributes(ConnectionInterface $connection, i
             }
         }
 
-        /** @var array<string, string> */
+        /** @var array<non-empty-string, non-empty-string> */
         return $attributes;
     }
 
     /**
-     * @param array<string, string> $requiredAttributes
-     * @param array<string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $requiredAttributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      */
     private function haveAttributesRequiredAttributes(array $requiredAttributes, array $attributes): bool
     {

src/Service/Webhook/ParamsTransformer.php

@@ -7,7 +7,6 @@
 use SimpleAsFuck\ApiToolkit\Model\Webhook\Params;
 use SimpleAsFuck\ApiToolkit\Model\Webhook\Priority;
 use SimpleAsFuck\ApiToolkit\Service\Transformation\Transformer;
-use SimpleAsFuck\Validator\Rule\ArrayRule\TypedKey;
 use SimpleAsFuck\Validator\Rule\Custom\UserClassRule;
 use SimpleAsFuck\Validator\Rule\Object\ObjectRule;
 
@@ -19,10 +18,9 @@ final class ParamsTransformer implements Transformer, UserClassRule
 {
     public function validate(ObjectRule $rule): Params
     {
-        $attributeType = static fn (TypedKey $key): string => $key->string()->notNull();
         $attributes = [];
-        foreach ($rule->property('attributes')->array()->of($attributeType)->notNull() as $key => $attribute) {
-            $attributes[(string) $key] = $attribute;
+        foreach ($rule->property('attributes')->array()->ofObject()->notNull() as $object) {
+            $attributes[$object->property('key')->string()->notEmpty()->notNull()] = $object->property('value')->string()->notEmpty()->notNull();
         }
         return new Params(
             $rule->property('listeningUrl')->string()->httpUrl([PHP_URL_PATH])->notNull(),
@@ -36,11 +34,18 @@ public function validate(ObjectRule $rule): Params
      */
     public function toApi($transformed): \stdClass
     {
-        $apiData = new \stdClass();
-        $apiData->listeningUrl = $transformed->listeningUrl();
-        $apiData->priority = $transformed->priority();
-        $apiData->attributes = $transformed->attributes();
+        $attributes = [];
+        foreach ($transformed->attributes() as $key => $value) {
+            $attributes[] = (object) [
+                'key' => $key,
+                'value' => $value,
+            ];
+        }
 
-        return $apiData;
+        return (object) [
+            'listeningUrl' => $transformed->listeningUrl(),
+            'priority' => $transformed->priority(),
+            'attributes' => $attributes,
+        ];
     }
 }

src/Service/Webhook/Repository.php

@@ -25,7 +25,7 @@ abstract class Repository
      * than listeners who accept anything
      *
      * @param non-empty-string $type
-     * @param array<string, string> $attributes with webhook will be dispatched
+     * @param array<non-empty-string, non-empty-string> $attributes with webhook will be dispatched
      * @return iterable<Webhook>
      */
     abstract public function loadForDispatching(string $type, array $attributes): iterable;

test/Service/Webhook/LaravelMysqlRepositoryTest.php

@@ -63,7 +63,7 @@ public static function tearDownAfterClass(): void
      *
      * @param array<non-empty-string> $expectedUrls
      * @param non-empty-string $type
-     * @param array<string, string> $attributes
+     * @param array<non-empty-string, non-empty-string> $attributes
      */
     public function testLoadForDispatching(array $expectedUrls, string $type, array $attributes): void
     {