refactor from property to init

tinkoff-mobile-tech · Nov 15, 2019 · eccfadf · eccfadf
1 parent 334c5b0
commit eccfadf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.h b/ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.h
@@ -22,9 +22,16 @@
 #import "ASDKPaymentInfo.h"
 #import "ASDKThreeDsData.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ASDKChargeResponse : ASDKAcquiringResponse
 
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary
+                          rebillId:(nullable NSNumber *)rebillId;
+
 @property (nonatomic, strong) ASDKPaymentInfo *paymentInfo;
 @property (nonatomic, strong) ASDKThreeDsData *threeDsData;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.m b/ASDKCore/API Objects/Response/Charge/ASDKChargeResponse.m
@@ -23,6 +23,16 @@
 
 @implementation ASDKChargeResponse
 
+-(instancetype)initWithDictionary:(NSDictionary *)dictionary
+                         rebillId:(NSNumber *)rebillId {
+    self = [super initWithDictionary:dictionary];
+    if (!self) {
+        return nil;
+    }
+    _paymentInfo.rebillId = rebillId;
+    return self;
+}
+
 - (ASDKThreeDsData *)threeDsData
 {
     if (!_threeDsData)

diff --git a/ASDKCore/ASDKAcquiringApi.m b/ASDKCore/ASDKAcquiringApi.m
@@ -355,8 +355,7 @@ - (void)chargeWithRequest:(ASDKChargeRequest *)request
     [self apiVersion:APIVersion_v2 path:kASDKAPIPathCharge parameters:parameters
        success:^(NSDictionary *responseDictionary, NSURLResponse *response)
      {
-         ASDKChargeResponse *responseObject = [[ASDKChargeResponse alloc] initWithDictionary:responseDictionary];
-         responseObject.paymentInfo.rebillId = request.rebillId;
+         ASDKChargeResponse *responseObject = [[ASDKChargeResponse alloc] initWithDictionary:responseDictionary rebillId:request.rebillId];
          success(responseObject.paymentInfo, responseObject.status);
      }
        failure:^(ASDKAcquringApiError *error)