[NT-438] Create backing with free shipping

Kickstarter-iOS/Library/SharedFunctionsTests.swift

@@ -1,5 +1,7 @@
 @testable import Kickstarter_Framework
+@testable import KsApi
 @testable import Library
+import Prelude
 import XCTest
 
 internal final class SharedFunctionsTests: XCTestCase {
@@ -55,4 +57,35 @@ internal final class SharedFunctionsTests: XCTestCase {
     XCTAssertTrue(mockPushNotificationDialog.resetAllContextsWasCalled)
     XCTAssertTrue(mockViewController.dismissAnimatedWasCalled)
   }
+
+  func testFormattedPledgeParameters_WithShipping() {
+    let reward = Reward.template
+    let selectedShippingRule = ShippingRule.template
+      |> ShippingRule.lens.cost .~ 3
+      |> ShippingRule.lens.location .~ (Location.template |> Location.lens.id .~ 123)
+
+    let params = formattedPledgeParameters(
+      from: reward,
+      pledgeAmount: 10,
+      selectedShippingRule: selectedShippingRule
+    )
+
+    XCTAssertEqual(params.rewardId, "UmV3YXJkLTE=")
+    XCTAssertEqual(params.pledgeTotal, "13.00")
+    XCTAssertEqual(params.locationId, "123")
+  }
+
+  func testFormattedPledgeParameters_NoShipping_NoReward() {
+    let reward = Reward.noReward
+
+    let params = formattedPledgeParameters(
+      from: reward,
+      pledgeAmount: 10,
+      selectedShippingRule: nil
+    )
+
+    XCTAssertNil(params.rewardId)
+    XCTAssertEqual(params.pledgeTotal, "10.00")
+    XCTAssertNil(params.locationId)
+  }
 }

Library/CreateApplePayBackingInput+Constructor.swift

