[EP-404] QA Phase 1 Fix User Properties

KsApi/models/User.swift

@@ -76,6 +76,7 @@ public struct User {
   public struct Stats {
     public var backedProjectsCount: Int?
     public var createdProjectsCount: Int?
+    public var draftProjectsCount: Int?
     public var memberProjectsCount: Int?
     public var starredProjectsCount: Int?
     public var unansweredSurveysCount: Int?
@@ -303,6 +304,7 @@ extension User.Stats: Decodable {
   enum CodingKeys: String, CodingKey {
     case backedProjectsCount = "backed_projects_count"
     case createdProjectsCount = "created_projects_count"
+    case draftProjectsCount = "draft_projects_count"
     case memberProjectsCount = "member_projects_count"
     case starredProjectsCount = "starred_projects_count"
     case unansweredSurveysCount = "unanswered_surveys_count"
@@ -315,6 +317,7 @@ extension User.Stats: EncodableType {
     var result: [String: Any] = [:]
     result["backed_projects_count"] = self.backedProjectsCount
     result["created_projects_count"] = self.createdProjectsCount
+    result["draft_projects_count"] = self.draftProjectsCount
     result["member_projects_count"] = self.memberProjectsCount
     result["starred_projects_count"] = self.starredProjectsCount
     result["unanswered_surveys_count"] = self.unansweredSurveysCount

KsApi/models/UserTests.swift

@@ -21,6 +21,7 @@ final class UserTests: XCTestCase {
         "small": "http://www.kickstarter.com/small.jpg"
       ],
       "backed_projects_count": 2,
+      "draft_projects_count": 4,
       "weekly_newsletter": false,
       "promo_newsletter": false,
       "happening_newsletter": false,
@@ -48,6 +49,7 @@ final class UserTests: XCTestCase {
     XCTAssertEqual(false, user?.isAdmin)
     XCTAssertEqual("http://www.kickstarter.com/small.jpg", user?.avatar.small)
     XCTAssertEqual(2, user?.stats.backedProjectsCount)
+    XCTAssertEqual(4, user?.stats.draftProjectsCount)
     XCTAssertEqual(false, user?.newsletters.weekly)
     XCTAssertEqual(false, user?.newsletters.promo)
     XCTAssertEqual(false, user?.newsletters.happening)

KsApi/models/lenses/User.StatsLenses.swift

@@ -5,27 +5,51 @@ extension User.Stats {
     public static let backedProjectsCount = Lens<User.Stats, Int?>(
       view: { $0.backedProjectsCount },
       set: { User.Stats(
-        backedProjectsCount: $0, createdProjectsCount: $1.createdProjectsCount,
-        memberProjectsCount: $1.memberProjectsCount, starredProjectsCount: $1.starredProjectsCount,
-        unansweredSurveysCount: $1.unansweredSurveysCount, unreadMessagesCount: $1.unreadMessagesCount
+        backedProjectsCount: $0,
+        createdProjectsCount: $1.createdProjectsCount,
+        draftProjectsCount: $1.draftProjectsCount,
+        memberProjectsCount: $1.memberProjectsCount,
+        starredProjectsCount: $1.starredProjectsCount,
+        unansweredSurveysCount: $1.unansweredSurveysCount,
+        unreadMessagesCount: $1.unreadMessagesCount
+      ) }
+    )
+
+    public static let draftProjectsCount = Lens<User.Stats, Int?>(
+      view: { $0.draftProjectsCount },
+      set: { User.Stats(
+        backedProjectsCount: $1.backedProjectsCount,
+        createdProjectsCount: $1.createdProjectsCount,
+        draftProjectsCount: $0,
+        memberProjectsCount: $1.memberProjectsCount,
+        starredProjectsCount: $1.starredProjectsCount,
+        unansweredSurveysCount: $1.unansweredSurveysCount,
+        unreadMessagesCount: $1.unreadMessagesCount
       ) }
     )
 
     public static let createdProjectsCount = Lens<User.Stats, Int?>(
       view: { $0.createdProjectsCount },
       set: { User.Stats(
-        backedProjectsCount: $1.backedProjectsCount, createdProjectsCount: $0,
-        memberProjectsCount: $1.memberProjectsCount, starredProjectsCount: $1.starredProjectsCount,
-        unansweredSurveysCount: $1.unansweredSurveysCount, unreadMessagesCount: $1.unreadMessagesCount
+        backedProjectsCount: $1.backedProjectsCount,
+        createdProjectsCount: $0,
+        draftProjectsCount: $1.draftProjectsCount,
+        memberProjectsCount: $1.memberProjectsCount,
+        starredProjectsCount: $1.starredProjectsCount,
+        unansweredSurveysCount: $1.unansweredSurveysCount,
+        unreadMessagesCount: $1.unreadMessagesCount
       ) }
     )
 
     public static let memberProjectsCount = Lens<User.Stats, Int?>(
       view: { $0.memberProjectsCount },
       set: { User.Stats(
         backedProjectsCount: $1.backedProjectsCount,
-        createdProjectsCount: $1.createdProjectsCount, memberProjectsCount: $0,
-        starredProjectsCount: $1.starredProjectsCount, unansweredSurveysCount: $1.unansweredSurveysCount,
+        createdProjectsCount: $1.createdProjectsCount,
+        draftProjectsCount: $1.draftProjectsCount,
+        memberProjectsCount: $0,
+        starredProjectsCount: $1.starredProjectsCount,
+        unansweredSurveysCount: $1.unansweredSurveysCount,
         unreadMessagesCount: $1.unreadMessagesCount
       ) }
     )
@@ -34,8 +58,11 @@ extension User.Stats {
       view: { $0.starredProjectsCount },
       set: { User.Stats(
         backedProjectsCount: $1.backedProjectsCount,
-        createdProjectsCount: $1.createdProjectsCount, memberProjectsCount: $1.memberProjectsCount,
-        starredProjectsCount: $0, unansweredSurveysCount: $1.unansweredSurveysCount,
+        createdProjectsCount: $1.createdProjectsCount,
+        draftProjectsCount: $1.draftProjectsCount,
+        memberProjectsCount: $1.memberProjectsCount,
+        starredProjectsCount: $0,
+        unansweredSurveysCount: $1.unansweredSurveysCount,
         unreadMessagesCount: $1.unreadMessagesCount
       ) }
     )

KsApi/models/lenses/UserLenses.swift

@@ -519,6 +519,10 @@ extension Lens where Whole == User, Part == User.Stats {
     return User.lens.stats .. User.Stats.lens.createdProjectsCount
   }
 
+  public var draftProjectsCount: Lens<User, Int?> {
+    return User.lens.stats .. User.Stats.lens.draftProjectsCount
+  }
+
   public var memberProjectsCount: Lens<User, Int?> {
     return User.lens.stats .. User.Stats.lens.memberProjectsCount
   }

KsApi/models/templates/User.StatsTemplates.swift

@@ -2,6 +2,7 @@ extension User.Stats {
   internal static let template = User.Stats(
     backedProjectsCount: nil,
     createdProjectsCount: nil,
+    draftProjectsCount: nil,
     memberProjectsCount: nil,
     starredProjectsCount: nil,
     unansweredSurveysCount: nil,

Library/Tracking/KSRAnalytics.swift

@@ -1810,9 +1810,14 @@ private func userProperties(for user: User?, config _: Config?, _ prefix: String
   var props: [String: Any] = [:]
 
   props["backed_projects_count"] = user?.stats.backedProjectsCount
-  props["created_projects_count"] = user?.stats.createdProjectsCount
+  // the product/insights team definition of created_projects_count is the sum of createdProjectsCount and draftProjectsCount
+  props["created_projects_count"] = (user?.stats.createdProjectsCount ?? 0) +
+    (user?.stats
+      .draftProjectsCount ??
+      0)
   props["is_admin"] = user?.isAdmin
-  props["launched_projects_count"] = user?.stats.memberProjectsCount
+  props["launched_projects_count"] = user?.stats
+    .createdProjectsCount // product and insights defines launched_projects_count as only the createdProjectsCount
   props["uid"] = user?.id
   props["watched_projects_count"] = user?.stats.starredProjectsCount
   props["facebook_connected"] = user?.facebookConnected

Library/Tracking/KSRAnalyticsTests.swift

@@ -1774,8 +1774,8 @@ final class KSRAnalyticsTests: TestCase {
       |> User.lens.location .~ Location.usa
       |> User.lens.facebookConnected .~ true
       |> User.lens.stats.starredProjectsCount .~ 2
-      |> User.lens.stats.createdProjectsCount .~ 3
-      |> User.lens.stats.memberProjectsCount .~ 6
+      |> User.lens.stats.createdProjectsCount .~ 7
+      |> User.lens.stats.draftProjectsCount .~ 8
       |> User.lens.id .~ 10
       |> User.lens.isAdmin .~ false
 
@@ -1792,17 +1792,17 @@ final class KSRAnalyticsTests: TestCase {
 
     XCTAssertEqual(10, dataLakeClientProps?["user_uid"] as? Int)
     XCTAssertEqual(5, dataLakeClientProps?["user_backed_projects_count"] as? Int)
-    XCTAssertEqual(3, dataLakeClientProps?["user_created_projects_count"] as? Int)
+    XCTAssertEqual(15, dataLakeClientProps?["user_created_projects_count"] as? Int)
     XCTAssertEqual(false, dataLakeClientProps?["user_is_admin"] as? Bool)
-    XCTAssertEqual(6, dataLakeClientProps?["user_launched_projects_count"] as? Int)
+    XCTAssertEqual(7, dataLakeClientProps?["user_launched_projects_count"] as? Int)
     XCTAssertEqual(2, dataLakeClientProps?["user_watched_projects_count"] as? Int)
     XCTAssertEqual(true, dataLakeClientProps?["user_facebook_connected"] as? Bool)
 
     XCTAssertEqual(10, segmentClientProps?["user_uid"] as? Int)
     XCTAssertEqual(5, segmentClientProps?["user_backed_projects_count"] as? Int)
-    XCTAssertEqual(3, segmentClientProps?["user_created_projects_count"] as? Int)
+    XCTAssertEqual(15, segmentClientProps?["user_created_projects_count"] as? Int)
     XCTAssertEqual(false, segmentClientProps?["user_is_admin"] as? Bool)
-    XCTAssertEqual(6, segmentClientProps?["user_launched_projects_count"] as? Int)
+    XCTAssertEqual(7, segmentClientProps?["user_launched_projects_count"] as? Int)
     XCTAssertEqual(2, segmentClientProps?["user_watched_projects_count"] as? Int)
     XCTAssertEqual(true, segmentClientProps?["user_facebook_connected"] as? Bool)
   }