Merge pull request #85 from Shopify/task/runmad.84-remove-shipping-rate-id

Remove shippingRateId on BUYCheckout

Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m

@@ -73,17 +73,6 @@
 	XCTAssertTrue([checkout isDirty]);
 }
 
-- (void)testSettingAShippingRateMarksShippingRateIdAsDirty
-{
-	BUYShippingRate *shippingRate = [[BUYShippingRate alloc] initWithDictionary:@{ @"id" : @"banana" }];
-	XCTAssertNil(_checkout.shippingRate);
-	XCTAssertNil(_checkout.shippingRateId);
-	_checkout.shippingRate = shippingRate;
-	XCTAssertEqualObjects(@"banana", _checkout.shippingRateId);
-	
-	XCTAssertTrue([[_checkout dirtyProperties] containsObject:@"shippingRateId"]);
-}
-
 - (void)testDirtyPropertiesAreReturnedInJSON
 {
 	BUYShippingRate *shippingRate = [[BUYShippingRate alloc] initWithDictionary:@{ @"id" : @"banana" }];
@@ -93,12 +82,10 @@
 	_checkout.currency = @"BANANA";
 	NSSet *dirtyProperties = [_checkout dirtyProperties];
 	XCTAssertTrue([dirtyProperties containsObject:@"currency"]);
-	XCTAssertTrue([dirtyProperties containsObject:@"shippingRateId"]);
 	XCTAssertTrue([dirtyProperties containsObject:@"shippingRate"]);
 	
 	NSDictionary *json = [_checkout jsonDictionaryForCheckout];
 	XCTAssertEqualObjects(json[@"checkout"][@"currency"], @"BANANA");
-	XCTAssertEqualObjects(json[@"checkout"][@"shipping_rate_id"], @"banana");
 }
 
 - (void)testRequiresShippingAndIncludesTaxesSerialization

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h

@@ -149,9 +149,9 @@
 @property (nonatomic, strong) BUYShippingRate *shippingRate;
 
 /**
- *  Shipping rate identifier
- */
-@property (nonatomic, readonly) NSString *shippingRateId;
+*  Shipping rate identifier
+*/
+@property (nonatomic, readonly) NSString *shippingRateId DEPRECATED_MSG_ATTRIBUTE("Use shippingRate.shippingRateIdentifier");
 
 /**
  *  A discount added to the checkout

Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m

@@ -71,22 +71,6 @@
 	return self;
 }
 
-- (void)setShippingRateId:(NSString *)shippingRateIdentifier
-{
-	[self willChangeValueForKey:@"shippingRateId"];
-	_shippingRateId = shippingRateIdentifier;
-	[self didChangeValueForKey:@"shippingRateId"];
-}
-
-- (void)setShippingRate:(BUYShippingRate *)shippingRate
-{
-	[self willChangeValueForKey:@"shippingRate"];
-	_shippingRate = shippingRate;
-	[self didChangeValueForKey:@"shippingRate"];
-	
-	[self setShippingRateId:shippingRate.shippingRateIdentifier];
-}
-
 + (NSString *)jsonKeyForProperty:(NSString *)property
 {
 	NSString *key = nil;
@@ -171,6 +155,11 @@
 	self.sourceIdentifier = dictionary[@"source_identifier"];
 }
 
+- (NSString *)shippingRateId
+{
+	return self.shippingRate.shippingRateIdentifier;
+}
+
 - (id)jsonValueForValue:(id)value
 {
 	id newValue = value;