@@ -11,28 +11,21 @@ extension CreateApplePayBackingInput {
     stripeToken: String,
     refTag: RefTag?
   ) -> CreateApplePayBackingInput {
-    let pledgeAmountDecimal = Decimal(pledgeAmount)
-    var shippingAmountDecimal: Decimal = Decimal()
-    var shippingLocationId: String?
-
-    if let shippingRule = selectedShippingRule, shippingRule.cost > 0 {
-      shippingAmountDecimal = Decimal(shippingRule.cost)
-      shippingLocationId = String(shippingRule.location.id)
-    }
-
-    let pledgeTotal = NSDecimalNumber(decimal: pledgeAmountDecimal + shippingAmountDecimal)
-    let formattedPledgeTotal = Format.decimalCurrency(for: pledgeTotal.doubleValue)
-
-    let rewardId = reward == Reward.noReward ? nil : reward.graphID
+    let pledgeParams
+      = formattedPledgeParameters(
+        from: reward,
+        pledgeAmount: pledgeAmount,
+        selectedShippingRule: selectedShippingRule
+      )
 
     return CreateApplePayBackingInput(
-      amount: formattedPledgeTotal,
-      locationId: shippingLocationId,
+      amount: pledgeParams.pledgeTotal,
+      locationId: pledgeParams.locationId,
       paymentInstrumentName: pkPaymentData.displayName,
       paymentNetwork: pkPaymentData.network,
       projectId: project.graphID,
       refParam: refTag?.description,
-      rewardId: rewardId,
+      rewardId: pledgeParams.rewardId,
       stripeToken: stripeToken,
       transactionIdentifier: pkPaymentData.transactionIdentifier
     )

Library/CreateApplePayBackingInputConstructorTests.swift

@@ -5,7 +5,7 @@ import Prelude
 import XCTest
 
 final class CreateApplePayBackingInputConstructorTests: XCTestCase {
-  func testCreateApplePayBackingInput_NoShipping() {
+  func testCreateApplePayBackingInput_NoShipping_NoReward() {
     let project = Project.template
     let reward = Reward.noReward
 
@@ -34,7 +34,7 @@ final class CreateApplePayBackingInputConstructorTests: XCTestCase {
     XCTAssertEqual(input.refParam, "project_page")
   }
 
-  func testCreateApplePayBackingInput_WithShipping() {
+  func testCreateApplePayBackingInput_WithShipping_WithReward() {
     let project = Project.template
     let reward = Reward.template
     let shippingRule = ShippingRule.template

Library/CreateBackingInput+Constructor.swift

@@ -10,26 +10,19 @@ extension CreateBackingInput {
     refTag: RefTag?,
     paymentSourceId: String
   ) -> CreateBackingInput {
-    let pledgeAmountDecimal = Decimal(pledgeAmount)
-    var shippingAmountDecimal: Decimal = Decimal()
-    var shippingLocationId: String?
-
-    if let shippingRule = selectedShippingRule, shippingRule.cost > 0 {
-      shippingAmountDecimal = Decimal(shippingRule.cost)
-      shippingLocationId = String(shippingRule.location.id)
-    }
-
-    let pledgeTotal = NSDecimalNumber(decimal: pledgeAmountDecimal + shippingAmountDecimal)
-    let formattedPledgeTotal = Format.decimalCurrency(for: pledgeTotal.doubleValue)
-
-    let rewardId = reward == Reward.noReward ? nil : reward.graphID
+    let pledgeParams
+      = formattedPledgeParameters(
+        from: reward,
+        pledgeAmount: pledgeAmount,
+        selectedShippingRule: selectedShippingRule
+      )
 
     return CreateBackingInput(
-      amount: formattedPledgeTotal,
-      locationId: shippingLocationId,
+      amount: pledgeParams.pledgeTotal,
+      locationId: pledgeParams.locationId,
       paymentSourceId: paymentSourceId,
       projectId: project.graphID,
-      rewardId: rewardId,
+      rewardId: pledgeParams.rewardId,
       refParam: refTag?.description
     )
   }

Library/PKPaymentRequest+Helpers.swift

@@ -44,7 +44,7 @@ extension PKPaymentRequest {
       )
     )
 
-    if let selectedShippingRule = selectedShippingRule, selectedShippingRule.cost != 0.0 {
+    if let selectedShippingRule = selectedShippingRule {
       paymentSummaryItems.append(
         PKPaymentSummaryItem(
           label: Strings.Shipping(),

Library/SharedFunctions.swift

@@ -216,3 +216,27 @@ internal func classNameWithoutModule(_ class: AnyClass) -> String {
     .dropFirst()
     .joined(separator: ".")
 }
+
+typealias FormattedPledgeParameters = (pledgeTotal: String, rewardId: String?, locationId: String?)
+
+internal func formattedPledgeParameters(
+  from reward: Reward,
+  pledgeAmount: Double,
+  selectedShippingRule: ShippingRule?
+) -> FormattedPledgeParameters {
+  let pledgeAmountDecimal = Decimal(pledgeAmount)
+  var shippingAmountDecimal: Decimal = Decimal()
+  var shippingLocationId: String?
+
+  if let shippingRule = selectedShippingRule {
+    shippingAmountDecimal = Decimal(shippingRule.cost)
+    shippingLocationId = String(shippingRule.location.id)
+  }
+
+  let pledgeTotal = NSDecimalNumber(decimal: pledgeAmountDecimal + shippingAmountDecimal)
+  let formattedPledgeTotal = Format.decimalCurrency(for: pledgeTotal.doubleValue)
+
+  let rewardId = reward == Reward.noReward ? nil : reward.graphID
+
+  return (formattedPledgeTotal, rewardId, shippingLocationId)
+}

Library/UpdateBackingInput+Constructor.swift

@@ -6,15 +6,16 @@ extension UpdateBackingInput {
     from updateBackingData: UpdateBackingData,
     isApplePay: Bool
   ) -> UpdateBackingInput {
-    let pledgeAmount: String? = updateBackingData.pledgeAmount.flatMap { pledgeAmount in
-      pledgeAmountString(withAmount: pledgeAmount, shippingRule: updateBackingData.shippingRule)
-    }
-    let backingId: String = updateBackingData.backing.graphID
-    let locationId: String? = updateBackingData.shippingRule.flatMap { "\($0.location.id)" }
-    let rewardId: String? = updateBackingData.reward.graphID
+    let backingId = updateBackingData.backing.graphID
+    let (pledgeTotal, rewardId, locationId) =
+      formattedPledgeParameters(
+        from: updateBackingData.reward,
+        pledgeAmount: updateBackingData.pledgeAmount,
+        selectedShippingRule: updateBackingData.shippingRule
+      )
 
     return UpdateBackingInput(
-      amount: pledgeAmount,
+      amount: pledgeTotal,
       applePay: isApplePay ? updateBackingData.applePayParams : nil,
       id: backingId,
       locationId: locationId,
@@ -23,17 +24,3 @@ extension UpdateBackingInput {
     )
   }
 }
-
-private func pledgeAmountString(withAmount amount: Double, shippingRule: ShippingRule?) -> String {
-  let pledgeAmountDecimal = Decimal(amount)
-  var shippingAmountDecimal: Decimal = Decimal()
-
-  if let shippingRule = shippingRule, shippingRule.cost > 0 {
-    shippingAmountDecimal = Decimal(shippingRule.cost)
-  }
-
-  let pledgeTotal = NSDecimalNumber(decimal: pledgeAmountDecimal + shippingAmountDecimal)
-  let formattedPledgeTotal = Format.decimalCurrency(for: pledgeTotal.doubleValue)
-
-  return formattedPledgeTotal
-}

Library/ViewModels/DeprecatedRewardPledgeViewModelTests.swift

@@ -645,6 +645,11 @@ internal final class DeprecatedRewardPledgeViewModelTests: TestCase {
             "amount": NSDecimalNumber(value: reward.minimum),
             "type": PKPaymentSummaryItemType.final.rawValue
           ],
+          [
+            "label": "Shipping",
+            "amount": NSDecimalNumber(value: shippingRule.cost),
+            "type": PKPaymentSummaryItemType.final.rawValue
+          ],
           [
             "label": "Kickstarter (if funded)",
             "amount": NSDecimalNumber(value: reward.minimum),

Library/ViewModels/PledgeViewModel.swift

@@ -12,7 +12,7 @@ public typealias CreateBackingData = (
 public typealias UpdateBackingData = (
   backing: Backing,
   reward: Reward,
-  pledgeAmount: Double?,
+  pledgeAmount: Double,
   shippingRule: ShippingRule?,
   paymentSourceId: String?,
   applePayParams: ApplePayParams?
@@ -353,7 +353,7 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
     let updateBackingData = Signal.combineLatest(
       backing,
       reward,
-      pledgeAmount.wrapInOptional(),
+      pledgeAmount,
       selectedShippingRule,
       selectedPaymentSourceId,
       applePayParamsData