Skip to content

Commit 5341746

Browse files
committed
fix: reviews
1 parent 0a1d5e3 commit 5341746

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

templates/dotnet/Package/Models/Model.cs.twig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ namespace {{ spec.title | caseUcfirst }}.Models
5050
{%- elseif property.enum %}
5151
{%- set enumName = property['enumName'] ?? property.name -%}
5252
{%- if not property.required -%}
53-
map["{{ property.name }}"] == null ? null : new {{ enumName | caseUcfirst }}(map["{{ property.name }}"].ToString()!)
53+
map.TryGetValue("{{ property.name }}", out var enumRaw{{ loop.index }})
54+
? enumRaw{{ loop.index }} == null
55+
? null
56+
: new {{ enumName | caseUcfirst }}(enumRaw{{ loop.index }}.ToString()!)
57+
: null
5458
{%- else -%}
5559
new {{ enumName | caseUcfirst }}(map["{{ property.name }}"].ToString()!)
5660
{%- endif %}

templates/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
44
import io.appwrite.extensions.jsonCast
55
{%~ for property in definition.properties %}
66
{%~ if property.enum %}
7-
import {{ sdk.namespace | caseDot }}.enums.{{ property.name | caseUcfirst }}
7+
import {{ sdk.namespace | caseDot }}.enums.{{ (property.enumName ?? property.name) | caseUcfirst }}
88
{%~ endif %}
99
{%~ endfor %}
1010

templates/swift/Sources/Models/Model.swift.twig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import Foundation
22
import JSONCodable
3+
{%~ set hasEnums = false %}
34
{%~ for property in definition.properties %}
45
{%~ if property.enum %}
5-
{%~ set enumName = property['enumName'] ?? property.name %}
6-
import {{spec.title | caseUcfirst}}Enums
6+
{%~ set hasEnums = true %}
77
{%~ endif %}
88
{%~ endfor %}
9+
{%~ if hasEnums %}
10+
import {{spec.title | caseUcfirst}}Enums
11+
{%~ endif %}
912

1013
/// {{ definition.description }}
1114
{% if definition.properties | length == 0 and not definition.additionalProperties %}

0 commit comments

Comments
 (0)