Remove aggregate subscription. Minor access changes

Author: roanutil

Sources/CoreDataRepository/AggregateRepository.swift

@@ -214,43 +214,6 @@ public final class AggregateRepository {
             }
         }}.eraseToAnyPublisher()
     }
-
-    public func subscription<Value: Numeric>(_ publisher: AnyPublisher<Success<Value>, Failure>) -> AnyPublisher<Success<Value>, Failure> {
-        return AnyPublisher.create { subscriber in
-            let subject = PassthroughSubject<Success<Value>, Failure>()
-            subject.sink(receiveCompletion: subscriber.send, receiveValue: subscriber.send).store(in: &self.cancellables)
-            let id = UUID()
-            var subscription: SubscriptionProvider?
-            publisher.sink(
-                receiveCompletion: { completion in
-                    if case .failure = completion {
-                        subject.send(completion: completion)
-                    }
-                },
-                receiveValue: { value in
-                    let castValue = value.result.first!.values.first!
-                    subscription = RepositorySubscription(
-                        id: id,
-                        request: value.request,
-                        context: self.context,
-                        success: { Success(function: value.function, result: $0 as? [[String: Value]] ?? [], request: value.request) },
-                        failure: { Failure(function: value.function, request: value.request, error: $0) },
-                        subject: subject
-                    )
-                    subscription?.start()
-                    if let sub = subscription {
-                        self.subscriptions.append(sub)
-                    }
-                    subject.send(value)
-                    
-                }
-            ).store(in: &self.cancellables)
-            return AnyCancellable {
-                subscription?.cancel()
-                self.subscriptions.removeAll(where: { $0.id == id as AnyHashable })
-            }
-        }
-    }
 }
 
 // MARK: Extensions
@@ -273,9 +236,3 @@ extension NSExpressionDescription {
         return expDesc
     }
 }
-
-extension AnyPublisher where Failure == AggregateRepository.Failure {
-    func subscription<Value: Numeric>(_ repository: AggregateRepository) -> Self where Self.Output == AggregateRepository.Success<Value>, Self.Failure == AggregateRepository.Failure {
-        repository.subscription(self)
-    }
-}

Sources/CoreDataRepository/FetchRepository.swift

@@ -12,7 +12,7 @@ public final class FetchRepository {
     // MARK: Properties
     /// The context used by the repository.
     public let context: NSManagedObjectContext
-    public var subscriptions = [SubscriptionProvider]()
+    var subscriptions = [SubscriptionProvider]()
     public var cancellables = [AnyCancellable]()
 
     // MARK: Init
@@ -122,7 +122,7 @@ public final class FetchRepository {
 
 // MARK: Extensions
 extension AnyPublisher {
-    func subscription<Model: UnmanagedModel>(_ repository: FetchRepository) -> Self where Self.Output == FetchRepository.Success<Model>, Self.Failure == FetchRepository.Failure<Model> {
+    public func subscription<Model: UnmanagedModel>(_ repository: FetchRepository) -> Self where Self.Output == FetchRepository.Success<Model>, Self.Failure == FetchRepository.Failure<Model> {
         repository.subscription(self)
     }
 }

Sources/CoreDataRepository/RepositorySubscription.swift

@@ -10,7 +10,7 @@ import CoreData
 import Combine
 
 /// Re-fetches data as the context changes until canceled
-public class RepositorySubscription<
+class RepositorySubscription<
     Success,
     Failure: Error,
     Result: NSFetchRequestResult

Sources/CoreDataRepository/SubscriptionProvider.swift

@@ -5,7 +5,7 @@
 //  Created by Andrew Roan on 1/25/21.
 //
 
-public protocol SubscriptionProvider {
+protocol SubscriptionProvider {
     var id: AnyHashable { get }
     func manualFetch()
     func cancel()

Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift

@@ -150,74 +150,4 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
             })
         wait(for: [exp], timeout: 5)
     }
-
-    func testCountSubscriptionSuccess() {
-        let firstExp = expectation(description: "Get count of CoreData Movies boxOffice")
-        let secondExp = expectation(description: "Get count again after CoreData context is updated")
-        let result: AnyPublisher<Success<Int>, Failure> = repository.count(predicate: NSPredicate(value: true), entityDesc: RepoMovie.entity()).subscription(repository)
-        var resultCount = 0
-        let cancellable = result.subscribe(on: backgroundQueue)
-            .receive(on: mainQueue)
-            .sink(receiveCompletion: { completion in
-                switch completion {
-                case .finished:
-                    XCTFail("Not expecting completion since subscription finishes after subscriber cancel")
-                default:
-                    XCTFail("Not expecting failure")
-                }
-            }, receiveValue: { value in
-                resultCount += 1
-                let aggValue = value.result.first!.values.first!
-                switch resultCount {
-                case 1:
-                    assert(aggValue == 5, "Result value (count) should equal number of movies.")
-                    firstExp.fulfill()
-                case 2:
-                    assert(aggValue == 4, "Result value (count) should equal number of movies.")
-                    secondExp.fulfill()
-                default:
-                    break
-                }
-            })
-        wait(for: [firstExp], timeout: 5)
-        let crudRepository = CRUDRepository(context: self.backgroundContext)
-        let _: AnyPublisher<CRUDRepository.Success<Movie>, CRUDRepository.Failure<Movie>> = crudRepository.delete(self.objectIDs.last!)
-        wait(for: [secondExp], timeout: 5)
-        cancellable.cancel()
-    }
-
-    func testSumSubscriptionSuccess() {
-        let firstExp = expectation(description: "Get count of CoreData Movies boxOffice")
-        let secondExp = expectation(description: "Get count again after CoreData context is updated")
-        var resultCount = 0
-        let result: AnyPublisher<Success<Int>, Failure> = repository.sum(predicate: NSPredicate(value: true), entityDesc: RepoMovie.entity(), attributeDesc: RepoMovie.entity().attributesByName.values.first(where: { $0.name == "boxOffice" })!).subscription(repository)
-        let cancellable = result.subscribe(on: backgroundQueue)
-            .receive(on: mainQueue)
-            .sink(receiveCompletion: { completion in
-                switch completion {
-                case .finished:
-                    XCTFail("Not expecting completion since subscription finishes after subscriber cancel")
-                default:
-                    XCTFail("Not expecting failure")
-                }
-            }, receiveValue: { value in
-                resultCount += 1
-                let aggValue = value.result.first!.values.first!
-                switch resultCount {
-                case 1:
-                    assert(aggValue == 150, "Result value (count) should equal number of movies.")
-                    firstExp.fulfill()
-                case 2:
-                    assert(aggValue == 150, "Result value (count) should equal number of movies.")
-                    secondExp.fulfill()
-                default:
-                    XCTFail("Not expecting any values past the first two.")
-                }
-            })
-        wait(for: [firstExp], timeout: 10)
-        let crudRepository = CRUDRepository(context: self.backgroundContext)
-        let _: AnyPublisher<CRUDRepository.Success<Movie>, CRUDRepository.Failure<Movie>> = crudRepository.delete(self.objectIDs.last!)
-        wait(for: [secondExp], timeout: 5)
-        cancellable.cancel()
-    }
 }