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

Ignore dateFormat if dateFormats exists

This commit is contained in:
Ivan Babkin 2019-09-09 14:34:33 +03:00
parent 3e196020d9
commit f6fc7c3dce
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,11 @@
{% endmacro %}
{%- macro formatEncodingDate(field) -%}
ApiDateFormattingService.string(from: {{ field.name -}}, format: .{{- dateFormatToName(field.type.dateFormat) -}})
{%- if field.type.dateFormats is not empty -%}
ApiDateFormattingService.string(from: {{ field.name -}}, format: .{{- dateFormatToName(field.type.dateFormats[0]) -}})
{%- else -%}
ApiDateFormattingService.string(from: {{ field.name -}}, format: .{{- dateFormatToName(field.type.dateFormat) -}})
{%- endif -%}
{%- endmacro -%}
{%- macro formatEncodingStringDecimal(field) -%}

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

@ -43,10 +43,14 @@
{%- macro commonDateInit(field) -%}
{%- import _self as self -%}
{{ self.dateInit(field.name, field.type.dateFormat) }}
{%- for dateFormat in field.type.dateFormats -%}
else {{ self.dateInit(field.name, dateFormat) }}
{%- endfor -%}
{%- if field.type.dateFormats is not empty -%}
{{ self.dateInit(field.name, field.type.dateFormats[0]) }}
{%- for dateFormat in field.type.dateFormats|slice(1, field.type.dateFormats|length) -%}
else {{ self.dateInit(field.name, dateFormat) }}
{%- endfor -%}
{%- else -%}
{{ self.dateInit(field.name, field.type.dateFormat) }}
{%- endif -%}
else {
throw LeadKitError.failedToDecode(reason: "Unable to decode date from string")
}
@ -56,5 +60,5 @@
{%- set dateTimeInit = "ApiDateFormattingService.date(from: %s, format: .%s, parsedIn: nil)"|format(name, dateFormatToName(dateFormat)) -%}
if let value = {{ dateTimeInit }} {
self.{{ name }} = value
}
}
{%- endmacro -%}