Fixes incorrect price for a lot sold to the user.

artsy · Jan 20, 2017 · a56235c · a56235c
1 parent ca261ca
commit a56235c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/Artsy/View_Controllers/Live_Auctions/LiveAuctionSalesPerson.swift b/Artsy/View_Controllers/Live_Auctions/LiveAuctionSalesPerson.swift
@@ -22,6 +22,7 @@ protocol LiveAuctionsSalesPersonType: class {
     func lotViewModelRelativeToShowingIndex(_ offset: Int) -> LiveAuctionLotViewModelType
     func currentLotValue(_ lot: LiveAuctionLotViewModelType) -> UInt64
     func currentLotValueString(_ lot: LiveAuctionLotViewModelType) -> String
+    func winningLotValueString(_ lot: LiveAuctionLotViewModelType) -> String?
 
     func bidOnLot(_ lot: LiveAuctionLotViewModelType, amountCents: UInt64, biddingViewModel: LiveAuctionBiddingViewModelType)
     func leaveMaxBidOnLot(_ lot: LiveAuctionLotViewModelType, amountCents: UInt64, biddingViewModel: LiveAuctionBiddingViewModelType)
@@ -90,6 +91,12 @@ class LiveAuctionsSalesPerson: NSObject, LiveAuctionsSalesPersonType {
     func currentLotValueString(_ lot: LiveAuctionLotViewModelType) -> String {
         return currentLotValue(lot).convertToDollarString(lot.currencySymbol)
     }
+
+    func winningLotValueString(_ lot: LiveAuctionLotViewModelType) -> String? {
+        guard let winningBidPrice = lot.winningBidPrice else { return nil }
+
+        return winningBidPrice.convertToDollarString(lot.currencySymbol)
+    }
 }
 
 private typealias ComputedProperties = LiveAuctionsSalesPerson

diff --git a/Artsy/View_Controllers/Live_Auctions/ViewModels/LiveAuctionLotViewModel.swift b/Artsy/View_Controllers/Live_Auctions/ViewModels/LiveAuctionLotViewModel.swift
@@ -41,6 +41,7 @@ protocol LiveAuctionLotViewModelType: class {
     var urlForThumbnail: URL { get }
     var urlForProfile: URL { get }
     var askingPrice: UInt64 { get }
+    var winningBidPrice: UInt64? { get }
     var currencySymbol: String { get }
     var numberOfBids: Int { get }
     var imageAspectRatio: CGFloat { get }
@@ -152,6 +153,10 @@ class LiveAuctionLotViewModel: NSObject, LiveAuctionLotViewModelType {
         return String(model.lotNumber)
     }
 
+    var winningBidPrice: UInt64? {
+        return self.winningBidEvent?.bidAmountCents
+    }
+
     var askingPrice: UInt64 {
         return model.askingPriceCents
     }

diff --git a/Artsy/View_Controllers/Live_Auctions/Views/AuctionLotMetadataStackScrollView.swift b/Artsy/View_Controllers/Live_Auctions/Views/AuctionLotMetadataStackScrollView.swift
@@ -92,8 +92,9 @@ class AuctionLotMetadataStackScrollView: ORStackScrollView {
                     currentBid.text = newCurrentBid.bid
             }
             case .closedLot:
-                if viewModel.isBeingSold && viewModel.userIsBeingSoldTo {
-                    currentBid.text = "Sold for: \(salesPerson.currentLotValueString(viewModel))"
+                if viewModel.isBeingSold && viewModel.userIsBeingSoldTo,
+                    let winningLotValueString = salesPerson.winningLotValueString(viewModel) {
+                    currentBid.text = "Sold for: \(winningLotValueString)"
                 } else {
                     currentBid.text = ""
                 }

diff --git a/...ges/LiveAuctionLotViewControllerTests/snapshots__looks_good_for_won_lots@2x.png b/...ges/LiveAuctionLotViewControllerTests/snapshots__looks_good_for_won_lots@2x.png
diff --git a/Artsy_Tests/View_Controller_Tests/Live_Auction/LiveAuctionLotViewControllerTests.swift b/Artsy_Tests/View_Controller_Tests/Live_Auction/LiveAuctionLotViewControllerTests.swift
@@ -48,6 +48,14 @@ class LiveAuctionLotViewControllerTests: QuickSpec {
                 expect(subject) == snapshot()
             }
 
+            it("looks good for won lots") {
+                lotViewModel.isBeingSold = true
+                lotViewModel.userIsBeingSoldTo = true
+                lotViewModel.winningBidPrice = 6000_00
+                lotViewModel.lotStateSignal.update(.closedLot(wasPassed: false))
+                expect(subject) == snapshot()
+            }
+
             it("looks good for passed lots") {
                 lotViewModel.lotStateSignal.update(.closedLot(wasPassed: true))
                 expect(subject) == snapshot()
@@ -154,6 +162,7 @@ class Test_LiveAuctionLotViewModel: LiveAuctionLotViewModelType {
     var userIsBeingSoldTo: Bool = false
     var userIsWinning: Bool = false
     var isBeingSold: Bool = false
+    var winningBidPrice: UInt64? = nil
     // Whether or not (all) events returned from this test VM should be cancelled.
     var cancelEvents = false