Merge branch 'trunk' into feat/8394-generate-application-password

Author: selanthiraiyan

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -39,6 +39,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .storeCreationM2WithInAppPurchasesEnabled:
             return false
+        case .storeCreationM3Profiler:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .justInTimeMessagesOnDashboard:
             return true
         case .systemStatusReportInSupportRequest:

Experiments/Experiments/FeatureFlag.swift

@@ -87,6 +87,10 @@ public enum FeatureFlag: Int {
     ///
     case storeCreationM2WithInAppPurchasesEnabled
 
+    /// Store creation milestone 3 - profiler questions
+    ///
+    case storeCreationM3Profiler
+
     /// Just In Time Messages on Dashboard
     ///
     case justInTimeMessagesOnDashboard

Fakes/Fakes/Networking.generated.swift

@@ -1593,6 +1593,19 @@ extension SiteSettingGroup {
         .general
     }
 }
+extension Networking.SiteSummaryStats {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.SiteSummaryStats {
+        .init(
+            siteID: .fake(),
+            date: .fake(),
+            period: .fake(),
+            visitors: .fake(),
+            views: .fake()
+        )
+    }
+}
 extension Networking.SiteVisitStats {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -1611,7 +1624,8 @@ extension Networking.SiteVisitStatsItem {
     public static func fake() -> Networking.SiteVisitStatsItem {
         .init(
             period: .fake(),
-            visitors: .fake()
+            visitors: .fake(),
+            views: .fake()
         )
     }
 }

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -1912,6 +1912,30 @@ extension Networking.SiteSetting {
     }
 }
 
