Update static helper method to initializer

woocommerce · Dec 20, 2024 · 406d66f · 406d66f
1 parent 0634127
commit 406d66f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Networking/Networking/Model/NotificationSettings.swift b/Networking/Networking/Model/NotificationSettings.swift
@@ -9,7 +9,7 @@ public struct NotificationSettings: Equatable, Encodable {
 
     /// Helper method to create notification settings for a given device ID.
     ///
-    public static func createSettings(deviceID: Int64, enabledSites: [Int64], disabledSites: [Int64]) -> NotificationSettings {
+    public init(deviceID: Int64, enabledSites: [Int64], disabledSites: [Int64]) {
         let enabledSiteSettings = enabledSites.map { siteID in
             Blog(blogID: siteID, devices: [
                 Device(deviceID: deviceID,
@@ -26,9 +26,12 @@ public struct NotificationSettings: Equatable, Encodable {
             ])
         }
 
-        return NotificationSettings(blogs: enabledSiteSettings + disabledSiteSettings)
+        self.init(blogs: (enabledSiteSettings + disabledSiteSettings))
     }
 
+    public init(blogs: [Blog]) {
+        self.blogs = blogs
+    }
 }
 
 public extension NotificationSettings {

diff --git a/Networking/NetworkingTests/Remote/AccountRemoteTests.swift b/Networking/NetworkingTests/Remote/AccountRemoteTests.swift
@@ -281,7 +281,7 @@ final class AccountRemoteTests: XCTestCase {
         network.simulateResponse(requestUrlSuffix: "me/notifications/settings", filename: "notification-settings")
 
         // When
-        let notificationSettings = NotificationSettings.createSettings(deviceID: 58089781, enabledSites: [], disabledSites: [194373765])
+        let notificationSettings = NotificationSettings(deviceID: 58089781, enabledSites: [], disabledSites: [194373765])
         _ = try await remote.updateNotificationSettings(with: notificationSettings)
 
         // Then
@@ -305,7 +305,7 @@ final class AccountRemoteTests: XCTestCase {
         // When
         var errorCaught: Error?
         do {
-            let notificationSettings = NotificationSettings.createSettings(deviceID: 58089781, enabledSites: [194373765], disabledSites: [])
+            let notificationSettings = NotificationSettings(deviceID: 58089781, enabledSites: [194373765], disabledSites: [])
             try await remote.updateNotificationSettings(with: notificationSettings)
         } catch {
             errorCaught = error
@@ -324,7 +324,7 @@ final class AccountRemoteTests: XCTestCase {
         // When
         var errorCaught: Error?
         do {
-            let notificationSettings = NotificationSettings.createSettings(deviceID: 58089781, enabledSites: [194373765], disabledSites: [])
+            let notificationSettings = NotificationSettings(deviceID: 58089781, enabledSites: [194373765], disabledSites: [])
             try await remote.updateNotificationSettings(with: notificationSettings)
         } catch {
             errorCaught = error

diff --git a/Yosemite/YosemiteTests/Stores/AccountStoreTests.swift b/Yosemite/YosemiteTests/Stores/AccountStoreTests.swift
@@ -899,7 +899,7 @@ final class AccountStoreTests: XCTestCase {
 
         // When
         let result: Result<Void, Error> = waitFor { promise in
-            let notificationSettings = NotificationSettings.createSettings(deviceID: 132, enabledSites: [23], disabledSites: [44, 66])
+            let notificationSettings = NotificationSettings(deviceID: 132, enabledSites: [23], disabledSites: [44, 66])
             let action = AccountAction.updateNotificationSettings(notificationSettings: notificationSettings) { result in
                 promise(result)
             }
@@ -923,7 +923,7 @@ final class AccountStoreTests: XCTestCase {
 
         // When
         let result: Result<Void, Error> = waitFor { promise in
-            let notificationSettings = NotificationSettings.createSettings(deviceID: 132, enabledSites: [23], disabledSites: [44, 66])
+            let notificationSettings = NotificationSettings(deviceID: 132, enabledSites: [23], disabledSites: [44, 66])
             let action = AccountAction.updateNotificationSettings(notificationSettings: notificationSettings) { result in
                 promise(result)
             }