diff --git a/apple/OmnivoreKit/Sources/Models/NewsletterEmails.swift b/apple/OmnivoreKit/Sources/Models/NewsletterEmail.swift similarity index 61% rename from apple/OmnivoreKit/Sources/Models/NewsletterEmails.swift rename to apple/OmnivoreKit/Sources/Models/NewsletterEmail.swift index fde1f7017..8bd467055 100644 --- a/apple/OmnivoreKit/Sources/Models/NewsletterEmails.swift +++ b/apple/OmnivoreKit/Sources/Models/NewsletterEmail.swift @@ -1,13 +1,5 @@ import Foundation -public class NewsletterEmails { - public let newsletterEmails: [NewsletterEmail] - - public init(newsletterEmails: [NewsletterEmail]) { - self.newsletterEmails = newsletterEmails - } -} - public struct NewsletterEmail { public let id: String public let email: String diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/NewsletterEmailsQuery.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/NewsletterEmailsQuery.swift index a9d7fcf28..af59ef863 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/NewsletterEmailsQuery.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/NewsletterEmailsQuery.swift @@ -4,9 +4,9 @@ import Models import SwiftGraphQL public extension DataService { - func newsletterEmailsPublisher() -> AnyPublisher { + func newsletterEmailsPublisher() -> AnyPublisher<[NewsletterEmail], ServerError> { enum QueryResult { - case success(result: NewsletterEmails) + case success(result: [NewsletterEmail]) case error(error: String) } @@ -21,11 +21,7 @@ public extension DataService { let selection = Selection { try $0.on( newsletterEmailsSuccess: .init { - QueryResult.success(result: - NewsletterEmails( - newsletterEmails: try $0.newsletterEmails(selection: newsletterEmailSelection.list) - ) - ) + QueryResult.success(result: try $0.newsletterEmails(selection: newsletterEmailSelection.list)) }, newsletterEmailsError: .init { QueryResult.error(error: try $0.errorCodes().description)