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

correct methods and network service generation

This commit is contained in:
Madhas 2018-05-23 20:58:22 +03:00
parent 4b547c08ab
commit 61be799de7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Swift/NetworkService.swift.twig
View File

@ -11,7 +11,7 @@ class {{ serviceName }}: NetworkService {
self.init(configuration: NetworkServiceConfiguration(baseUrl: {{ serviceName }}.apiBaseUrl))
}
func apiRequest<T: Decodable>(with parameters: ApiRequestParameters, decoder: JSONDecoder) -> Single<T> {
func apiRequest<T: Decodable>(with parameters: ApiRequestParameters, decoder: JSONDecoder = JSONDecoder()) -> Single<T> {
return rxRequest(with: parameters, decoder: decoder).map { $0.model }.asSingle()
}

12
Swift/blocks/method/method-func.twig
View File

@ -13,23 +13,19 @@
/// {{ method.description }}
{{ isStatic ? "static " : "" }}func {{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyTypeName }},{{ "\n " }}{%- endif -%}
requestEncoding: ParameterEncoding? = nil,
requestHeaders: HTTPHeaders? = nil,
decoder: JSONDecoder = JSONDecoder(),
encoder: JSONEncoder = JSONEncoder()) -> Single<{{ method.responseType.type.typeName }}> {
requestHeaders: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
{% if isStatic -%}
return shared.{{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyParamName }},{{ "\n " }}{%- endif -%}
requestEncoding: requestEncoding,
requestHeaders: requestHeaders,
decoder: decoder,
encoder: encoder)
requestHeaders: requestHeaders)
{%- else -%}
let parameters = apiRequestParameters(relativeUrl: "{{ method.url }}",
method: .{{ methodType }},
parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(with: encoder){%- else -%}nil{%- endif -%},
parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(){%- else -%}nil{%- endif -%},
requestEncoding: requestEncoding,
requestHeaders: requestHeaders)
return apiRequest(with: parameters, decoder)
return apiRequest(with: parameters)
{%- endif %}
}