+extension Networking.SiteSummaryStats {
+    public func copy(
+        siteID: CopiableProp<Int64> = .copy,
+        date: CopiableProp<String> = .copy,
+        period: CopiableProp<StatGranularity> = .copy,
+        visitors: CopiableProp<Int> = .copy,
+        views: CopiableProp<Int> = .copy
+    ) -> Networking.SiteSummaryStats {
+        let siteID = siteID ?? self.siteID
+        let date = date ?? self.date
+        let period = period ?? self.period
+        let visitors = visitors ?? self.visitors
+        let views = views ?? self.views
+
+        return Networking.SiteSummaryStats(
+            siteID: siteID,
+            date: date,
+            period: period,
+            visitors: visitors,
+            views: views
+        )
+    }
+}
+
 extension Networking.SiteVisitStats {
     public func copy(
         siteID: CopiableProp<Int64> = .copy,
@@ -1936,14 +1960,17 @@ extension Networking.SiteVisitStats {
 extension Networking.SiteVisitStatsItem {
     public func copy(
         period: CopiableProp<String> = .copy,
-        visitors: CopiableProp<Int> = .copy
+        visitors: CopiableProp<Int> = .copy,
+        views: CopiableProp<Int> = .copy
     ) -> Networking.SiteVisitStatsItem {
         let period = period ?? self.period
         let visitors = visitors ?? self.visitors
+        let views = views ?? self.views
 
         return Networking.SiteVisitStatsItem(
             period: period,
-            visitors: visitors
+            visitors: visitors,
+            views: views
         )
     }
 }

Networking/Networking/Model/Stats/SiteSummaryStats.swift

@@ -3,7 +3,7 @@ import Codegen
 
 /// Represents site summary stats for a specific period.
 ///
-public struct SiteSummaryStats: Decodable {
+public struct SiteSummaryStats: Decodable, GeneratedCopiable, GeneratedFakeable {
     public let siteID: Int64
     public let date: String
     public let period: StatGranularity

Networking/Networking/Model/Stats/SiteVisitStats.swift

@@ -25,7 +25,8 @@ public struct SiteVisitStats: Decodable, GeneratedCopiable, GeneratedFakeable {
         let rawData: [[AnyCodable]] = try container.decode([[AnyCodable]].self, forKey: .data)
         let rawDataContainers = rawData.map({ MIContainer(data: $0.map({ $0.value }), fieldNames: fieldNames) })
         let items = rawDataContainers.map({ SiteVisitStatsItem(period: $0.fetchStringValue(for: ItemFieldNames.period),
-                                                               visitors: $0.fetchIntValue(for: ItemFieldNames.visitors)) })
+                                                               visitors: $0.fetchIntValue(for: ItemFieldNames.visitors),
+                                                               views: $0.fetchIntValue(for: ItemFieldNames.views)) })
 
         self.init(siteID: siteID, date: date, granularity: granularity, items: items)
     }
@@ -79,11 +80,12 @@ extension SiteVisitStats: Equatable {
 //
 private extension SiteVisitStats {
 
-    /// Defines all of the possbile fields for a SiteVisitStatsItem.
+    /// Defines all of the possible fields for a SiteVisitStatsItem.
     ///
     enum ItemFieldNames: String {
-        case period = "period"
-        case visitors = "visitors"
+        case period
+        case visitors
+        case views
     }
 }
 

Networking/Networking/Model/Stats/SiteVisitStatsItem.swift

@@ -1,17 +1,19 @@
 import Foundation
 import Codegen
 
-/// Represents an single site visit stat for a specific period.
+/// Represents a single site visit stat for a specific period.
 ///
 public struct SiteVisitStatsItem: Equatable, GeneratedCopiable, GeneratedFakeable {
     public let period: String
     public let visitors: Int
+    public let views: Int
 
     /// SiteVisitStatsItem struct initializer.
     ///
-    public init(period: String, visitors: Int) {
+    public init(period: String, visitors: Int, views: Int) {
         self.period = period
         self.visitors = visitors
+        self.views = views
     }
 }
 
@@ -21,6 +23,7 @@ public struct SiteVisitStatsItem: Equatable, GeneratedCopiable, GeneratedFakeabl
 extension SiteVisitStatsItem: Comparable {
     public static func < (lhs: SiteVisitStatsItem, rhs: SiteVisitStatsItem) -> Bool {
         return lhs.period < rhs.period ||
-            (lhs.period == rhs.period && lhs.visitors < rhs.visitors)
+            (lhs.period == rhs.period && lhs.visitors < rhs.visitors) ||
+            (lhs.period == rhs.period && lhs.visitors == rhs.visitors && lhs.views < rhs.views)
     }
 }

Networking/Networking/Remote/SiteStatsRemote.swift

@@ -27,7 +27,7 @@ public class SiteStatsRemote: Remote {
         let parameters = [ParameterKeys.unit: unit.rawValue,
                           ParameterKeys.date: dateFormatter.string(from: latestDateToInclude),
                           ParameterKeys.quantity: String(quantity),
-                          ParameterKeys.statFields: ParameterValues.visitors]
+                          ParameterKeys.statFields: "\(ParameterValues.visitors),\(ParameterValues.views)"]
         let request = DotcomRequest(wordpressApiVersion: .mark1_1, method: .get, path: path, parameters: parameters)
         let mapper = SiteVisitStatsMapper(siteID: siteID)
         enqueue(request, mapper: mapper, completion: completion)
@@ -83,5 +83,6 @@ private extension SiteStatsRemote {
 
     enum ParameterValues {
         static let visitors: String = "visitors"
+        static let views: String    = "views"
     }
 }

Networking/NetworkingTests/Mapper/SiteVisitStatsMapperTests.swift

@@ -24,10 +24,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         let sampleItem1 = dayStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2018-07-26")
         XCTAssertEqual(sampleItem1.visitors, 101)
+        XCTAssertEqual(sampleItem1.views, 202)
 
         let sampleItem2 = dayStats.items![11]
         XCTAssertEqual(sampleItem2.period, "2018-08-06")
         XCTAssertEqual(sampleItem2.visitors, 2)
+        XCTAssertEqual(sampleItem2.views, 4)
     }
 
     /// Verifies that all of the week unit SiteVisitStats fields are parsed correctly.
@@ -47,10 +49,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         let sampleItem1 = weekStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2018W05W21")
         XCTAssertEqual(sampleItem1.visitors, 4)
+        XCTAssertEqual(sampleItem1.views, 8)
 
         let sampleItem2 = weekStats.items![11]
         XCTAssertEqual(sampleItem2.period, "2018W08W06")
         XCTAssertEqual(sampleItem2.visitors, 123123123)
+        XCTAssertEqual(sampleItem2.views, 246246246)
     }
 
     /// Verifies that all of the month unit SiteVisitStats fields are parsed correctly.
@@ -70,10 +74,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         let sampleItem1 = monthStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2017-09-01")
         XCTAssertEqual(sampleItem1.visitors, 224)
+        XCTAssertEqual(sampleItem1.views, 448)
 
         let sampleItem2 = monthStats.items![10]
         XCTAssertEqual(sampleItem2.period, "2018-07-01")
         XCTAssertEqual(sampleItem2.visitors, 6)
+        XCTAssertEqual(sampleItem2.views, 12)
     }
 
     /// Verifies that all of the year unit SiteVisitStats fields are parsed correctly.
@@ -93,10 +99,12 @@ class SiteVisitStatsMapperTests: XCTestCase {
         let sampleItem1 = yearStats.items![0]
         XCTAssertEqual(sampleItem1.period, "2014-01-01")
         XCTAssertEqual(sampleItem1.visitors, 1145)
+        XCTAssertEqual(sampleItem1.views, 2290)
 
         let sampleItem2 = yearStats.items![3]
         XCTAssertEqual(sampleItem2.period, "2017-01-01")
         XCTAssertEqual(sampleItem2.visitors, 144)
+        XCTAssertEqual(sampleItem2.views, 288)
     }
 }
 

Networking/NetworkingTests/Responses/site-visits-alt.json

@@ -13,7 +13,7 @@
     "data": [
              [
               "2014-01-01",
-              12821,
+              12831,
               1140,
               1094,
               0,
@@ -22,7 +22,7 @@
               ],
              [
               "2015-01-01",
-              14808,
+              14818,
               1634,
               1492,
               0,