Have the mapper return plugins with networkActivated as a proxy for activation

Author: allendav

Networking/Networking/Mapper/SystemStatusMapper.swift

@@ -19,7 +19,17 @@ struct SystemStatusMapper: Mapper {
 
         let systemStatus = try decoder.decode(SystemStatusEnvelope.self, from: response).systemStatus
 
-        return systemStatus.activePlugins + systemStatus.inactivePlugins
+        /// For now, we're going to override the networkActivated Bool in each plugin to convey active or inactive -- in order to
+        /// avoid a core data change to add a Bool for activated
+        /// This will be undone in #xxxx
+        let activePlugins = systemStatus.activePlugins.map {
+            $0.overrideNetworkActivated(isNetworkActivated: true)
+        }
+        let inactivePlugins = systemStatus.inactivePlugins.map {
+            $0.overrideNetworkActivated(isNetworkActivated: false)
+        }
+
+        return activePlugins + inactivePlugins
     }
 }
 

Networking/Networking/Model/SystemPlugin.swift

@@ -88,6 +88,22 @@ public struct SystemPlugin: Decodable, GeneratedFakeable, GeneratedCopiable {
     }
 }
 
+extension SystemPlugin {
+    func overrideNetworkActivated(isNetworkActivated: Bool) -> SystemPlugin {
+        SystemPlugin(
+            siteID: self.siteID,
+            plugin: self.plugin,
+            name: self.name,
+            version: self.version,
+            versionLatest: self.versionLatest,
+            url: self.url,
+            authorName: self.authorName,
+            authorUrl: self.authorUrl,
+            networkActivated: isNetworkActivated
+        )
+    }
+}
+
 /// Defines all of the SystemPlugin CodingKeys.
 ///
 private extension SystemPlugin {

Networking/NetworkingTests/Mapper/SystemStatusMapperTests.swift

@@ -9,9 +9,9 @@ class SystemStatusMapperTests: XCTestCase {
     ///
     private let dummySiteID: Int64 = 999999
 
-    /// Verifies the SystemPlugin fields are parsed correctly.
+    /// Verifies the SystemPlugin fields are parsed correctly for an active plugin
     ///
-    func test_SystemPlugin_fields_are_properly_parsed() throws {
+    func test_active_plugin_fields_are_properly_parsed() throws {
         // Given
         let expectedSiteId: Int64 = 999999
         let expectedPlugin = "woocommerce/woocommerce.php"
@@ -21,7 +21,10 @@ class SystemStatusMapperTests: XCTestCase {
         let expectedVersionLatest = "5.8.0"
         let expectedAuthorName = "Automattic"
         let expectedAuthorUrl = "https://woocommerce.com"
-        let expectedNetworkActivated = false
+        /// TODO - The mapper is overriding networkActivated to be true for active plugins in general
+        /// When we fix #xxxx this test will need to be updated to properly test the
+        /// new `activated` attribute that will be added to SystemPlugin instead
+        let expectedNetworkActivated = true
 
         // When
         let systemPlugins = try mapLoadSystemStatusResponse()
@@ -41,6 +44,42 @@ class SystemStatusMapperTests: XCTestCase {
         XCTAssertEqual(systemPlugin.authorUrl, expectedAuthorUrl)
         XCTAssertEqual(systemPlugin.networkActivated, expectedNetworkActivated)
     }
+
+    /// Verifies the SystemPlugin fields are parsed correctly for an inactive plugin
+    ///
+    func test_inactive_plugin_fields_are_properly_parsed() throws {
+        // Given
+        let expectedSiteId: Int64 = 999999
+        let expectedPlugin = "hello.php"
+        let expectedName = "Hello Dolly"
+        let expectedUrl = "http://wordpress.org/plugins/hello-dolly/"
+        let expectedVersion = "1.7.2"
+        let expectedVersionLatest = "1.7.2"
+        let expectedAuthorName = "Matt Mullenweg"
+        let expectedAuthorUrl = "http://ma.tt/"
+        /// TODO - The mapper is overriding networkActivated to be true for active plugins in general
+        /// When we fix #xxxx this test will need to be updated to properly test the
+        /// new `activated` attribute that will be added to SystemPlugin instead
+        let expectedNetworkActivated = false
+
+        // When
+        let systemPlugins = try mapLoadSystemStatusResponse()
+
+        // Then
+        XCTAssertEqual(systemPlugins.count, 6)
+
+        let systemPlugin = systemPlugins[5]
+        XCTAssertNotNil(systemPlugin)
+        XCTAssertEqual(systemPlugin.siteID, expectedSiteId)
+        XCTAssertEqual(systemPlugin.plugin, expectedPlugin)
+        XCTAssertEqual(systemPlugin.name, expectedName)
+        XCTAssertEqual(systemPlugin.url, expectedUrl)
+        XCTAssertEqual(systemPlugin.version, expectedVersion)
+        XCTAssertEqual(systemPlugin.versionLatest, expectedVersionLatest)
+        XCTAssertEqual(systemPlugin.authorName, expectedAuthorName)
+        XCTAssertEqual(systemPlugin.authorUrl, expectedAuthorUrl)
+        XCTAssertEqual(systemPlugin.networkActivated, expectedNetworkActivated)
+    }
 }
 
 /// Private Methods.