[NT-331] Perform Update Backing Mutation Request #874

justinswart · 2019-10-04T17:25:51Z

📲 What

Wires up the confirm button to make an UpdateBacking request when the pledge amount or shipping location has changed.

✋ What Not

Does not entirely address loading state of this view.
- The confirm button will be disabled while the request is in-flight but fields will still be tappable. This should be addressed separately along with the loading state of the button.
Does not confirm that the mutation fully works. Work on this is still underway by @cj-dimaggio.
Does not address updating of payment method or Apple Pay.

🤔 Why

Brings the functionality to allow the user to update their pledge amount or shipping location.

🛠 How

Added validation to confirm that a value has in fact changed for the confirm button to be enabled.
Added UpdateBackingData typealias to gather the information that will be needed to update the backing.

👀 See

Enabling on values changed	Success (faked)	Error

✅ Acceptance criteria

Navigate Update Pledge on a project that you have backed that is still live.

Changing the pledge amount or shipping location should enable the confirm button. Changing them back to their original values should disable the pledge button.
Tapping confirm on the enabled button should perform the request (this will currently fail).

⏰ TODO

Possible changes once back-end work is completed.

# Conflicts: # KsApi/models/Backing.swift # KsApi/models/lenses/BackingLenses.swift # KsApi/models/templates/BackingTemplates.swift

# Conflicts: # KsApi/models/UpdateBackingEnvelopeTests.swift # KsApi/mutations/inputs/UpdateBackingInput.swift

# Conflicts: # Library/ViewModels/ManagePledgeViewModel.swift

justinswart · 2019-10-04T17:33:46Z

KsApi/models/Backing.swift

