diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php index b62397b2d0..8d07938bc8 100644 --- a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php +++ b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php @@ -857,13 +857,6 @@ class OpenAPI3 extends Format if ($model->isAny()) { $output['components']['schemas'][$model->getType()]['additionalProperties'] = true; - - $additionalKey = \method_exists($model, 'getAdditionalPropertiesKey') - ? $model->getAdditionalPropertiesKey() - : null; - if ($additionalKey !== null) { - $output['components']['schemas'][$model->getType()]['x-additional-properties-key'] = $additionalKey; - } } if (!empty($required)) { diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php index edf6c2823d..9265e1ec60 100644 --- a/src/Appwrite/SDK/Specification/Format/Swagger2.php +++ b/src/Appwrite/SDK/Specification/Format/Swagger2.php @@ -820,13 +820,6 @@ class Swagger2 extends Format if ($model->isAny()) { $output['definitions'][$model->getType()]['additionalProperties'] = true; - - $additionalKey = \method_exists($model, 'getAdditionalPropertiesKey') - ? $model->getAdditionalPropertiesKey() - : null; - if ($additionalKey !== null) { - $output['definitions'][$model->getType()]['x-additional-properties-key'] = $additionalKey; - } } if (!empty($required)) { diff --git a/src/Appwrite/Utopia/Response/Model/Any.php b/src/Appwrite/Utopia/Response/Model/Any.php index 0ae3040a1d..6863748ac8 100644 --- a/src/Appwrite/Utopia/Response/Model/Any.php +++ b/src/Appwrite/Utopia/Response/Model/Any.php @@ -12,26 +12,6 @@ class Any extends Model */ protected bool $any = true; - /** - * JSON wire-format key under which extra/dynamic attributes are exposed in - * generated SDK models (e.g. Document's `data` slot). Default null means - * SDK templates fall back to their hardcoded "data" key. Set this on - * subclasses (via setAdditionalPropertiesKey) to use a custom key like - * "metadata" while still benefiting from the generic `Model` mapping. - */ - protected ?string $additionalPropertiesKey = null; - - public function setAdditionalPropertiesKey(string $key): self - { - $this->additionalPropertiesKey = $key; - return $this; - } - - public function getAdditionalPropertiesKey(): ?string - { - return $this->additionalPropertiesKey; - } - /** * Get Name * diff --git a/src/Appwrite/Utopia/Response/Model/Presence.php b/src/Appwrite/Utopia/Response/Model/Presence.php index ecc3755bae..809018d29c 100644 --- a/src/Appwrite/Utopia/Response/Model/Presence.php +++ b/src/Appwrite/Utopia/Response/Model/Presence.php @@ -3,9 +3,10 @@ namespace Appwrite\Utopia\Response\Model; use Appwrite\Utopia\Response; +use Appwrite\Utopia\Response\Model; use Utopia\Database\Document as DatabaseDocument; -class Presence extends Any +class Presence extends Model { public function getName(): string { @@ -19,9 +20,6 @@ class Presence extends Any public function __construct() { - // Expose user-defined extras under "metadata" instead of the SDK default "data" - $this->setAdditionalPropertiesKey('metadata'); - $this ->addRule('$id', [ 'type' => self::TYPE_STRING, @@ -73,9 +71,14 @@ class Presence extends Any 'required' => false, 'default' => null, 'example' => self::TYPE_DATETIME_EXAMPLE, + ]) + ->addRule('metadata', [ + 'type' => self::TYPE_JSON, + 'description' => 'Presence metadata.', + 'required' => false, + 'default' => null, + 'example' => ['key' => 'value'], ]); - // User-defined extras flow through Any's generic mapping, surfaced under - // the "metadata" key declared via setAdditionalPropertiesKey() above. } public function filter(DatabaseDocument $document): DatabaseDocument