From cbbcac0ea59be5e4af88c7f732a77b2b080c3755 Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Fri, 6 Apr 2018 11:02:40 +0300
Subject: [PATCH] update generation of NetworkService and methods

---
 Swift/NetworkService.swift.twig      |  8 ++------
 Swift/blocks/method/method-func.twig | 12 +++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Swift/NetworkService.swift.twig b/Swift/NetworkService.swift.twig
index d55ea7b..42fd3b7 100644
--- a/Swift/NetworkService.swift.twig
+++ b/Swift/NetworkService.swift.twig
@@ -2,14 +2,10 @@ import LeadKit
 import RxSwift
 
 {% set serviceName = concat(networkServiceName, "NetworkService") -%}
-class {{ serviceName }}: NetworkService, ConfigurableNetworkService {
-
-    class var baseUrl: String {
-        return "{{ apiUrl }}"
-    }
+class {{ serviceName }}: NetworkService {
 
     convenience init() {
-        self.init(sessionManager: {{ serviceName }}.sessionManager)
+        self.init(configuration: NetworkServiceConfiguration(baseUrl: "{{ apiUrl }}"))
     }
 
     func apiRequest<T: ImmutableMappable>(with parameters: ApiRequestParameters) -> Single<T> {
diff --git a/Swift/blocks/method/method-func.twig b/Swift/blocks/method/method-func.twig
index e7b31ee..c0d75e2 100644
--- a/Swift/blocks/method/method-func.twig
+++ b/Swift/blocks/method/method-func.twig
@@ -12,19 +12,17 @@
 
     /// {{ method.description }}
     {{ isStatic ? "static " : "" }}func {{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyTypeName }},{{ "\n                   " }}{%- endif -%}
-                   encoding: ParameterEncoding = URLEncoding.default,
-                   headers: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
+                   requestHeaders: HTTPHeaders? = nil) -> Single<{{ method.responseType.type.typeName }}> {
 
         {% if isStatic -%}
           return shared.{{ funcName }}({%- if hasBody -%}{{ bodyParamName }}: {{ bodyParamName }},{{ "\n                   " }}{%- endif -%}
-                   encoding: encoding,
-                   headers: headers)
+                   requestHeaders: requestHeaders)
         {%- else %}
-          let parameters = ApiRequestParameters(url: "{{ method.url }}",
+          let parameters = ApiRequestParameters(url: configuration.baseUrl + "{{ method.url }}",
                                               method: .{{ methodType }},
                                               parameters: {% if hasBody -%}{{ bodyParamName }}.toJSON(){%- else -%}nil{%- endif -%},
-                                              encoding: encoding,
-                                              headers: headers)
+                                              encoding: configuration.encoding,
+                                              headers: requestHeaders)
 
           return apiRequest(with: parameters)
         {%- endif %}