[MBL-703] Prelaunch Page Watch Count Update

Kickstarter-iOS/SharedViews/PledgeCTAContainerView.swift

@@ -174,7 +174,7 @@ final class PledgeCTAContainerView: UIView {
 
     self.viewModel.outputs.prelaunchCTASaved
       .observeForUI()
-      .observeValues { [weak self] isPrelaunch, saved in
+      .observeValues { [weak self] isPrelaunch, saved, _ in
         guard isPrelaunch else { return }
 
         _ = self?.pledgeCTAButton

KsApi/GraphAPI.swift

@@ -4440,6 +4440,7 @@ public enum GraphAPI {
             __typename
             id
             isWatched
+            watchesCount
           }
         }
       }
@@ -4542,6 +4543,7 @@ public enum GraphAPI {
               GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
               GraphQLField("id", type: .nonNull(.scalar(GraphQLID.self))),
               GraphQLField("isWatched", type: .nonNull(.scalar(Bool.self))),
+              GraphQLField("watchesCount", type: .scalar(Int.self)),
             ]
           }
 
@@ -4551,8 +4553,8 @@ public enum GraphAPI {
             self.resultMap = unsafeResultMap
           }
 
-          public init(id: GraphQLID, isWatched: Bool) {
-            self.init(unsafeResultMap: ["__typename": "Project", "id": id, "isWatched": isWatched])
+          public init(id: GraphQLID, isWatched: Bool, watchesCount: Int? = nil) {
+            self.init(unsafeResultMap: ["__typename": "Project", "id": id, "isWatched": isWatched, "watchesCount": watchesCount])
           }
 
           public var __typename: String {
@@ -4582,6 +4584,16 @@ public enum GraphAPI {
               resultMap.updateValue(newValue, forKey: "isWatched")
             }
           }
+
+          /// Number of watchers a project has.
+          public var watchesCount: Int? {
+            get {
+              return resultMap["watchesCount"] as? Int
+            }
+            set {
+              resultMap.updateValue(newValue, forKey: "watchesCount")
+            }
+          }
         }
       }
     }
@@ -5039,6 +5051,7 @@ public enum GraphAPI {
             __typename
             id
             isWatched
+            watchesCount
           }
         }
       }
@@ -5141,6 +5154,7 @@ public enum GraphAPI {
               GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
               GraphQLField("id", type: .nonNull(.scalar(GraphQLID.self))),
               GraphQLField("isWatched", type: .nonNull(.scalar(Bool.self))),
+              GraphQLField("watchesCount", type: .scalar(Int.self)),
             ]
           }
 
@@ -5150,8 +5164,8 @@ public enum GraphAPI {
             self.resultMap = unsafeResultMap
           }
 
-          public init(id: GraphQLID, isWatched: Bool) {
-            self.init(unsafeResultMap: ["__typename": "Project", "id": id, "isWatched": isWatched])
+          public init(id: GraphQLID, isWatched: Bool, watchesCount: Int? = nil) {
+            self.init(unsafeResultMap: ["__typename": "Project", "id": id, "isWatched": isWatched, "watchesCount": watchesCount])
           }
 
           public var __typename: String {
@@ -5181,6 +5195,16 @@ public enum GraphAPI {
               resultMap.updateValue(newValue, forKey: "isWatched")
             }
           }
+
+          /// Number of watchers a project has.
+          public var watchesCount: Int? {
+            get {
+              return resultMap["watchesCount"] as? Int
+            }
+            set {
+              resultMap.updateValue(newValue, forKey: "watchesCount")
+            }
+          }
         }
       }
     }

KsApi/models/graphql/WatchProjectResponseEnvelope.swift

@@ -9,6 +9,7 @@ public struct WatchProjectResponseEnvelope: Decodable {
     public struct Project: Decodable {
       public var id: String
       public var isWatched: Bool
+      public var watchesCount: Int
     }
   }
 }

KsApi/models/graphql/adapters/WatchProjectResponseEnvelope+UnwatchProjectMutation.Data.swift