+
+extension Backing: GraphIDBridging {
+  public static var modelName: String {
+    return "Backing"


Need to confirm this name.

justinswart · 2019-10-04T17:33:51Z

KsApi/models/Location.swift

+
+extension Location: GraphIDBridging {
+  public static var modelName: String {
+    return "Location"


Need to confirm this name.

I think the locationId mutation input is actually not a graphID. In other words you should just be able to use location.id.

Do you think we should remove this conformance since it's no longer being used?

justinswart · 2019-10-04T17:34:39Z

Library/UpdateBackingInput+Constructor.swift

+  }
+}
+
+func pledgeAmountString(withAmount amount: Double, shippingRule: ShippingRule?) -> String {


Will move this to a shared place once we implement the new CreateBackingInput. Also not sure if we're going the route of splitting out amount and shipping rule for that.

ksr-ci-bot · 2019-10-04T18:26:07Z

	1 Warning
⚠️	Big PR

Generated by 🚫 Danger

# Conflicts: # Kickstarter-iOS/Views/Controllers/PledgeViewController.swift # Library/ViewModels/PledgeViewModel.swift # Library/ViewModels/PledgeViewModelTests.swift

ifbarrera · 2019-10-07T20:06:26Z

Library/UpdateBackingInput+Constructor.swift

+      pledgeAmountString(withAmount: pledgeAmount, shippingRule: updateBackingData.shippingRule)
+    }
+    let backingId: String = updateBackingData.backing.graphID
+    let locationId: String? = updateBackingData.shippingRule.flatMap { $0.location.graphID }


Like I mentioned I think this is actually just the location.id

Library/UpdateBackingInput+Constructor.swift

ifbarrera · 2019-10-07T20:12:14Z

Library/ViewModels/ManagePledgeViewModel.swift

@@ -99,6 +101,10 @@ public final class ManagePledgeViewModel:

    self.rewardReceivedViewControllerViewIsHidden = projectAndReward
      .map { project, reward in reward.isNoReward || project.personalization.backing?.status != .collected }
+
+    self.showSuccessBannerWithMessage = self.pledgeViewControllerDidUpdatePledgeSignal.mapConst(


Is the idea behind putting this string in ManagePledgeViewModel instead of PledgeViewModel (where the update pledge logic happens) that we're anticipating reusing this string for other "update" types? (ie. update payment method, update reward).

No, just that this is a side-effect from the delegate being notified about the success of the request so that the banner is visible when the VC is popped off the stack.

Library/ViewModels/PledgeViewModel.swift

ifbarrera · 2019-10-07T20:21:55Z

Library/ViewModels/PledgeViewModel.swift

+      project.map { $0.personalization.backing?.pledgeAmount },
+      self.pledgeAmountDataSignal.map { $0.0 }


self.pledgeAmountDataSignal.map(first)? Might also be valuable to unpack the backing seperately, for clarity:

let backing = project.map { $0.personalization.backing }.skipNil() let pledgeAmount = Signal.combineLatest( backing.map { $0.pledgeAmount }, self.pledgeAmountDataSignal.map(first))

Looks like backing would also come in useful below in a couple places.

Can't do self.pledgeAmountDataSignal.map(first) because the tuple is 4 values and our versions of first, second, third only support up to 3.

ifbarrera · 2019-10-07T20:25:10Z

Library/ViewModels/PledgeViewModel.swift

+    // MARK: Update Backing
+
+    let updateBackingData = Signal.combineLatest(
+      project.map { $0.personalization.backing }.skipNil(),


Could use backing here too if you go that route.

ifbarrera · 2019-10-07T20:27:12Z

Library/ViewModels/PledgeViewModel.swift

+    let valuesChanged = Signal.combineLatest(
+      amountChanged,
+      shippingRuleChanged,
+      self.viewDidLoadProperty.signal


I think you don't need to combine with viewDidLoad because amountChanged and shippingRuleChanged both already depend on viewDidLoad 🤔. You could easily test this by removing viewDidLoad from here - your tests should still pass.

ifbarrera · 2019-10-07T20:31:39Z

Library/ViewModels/PledgeViewModelTests.swift

+      |> Project.lens.personalization.backing .~ (
+        .template
+          |> Backing.lens.paymentSource .~ GraphUserCreditCard.amex
+          |> Backing.lens.status .~ .errored


Any reason this status is .errored? Maybe .pledged would be more consistent with what we'd be likely to see during this flow?

I probably copy-pasted this from somewhere 😄

ifbarrera · 2019-10-07T20:33:11Z

Library/ViewModels/PledgeViewModelTests.swift

+      self.confirmButtonEnabled.assertDidNotEmitValue()
+
+      self.vm.inputs.pledgeAmountViewControllerDidUpdate(
+        with: (amount: 10.0, min: 25.0, max: 10_000.0, isValid: true)


This is a little confusing because the min is 25, the amount is 10 but it says isValid: true 🤔

ifbarrera · 2019-10-07T20:37:58Z

Library/ViewModels/PledgeViewModelTests.swift

+    )
+
+    self.confirmButtonHidden.assertValues([false])
+    self.confirmButtonEnabled.assertValues([false])


Is it possible to add an assertion message here? Took me a while to figure out why the confirm button isn't enabled in this case 😅 (it's because the amount is actually just the same as was already pledged, right?).

Sure will do :)

dusi · 2019-10-07T22:43:52Z

Library/ViewModels/PledgeViewModel.swift

+      shippingRuleChanged
+    )
+    .map { amountChanged, shippingRuleChanged -> Bool in
+      [amountChanged, shippingRuleChanged].contains(true)


Good old contains 😄 👍

Lol might I suggest amountChanged || shippingRuleChanged 😅nothing against contains I just think an OR seems to illustrate the logic more clearly.

dusi

Minor comments besides that looks good and I don't see anything blocking this PR.

dusi · 2019-10-08T18:17:05Z

Kickstarter-iOS/Views/Controllers/ManagePledgeViewController.swift

@@ -156,6 +160,14 @@ final class ManagePledgeViewController: UIViewController {
      .observeValues { [weak self] project, backing in
        self?.goToCancelPledge(project: project, backing: backing)
      }
+
+    self.viewModel.outputs.showSuccessBannerWithMessage
+      .observeForUI()


Sometimes we use .observeForUI other times we use .observeForControllerAction() is there any difference?

My understanding on the difference between these two is that there was some bug in the ReactiveSwift scheduler before that required this distinction. I should actually did in to see whether that was since fixed.

For consistency though I'll update this.

dusi · 2019-10-08T18:30:24Z

Kickstarter-iOS/Views/Controllers/PledgeViewController.swift

+        guard let self = self else { return }
+
+        _ = self
+          |> \.title %~ { _ in title }


Wish we had a RAC extension on UIViewController for dis ¯_(ツ)_/¯

That would be nice.

dusi · 2019-10-08T18:32:43Z

Library/UpdateBackingInput+Constructor.swift

+  }
+}
+
+func pledgeAmountString(withAmount amount: Double, shippingRule: ShippingRule?) -> String {


Should we either make this private and/or test it? 🤔

Going to make it private for now and consider it tested by way of this constructor being tested.

This will become a shared function when we add the newer CreateBacking mutation and then I'll break it out and write tests for it specifically.

ifbarrera

Left a couple of non-blocking comments to address at your discretion.

Works great! 👏

Tested on:

iPhone 7 Plus (11.4)
iPhone 8 (11.4)

ifbarrera · 2019-10-08T18:52:41Z

KsApi/models/Location.swift

+
+extension Location: GraphIDBridging {
+  public static var modelName: String {
+    return "Location"


Do you think we should remove this conformance since it's no longer being used?

ifbarrera · 2019-10-08T19:02:18Z

Library/ViewModels/PledgeViewModel.swift

  var paymentMethodsViewHidden: Signal<Bool, Never> { get }
+  var popViewController: Signal<(), Never> { get }


So something I noticed while testing is it seems like the popViewController and notifyDelegateUpdatePledgeDidSucceedWithMessage outputs are firing at the same time, which means that the pop animation and the message banner animation overlap. I think it would be nice to only show the message banner once the pop animation has completed. 🤔 Maybe setting a delay on the notifyDelegateUpdatePledgeDidSucceedWithMessage signal could help? I'm not sure if it's worth the trouble but just a thought.

I've added this to the JIRA ticket in which we'll address the refreshing of that view.

ifbarrera · 2019-10-08T19:05:03Z

Library/ViewModels/PledgeViewModel.swift

+      shippingRuleChanged
+    )
+    .map { amountChanged, shippingRuleChanged -> Bool in
+      [amountChanged, shippingRuleChanged].contains(true)


Lol might I suggest amountChanged || shippingRuleChanged 😅nothing against contains I just think an OR seems to illustrate the logic more clearly.

ifbarrera · 2019-10-08T19:08:05Z

Library/ViewModels/PledgeViewModel.swift

+
+    let valuesChangedAndValid = Signal.combineLatest(
+      valuesChanged,
+      self.pledgeAmountDataSignal.map { $0.3 }


Can we use the parameter name here instead? I think it's $0.isValid?

…edgeViewModel

justinswart added 17 commits September 30, 2019 17:49

Add mutation

6a9c1cb

Fix test

3eb3fb5

Add to Service

0f3fe73

Fix compiler error

8062670

Fix find-replace error

6b620e6

Enable/disable confirm button when values change

501181e

Merge branch 'master' into update-backing-mutation-ui

0d70e0c

# Conflicts: # KsApi/models/Backing.swift # KsApi/models/lenses/BackingLenses.swift # KsApi/models/templates/BackingTemplates.swift

Merge branch 'master' into update-backing-mutation-ui

c079ed1

Use pledgeAmount

617515b

Update title

534fa9f

Merge branch 'master' into update-backing-mutation-ui

0607a7a

# Conflicts: # KsApi/models/UpdateBackingEnvelopeTests.swift # KsApi/mutations/inputs/UpdateBackingInput.swift

Merge branch 'master' into update-backing-mutation-ui

8352dd4

Update backing request with error/success messaging

9262729

Merge branch 'master' into update-backing-mutation-ui

367f738

# Conflicts: # Library/ViewModels/ManagePledgeViewModel.swift

Fix test

4b98731

Add tests

093db30

Merge branch 'master' into update-backing-mutation-ui

20c4db6

justinswart requested review from dusi and ifbarrera October 4, 2019 17:25

justinswart assigned ifbarrera Oct 4, 2019

justinswart commented Oct 4, 2019

View reviewed changes

Merge branch 'master' into update-backing-mutation-ui

d25ee44

justinswart added 3 commits October 4, 2019 13:53

Merge branch 'master' into update-backing-mutation-ui

a88a092

# Conflicts: # Kickstarter-iOS/Views/Controllers/PledgeViewController.swift # Library/ViewModels/PledgeViewModel.swift # Library/ViewModels/PledgeViewModelTests.swift

Fix tests

a372e62

Use String for Location ID

374e6f3

ifbarrera reviewed Oct 7, 2019

View reviewed changes

Make tests clearer, split backing out into its own signal

a25453f

dusi reviewed Oct 7, 2019

View reviewed changes

Move message to PledgeViewModel

5dc95d8

Merge branch 'master' into update-backing-mutation-ui

6b9a3f3

dusi approved these changes Oct 8, 2019

View reviewed changes

ifbarrera approved these changes Oct 8, 2019

View reviewed changes

justinswart added 2 commits October 8, 2019 12:14

Use observeForControllerAction, make function private

e491a75

Remove GraphIDBridging from Location model, syntax improvements on Pl…

7e9871f

…edgeViewModel

justinswart merged commit f2b5153 into master Oct 8, 2019

justinswart deleted the update-backing-mutation-ui branch October 8, 2019 21:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NT-331] Perform Update Backing Mutation Request #874

[NT-331] Perform Update Backing Mutation Request #874

justinswart commented Oct 4, 2019

justinswart Oct 4, 2019

justinswart Oct 4, 2019

ifbarrera Oct 7, 2019

ifbarrera Oct 8, 2019

justinswart Oct 4, 2019

ksr-ci-bot commented Oct 4, 2019

ifbarrera Oct 7, 2019

ifbarrera Oct 7, 2019

justinswart Oct 7, 2019

ifbarrera Oct 7, 2019

justinswart Oct 7, 2019

ifbarrera Oct 8, 2019

ifbarrera Oct 7, 2019

ifbarrera Oct 7, 2019

ifbarrera Oct 7, 2019

justinswart Oct 7, 2019

ifbarrera Oct 7, 2019

ifbarrera Oct 7, 2019

justinswart Oct 7, 2019

dusi Oct 7, 2019

ifbarrera Oct 8, 2019

dusi left a comment

dusi Oct 8, 2019

justinswart Oct 8, 2019

dusi Oct 8, 2019

justinswart Oct 8, 2019

dusi Oct 8, 2019

justinswart Oct 8, 2019

ifbarrera left a comment

ifbarrera Oct 8, 2019

ifbarrera Oct 8, 2019

justinswart Oct 8, 2019

ifbarrera Oct 8, 2019

ifbarrera Oct 8, 2019

		project.map { $0.personalization.backing?.pledgeAmount },
		self.pledgeAmountDataSignal.map { $0.0 }

		var paymentMethodsViewHidden: Signal<Bool, Never> { get }
		var popViewController: Signal<(), Never> { get }

[NT-331] Perform Update Backing Mutation Request #874

[NT-331] Perform Update Backing Mutation Request #874

Conversation

justinswart commented Oct 4, 2019

📲 What

✋ What Not

🤔 Why

🛠 How

👀 See

✅ Acceptance criteria

⏰ TODO

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ksr-ci-bot commented Oct 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dusi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ifbarrera left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment