From c4a764d17547911e30f4b7dc8af97ff5052693c8 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:56:21 +0100
Subject: [PATCH] fix: use model instead of type

---
 .../Specification/Format/OpenAPI3.php         |  4 ---
 .../Specification/Format/Swagger2.php         |  4 ---
 src/Appwrite/Utopia/Response.php              |  1 +
 src/Appwrite/Utopia/Response/Model.php        |  1 -
 .../Utopia/Response/Model/Execution.php       |  2 +-
 .../Utopia/Response/Model/Payload.php         | 29 +++++++++++++++++++
 tests/e2e/General/HTTPTest.php                |  2 +-
 7 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Response/Model/Payload.php

diff --git a/src/Appwrite/Specification/Format/OpenAPI3.php b/src/Appwrite/Specification/Format/OpenAPI3.php
index 115dd3edee..3074d59b7c 100644
--- a/src/Appwrite/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/Specification/Format/OpenAPI3.php
@@ -576,10 +576,6 @@ class OpenAPI3 extends Format
                         $type = 'boolean';
                         break;
 
-                    case 'payload':
-                        $type = 'payload';
-                        break;
-
                     default:
                         $type = 'object';
                         $rule['type'] = ($rule['type']) ? $rule['type'] : 'none';
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 0dac729358..2eab7807b3 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -585,10 +585,6 @@ class Swagger2 extends Format
                         $type = 'boolean';
                         break;
 
-                    case 'payload':
-                        $type = 'payload';
-                        break;
-
                     default:
                         $type = 'object';
                         $rule['type'] = ($rule['type']) ?: 'none';
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index a2c07d34b0..3e438372cf 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -251,6 +251,7 @@ class Response extends SwooleResponse
     public const MODEL_RUNTIME_LIST = 'runtimeList';
     public const MODEL_DEPLOYMENT = 'deployment';
     public const MODEL_DEPLOYMENT_LIST = 'deploymentList';
+    public const MODEL_PAYLOAD = 'payload';
     public const MODEL_EXECUTION = 'execution';
     public const MODEL_EXECUTION_LIST = 'executionList';
     public const MODEL_BUILD = 'build';
diff --git a/src/Appwrite/Utopia/Response/Model.php b/src/Appwrite/Utopia/Response/Model.php
index 3d96355bfa..8a0bb78cba 100644
--- a/src/Appwrite/Utopia/Response/Model.php
+++ b/src/Appwrite/Utopia/Response/Model.php
@@ -11,7 +11,6 @@ abstract class Model
     public const TYPE_FLOAT = 'double';
     public const TYPE_BOOLEAN = 'boolean';
     public const TYPE_JSON = 'json';
-    public const TYPE_PAYLOAD = 'payload';
     public const TYPE_DATETIME = 'datetime';
     public const TYPE_DATETIME_EXAMPLE = '2020-10-15T06:38:00.000+00:00';
     public const TYPE_RELATIONSHIP = 'relationship';
diff --git a/src/Appwrite/Utopia/Response/Model/Execution.php b/src/Appwrite/Utopia/Response/Model/Execution.php
index dc5d41c02c..a1739f85b7 100644
--- a/src/Appwrite/Utopia/Response/Model/Execution.php
+++ b/src/Appwrite/Utopia/Response/Model/Execution.php
@@ -81,7 +81,7 @@ class Execution extends Model
                 'example' => 200,
             ])
             ->addRule('responseBody', [
-                'type' => self::TYPE_PAYLOAD,
+                'type' => Response::MODEL_PAYLOAD,
                 'description' => 'HTTP response body. This will return empty unless execution is created as synchronous.',
                 'default' => '',
             ])
diff --git a/src/Appwrite/Utopia/Response/Model/Payload.php b/src/Appwrite/Utopia/Response/Model/Payload.php
new file mode 100644
index 0000000000..07611b958c
--- /dev/null
+++ b/src/Appwrite/Utopia/Response/Model/Payload.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Appwrite\Utopia\Response\Model;
+
+use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Model;
+
+class Payload extends Model
+{
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'Payload';
+    }
+
+    /**
+     * Get Type
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return Response::MODEL_PAYLOAD;
+    }
+}
diff --git a/tests/e2e/General/HTTPTest.php b/tests/e2e/General/HTTPTest.php
index 0881966365..fe600cd0f8 100644
--- a/tests/e2e/General/HTTPTest.php
+++ b/tests/e2e/General/HTTPTest.php
@@ -133,7 +133,7 @@ class HTTPTest extends Scope
 
             $this->assertEquals(200, $response['headers']['status-code']);
             // looks like recent change in the validator
-            $this->assertTrue(empty($response['body']['schemaValidationMessages']));
+            $this->assertEmpty($response['body']['schemaValidationMessages'], 'Schema validation failed for ' . $file . ': ' . json_encode($response['body']['schemaValidationMessages'], JSON_PRETTY_PRINT));
         }
     }