@@ -8,9 +8,11 @@ extension WatchProjectResponseEnvelope {
     guard let projectFromData = data.watchProject?.project else {
       return nil
     }
+
     let project = WatchProject.Project(
       id: projectFromData.id,
-      isWatched: projectFromData.isWatched
+      isWatched: projectFromData.isWatched,
+      watchesCount: projectFromData.watchesCount ?? 0
     )
 
     return WatchProjectResponseEnvelope(watchProject: WatchProject(project: project))

KsApi/models/graphql/adapters/WatchProjectResponseEnvelope+UnwatchProjectMutation.DataTest.swift

@@ -9,6 +9,7 @@ final class WatchProjectResponseEnvelope_UnwatchProjectMutationTests: XCTestCase
 
     XCTAssertEqual(envelope?.watchProject.project.id, "id")
     XCTAssertEqual(envelope?.watchProject.project.isWatched, false)
+    XCTAssertEqual(envelope?.watchProject.project.watchesCount, 100)
   }
 
   func test_envelopeFrom_ReturnsNil() {

KsApi/models/graphql/adapters/WatchProjectResponseEnvelope+WatchProjectMutation.Data.swift

@@ -11,7 +11,8 @@ extension WatchProjectResponseEnvelope {
     }
     let project = WatchProject.Project(
       id: projectFromData.id,
-      isWatched: projectFromData.isWatched
+      isWatched: projectFromData.isWatched,
+      watchesCount: projectFromData.watchesCount ?? 0
     )
 
     return WatchProjectResponseEnvelope(watchProject: WatchProject(project: project))

KsApi/models/graphql/adapters/WatchProjectResponseEnvelope+WatchProjectMutation.DataTests.swift

@@ -10,6 +10,7 @@ final class WatchProjectResponseEnvelope_WatchProjectMutationTests: XCTestCase {
 
     XCTAssertEqual(envelope?.watchProject.project.id, "id")
     XCTAssertEqual(envelope?.watchProject.project.isWatched, true)
+    XCTAssertEqual(envelope?.watchProject.project.watchesCount, 100)
   }
 
   func test_envelopeFrom_ReturnsNil() {

KsApi/models/templates/graphql/WatchProjectResponseEnvelopeTemplates.swift

@@ -3,13 +3,13 @@ import Foundation
 extension WatchProjectResponseEnvelope {
   internal static let watchTemplate = WatchProjectResponseEnvelope(
     watchProject: .init(
-      project: .init(id: "UHJvamVjdC0xMzEzNzE3MDgy", isWatched: true)
+      project: .init(id: "UHJvamVjdC0xMzEzNzE3MDgy", isWatched: true, watchesCount: 10)
     )
   )
 
   internal static let unwatchTemplate = WatchProjectResponseEnvelope(
     watchProject: .init(
-      project: .init(id: "UHJvamVjdC0xMzEzNzE3MDgy", isWatched: true)
+      project: .init(id: "UHJvamVjdC0xMzEzNzE3MDgy", isWatched: true, watchesCount: 9)
     )
   )
 }

KsApi/mutations/UnwatchProject.graphql

@@ -4,6 +4,7 @@ mutation unwatchProject($input: UnwatchProjectInput!) {
     project {
       id
       isWatched
+      watchesCount
     }
   }
 }

KsApi/mutations/WatchProject.graphql

@@ -4,6 +4,7 @@ mutation watchProject($input: WatchProjectInput!) {
     project {
       id
       isWatched
+      watchesCount
     }
   }
 }

KsApi/mutations/templates/mutation/WatchProjectMutationTemplate.swift

@@ -35,7 +35,8 @@ public enum WatchProjectResponseMutationTemplate {
         "clientMutationId": nil,
         "project": [
           "id": "id",
-          "isWatched": watched
+          "isWatched": watched,
+          "watchesCount": 100
         ]
       ]
     ]
@@ -47,7 +48,8 @@ public enum WatchProjectResponseMutationTemplate {
         "clientMutationId": nil,
         "project": [
           "id": "id",
-          "isWatched": watched
+          "isWatched": watched,
+          "watchesCount": 100
         ]
       ]
     ]

Library/PledgeStateCTAType.swift

