TouchInstinct
/
api-generator-templates
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optional or nullable encoding fixed

This commit is contained in:
Alexey Gerasimov 2018-10-16 14:44:49 +03:00
parent 7b47499624
commit a9c033605e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Swift/macroses/common.utils.twig
View File

@ -28,13 +28,17 @@
{%- endif -%}
{% endmacro %}
{% macro formatEncodingValue(field) %}
{% macro formatEncodingValue(field, strong) %}
{%- import _self as self -%}
{%- if field.type.type.baseTypeName == "DateTime" -%}
{{- self.formatEncodingDate(field) -}}
{%- elseif field.type.type.baseTypeName == "Decimal" -%}
{{ self.formatNullableOrOptional(field.name, field.nullable, field.optional) -}}
{%- if strong -%}
{{ field.name }}
{%- else -%}
{{ self.formatNullableOrOptional(field.name, field.nullable, field.optional) -}}
{%- endif -%}
.decimalValue
{%- else -%}
{{ field.name }}
@ -61,7 +65,7 @@
try container.encode({{- self.formatEncodingDate(field) -}}, forKey: .{{- field.name -}})
}
{%- else -%}
try container.encodeIfPresent({{- self.formatEncodingValue(field) -}}, forKey: .{{- field.name -}})
try container.encodeIfPresent({{- self.formatEncodingValue(field, false) -}}, forKey: .{{- field.name -}})
{%- endif -%}
{% endmacro %}
@ -72,12 +76,12 @@
{{ self.encodeIfPresent(field) -}}
{%- elseif field.nullable -%}
if let {{ field.name }} = {{ field.name }} {
try container.encode({{- self.formatEncodingValue(field) -}}, forKey: .{{- field.name -}})
try container.encode({{- self.formatEncodingValue(field, true) -}}, forKey: .{{- field.name -}})
} else {
try container.encodeNil(forKey: .{{- field.name -}})
}
{%- else -%}
try container.encode({{- self.formatEncodingValue(field) -}}, forKey: .{{- field.name -}})
try container.encode({{- self.formatEncodingValue(field, false) -}}, forKey: .{{- field.name -}})
{%- endif -%}
{% endmacro %}