Merge pull request #966 from appwrite/fix-swift-double-optional

Fix swift double optional
appwrite · Aug 30, 2024 · d5653a2 · d5653a2
2 parents 3f12532 + 930bc43
commit d5653a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -526,10 +526,6 @@ protected function getPropertyType(array $property, array $spec, string $generic
             $type = $this->getTypeName($property);
         }
 
-        if (!$property['required']) {
-            $type .= '?';
-        }
-
         return $type;
     }
 

diff --git a/templates/swift/Sources/Models/Model.swift.twig b/templates/swift/Sources/Models/Model.swift.twig
@@ -9,7 +9,7 @@ public class {{ definition | modelType(spec) | raw }} {
 
     {%~ for property in definition.properties %}
     /// {{ property.description }}
-    public let {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}
+    public let {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}{% if not property.required %}?{% endif %}
 
 
     {%~ endfor %}
@@ -20,7 +20,7 @@ public class {{ definition | modelType(spec) | raw }} {
 
     init(
         {%~ for property in definition.properties %}
-        {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw  }}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
+        {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw  }}{% if not property.required %}?{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
 
         {%~ endfor %}
         {%~ if definition.additionalProperties %}