@@ -7,7 +7,7 @@ public enum PledgeStateCTAType: Equatable {
   case viewBacking
   case viewRewards
   case viewYourRewards
-  case prelaunch(saved: Bool)
+  case prelaunch(saved: Bool, watchCount: Int)
 
   public var buttonTitle: String {
     switch self {
@@ -23,7 +23,7 @@ public enum PledgeStateCTAType: Equatable {
       return Strings.View_rewards()
     case .viewYourRewards:
       return Strings.View_your_rewards()
-    case let .prelaunch(saved):
+    case let .prelaunch(saved, _):
       return saved ? Strings.Saved() : Strings.Notify_me_on_launch()
     }
   }
@@ -38,7 +38,7 @@ public enum PledgeStateCTAType: Equatable {
       return .blue
     case .viewBacking, .viewRewards, .viewYourRewards:
       return .black
-    case let .prelaunch(saved):
+    case let .prelaunch(saved, _):
       return saved ? .none : .black
     }
   }

Library/ViewModels/PledgeCTAContainerViewViewModel.swift

@@ -10,7 +10,8 @@ public enum PledgeCTAContainerViewContext {
 
 public typealias PledgeCTAPrelaunchState = (
   prelaunch: Bool,
-  saved: Bool
+  saved: Bool,
+  watchesCount: Int
 )
 
 public typealias PledgeCTAContainerViewData = (
@@ -110,13 +111,14 @@ public final class PledgeCTAContainerViewViewModel: PledgeCTAContainerViewViewMo
 
     self.prelaunchState <~ self.pledgeState.signal.skipNil().map { state -> PledgeCTAPrelaunchState in
       switch state {
-      case let .prelaunch(saved):
+      case let .prelaunch(saved, watchCount):
         return PledgeCTAPrelaunchState(
           prelaunch: true,
-          saved: saved
+          saved: saved,
+          watchesCount: watchCount
         )
       default:
-        return PledgeCTAPrelaunchState(prelaunch: false, saved: false)
+        return PledgeCTAPrelaunchState(prelaunch: false, saved: false, watchesCount: 0)
       }
     }
 
@@ -125,13 +127,21 @@ public final class PledgeCTAContainerViewViewModel: PledgeCTAContainerViewViewMo
     self.watchesLabelIsHidden = self.prelaunchState.signal.skipNil()
       .map { !$0.prelaunch }
 
+    let updatedWatchCountProject = project
+      .takePairWhen(self.prelaunchState.signal.skipNil())
+      .map { project, prelaunchStateValue -> Project in
+        let updatedProjectWithWatchesCount = project |> \.watchesCount .~ prelaunchStateValue.watchesCount
+
+        return updatedProjectWithWatchesCount
+      }
+
     self.buttonStyleType = self.pledgeState.signal.skipNil().map { $0.buttonStyle }
     self.buttonTitleText = self.pledgeState.signal.skipNil().map { $0.buttonTitle }
     let stackViewAndSpacerAreHidden = self.pledgeState.signal.skipNil().map { $0.stackViewAndSpacerAreHidden }
     self.spacerIsHidden = stackViewAndSpacerAreHidden
     self.stackViewIsHidden = stackViewAndSpacerAreHidden
     self.titleText = self.pledgeState.signal.skipNil().map { $0.titleLabel }.skipNil()
-    self.watchesCountText = project
+    self.watchesCountText = Signal.merge(project, updatedWatchCountProject)
       .map { project in
         let watchesCountText = project.watchesCount ?? 0
 
@@ -200,7 +210,7 @@ private func pledgeCTA(project: Project, backing: Backing?) -> PledgeStateCTATyp
   guard project.displayPrelaunch != .some(true) else {
     let projectIsSaved = project.personalization.isStarred ?? false
 
-    return .prelaunch(saved: projectIsSaved)
+    return .prelaunch(saved: projectIsSaved, watchCount: project.watchesCount ?? 0)
   }
 
   guard let projectBacking = backing, project.personalization.isBacking == .some(true) else {

Library/ViewModels/PledgeCTAContainerViewViewModelTests.swift

@@ -332,17 +332,17 @@ internal final class PledgeCTAContainerViewViewModelTests: TestCase {
   func testPledgeCTA_PrelaunchGoesFromUnsavedToSavedViaNotification_Success() {
     let unsavedProject = Project.template
       |> \.displayPrelaunch .~ true
-      |> \.watchesCount .~ 102
+      |> \.watchesCount .~ 99
       |> \.personalization.isStarred .~ false
 
-    let prelaunchCTAUnsaved = PledgeCTAPrelaunchState(prelaunch: true, saved: false)
-    let prelaunchCTASaved = PledgeCTAPrelaunchState(prelaunch: true, saved: true)
+    let prelaunchCTAUnsaved = PledgeCTAPrelaunchState(prelaunch: true, saved: false, watchesCount: 99)
+    let prelaunchCTASaved = PledgeCTAPrelaunchState(prelaunch: true, saved: true, watchesCount: 100)
 
     self.vm.inputs.configureWith(value: (.left((unsavedProject, nil)), false, .projectPamphlet))
 
     self.buttonStyleType.assertValues([.black])
     self.buttonTitleText.assertValues(["Notify me on launch"])
-    self.watchesCountText.assertValues(["102 followers"])
+    self.watchesCountText.assertValues(["99 followers"])
     self.watchesLabelHidden.assertValues([false])
     XCTAssertEqual(self.prelaunchCTASaved.values.count, 1)
     XCTAssertEqual(self.prelaunchCTASaved.values.first!.prelaunch, prelaunchCTAUnsaved.prelaunch)
@@ -351,7 +351,7 @@ internal final class PledgeCTAContainerViewViewModelTests: TestCase {
 
     let savedProject = Project.template
       |> \.displayPrelaunch .~ true
-      |> \.watchesCount .~ 102
+      |> \.watchesCount .~ 100
       |> \.personalization.isStarred .~ true
 
     self.vm.inputs.savedProjectFromNotification(project: savedProject)
@@ -360,7 +360,7 @@ internal final class PledgeCTAContainerViewViewModelTests: TestCase {
 
     self.buttonStyleType.assertValues([.black, .none])
     self.buttonTitleText.assertValues(["Notify me on launch", "Saved"])
-    self.watchesCountText.assertValues(["102 followers"])
+    self.watchesCountText.assertValues(["99 followers", "100 followers"])
     self.watchesLabelHidden.assertValues([false, false])
     XCTAssertEqual(self.prelaunchCTASaved.values.count, 2)
     XCTAssertEqual(self.prelaunchCTASaved.values.last!.prelaunch, prelaunchCTASaved.prelaunch)
@@ -383,6 +383,6 @@ internal final class PledgeCTAContainerViewViewModelTests: TestCase {
     self.scheduler.advance(by: .seconds(1))
 
     XCTAssertEqual(self.notifyDelegateCTATapped.values.count, 1)
-    XCTAssertEqual(self.notifyDelegateCTATapped.values.last!, .prelaunch(saved: true))
+    XCTAssertEqual(self.notifyDelegateCTATapped.values.last!, .prelaunch(saved: true, watchCount: 102))
   }
 }

Library/ViewModels/ProjectPageViewModel.swift

@@ -289,8 +289,8 @@ public final class ProjectPageViewModel: ProjectPageViewModelType, ProjectPageVi
     self.updateWatchProjectWithPrelaunchProjectState = shouldUpdateWatchProjectOnPrelaunch
       .map { pledgeCTAType -> PledgeCTAPrelaunchState? in
         switch pledgeCTAType {
-        case let .prelaunch(saved):
-          return PledgeCTAPrelaunchState(prelaunch: true, saved: saved)
+        case let .prelaunch(saved, watchesCount):
+          return PledgeCTAPrelaunchState(prelaunch: true, saved: saved, watchesCount: watchesCount)
         default:
           return nil
         }

Library/ViewModels/ProjectPageViewModelTests.swift

@@ -811,11 +811,12 @@ final class ProjectPageViewModelTests: TestCase {
 
       self.updateWatchProjectWithPrelaunchProjectState.assertDidNotEmitValue()
 
-      self.vm.inputs.pledgeCTAButtonTapped(with: .prelaunch(saved: true))
+      self.vm.inputs.pledgeCTAButtonTapped(with: .prelaunch(saved: true, watchCount: 10))
 
       XCTAssertEqual(self.updateWatchProjectWithPrelaunchProjectState.values.count, 1)
       XCTAssertEqual(self.updateWatchProjectWithPrelaunchProjectState.values.last!.prelaunch, true)
       XCTAssertEqual(self.updateWatchProjectWithPrelaunchProjectState.values.last!.saved, true)
+      XCTAssertEqual(self.updateWatchProjectWithPrelaunchProjectState.values.last!.watchesCount, 10)
     }
   }
 

Library/ViewModels/WatchProjectViewModel.swift

@@ -110,7 +110,18 @@ public final class WatchProjectViewModel: WatchProjectViewModelType,
       .switchMap { project, shouldWatch in
         watchProjectProducer(with: project, shouldWatch: shouldWatch)
           .ksr_delay(AppEnvironment.current.apiDelayInterval, on: AppEnvironment.current.scheduler)
-          .map { _ in (project, project.personalization.isStarred ?? false, success: true) }
+          .map { watchProjectEnvelope in
+            let updatedWatchCount = watchProjectEnvelope.watchProject.project.watchesCount
+
+            let updatedProjectWithWatchCount = project
+              |> \.watchesCount .~ updatedWatchCount
+
+            return (
+              updatedProjectWithWatchCount,
+              updatedProjectWithWatchCount.personalization.isStarred ?? false,
+              success: true
+            )
+          }
           .flatMapError { _ in .init(value: (project, !shouldWatch, success: false)) }
           .take(until: saveButtonTapped.ignoreValues())
       }