diff --git a/supacode/Features/Repositories/Reducer/RepositoriesFeature+GithubIntegration.swift b/supacode/Features/Repositories/Reducer/RepositoriesFeature+GithubIntegration.swift index 3e306257..67b40d61 100644 --- a/supacode/Features/Repositories/Reducer/RepositoriesFeature+GithubIntegration.swift +++ b/supacode/Features/Repositories/Reducer/RepositoriesFeature+GithubIntegration.swift @@ -744,7 +744,7 @@ extension RepositoriesFeature { forKey: repositoryID ) ?? [:] let confirmedNoPrBranches = - state.prRefreshConfirmedNoPrBranchesByRepositoryID.removeValue( + state.prRefreshNoPrBranchesByID.removeValue( forKey: repositoryID ) ?? [] state.prRefreshResultPrioritiesByRepositoryID.removeValue(forKey: repositoryID) @@ -773,7 +773,7 @@ extension RepositoriesFeature { state.prRefreshResultsByRepositoryID.removeValue( forKey: repositoryID ) ?? [:] - let _ = state.prRefreshConfirmedNoPrBranchesByRepositoryID.removeValue(forKey: repositoryID) + _ = state.prRefreshNoPrBranchesByID.removeValue(forKey: repositoryID) state.prRefreshResultPrioritiesByRepositoryID.removeValue(forKey: repositoryID) guard !mergedPRsByBranch.isEmpty, let repository = state.repositories[id: repositoryID] @@ -820,12 +820,12 @@ extension RepositoriesFeature { // Accumulate confirmed-no-PR branches. Only clear when all repos for a // branch succeeded and none returned a PR — partial failures leave the // branch out of confirmedNoPrBranches so existing state is preserved. - var existingConfirmed = state.prRefreshConfirmedNoPrBranchesByRepositoryID[repositoryID] ?? [] + var existingConfirmed = state.prRefreshNoPrBranchesByID[repositoryID] ?? [] existingConfirmed.formUnion(confirmedNoPrBranches) // Remove any confirmed-no-PR entries that now have a PR (priority-based // merge may have resolved a later host's PR over an earlier "no PR"). existingConfirmed.subtract(merged.keys) - state.prRefreshConfirmedNoPrBranchesByRepositoryID[repositoryID] = existingConfirmed + state.prRefreshNoPrBranchesByID[repositoryID] = existingConfirmed state.prRefreshResultsByRepositoryID[repositoryID] = merged state.prRefreshResultPrioritiesByRepositoryID[repositoryID] = resultPriorities } @@ -846,7 +846,7 @@ extension RepositoriesFeature { ) { state.prRefreshBatchCountsByRepositoryID.removeValue(forKey: repositoryID) state.prRefreshResultsByRepositoryID.removeValue(forKey: repositoryID) - state.prRefreshConfirmedNoPrBranchesByRepositoryID.removeValue(forKey: repositoryID) + state.prRefreshNoPrBranchesByID.removeValue(forKey: repositoryID) state.prRefreshRemotePrioritiesByRepositoryID.removeValue(forKey: repositoryID) state.prRefreshResultPrioritiesByRepositoryID.removeValue(forKey: repositoryID) } @@ -854,7 +854,7 @@ extension RepositoriesFeature { private func clearAllPullRequestRefreshTracking(state: inout State) { state.prRefreshBatchCountsByRepositoryID.removeAll() state.prRefreshResultsByRepositoryID.removeAll() - state.prRefreshConfirmedNoPrBranchesByRepositoryID.removeAll() + state.prRefreshNoPrBranchesByID.removeAll() state.prRefreshRemotePrioritiesByRepositoryID.removeAll() state.prRefreshResultPrioritiesByRepositoryID.removeAll() } diff --git a/supacode/Features/Repositories/Reducer/RepositoriesFeature.swift b/supacode/Features/Repositories/Reducer/RepositoriesFeature.swift index 78beaec3..8680e915 100644 --- a/supacode/Features/Repositories/Reducer/RepositoriesFeature.swift +++ b/supacode/Features/Repositories/Reducer/RepositoriesFeature.swift @@ -339,7 +339,7 @@ struct RepositoriesFeature { var prRefreshResultsByRepositoryID: [Repository.ID: [String: GithubPullRequest]] = [:] /// Branches confirmed as having no PR (all repos succeeded, none returned a PR). /// Used to clear stale PR state without flashing when only some repos succeed. - var prRefreshConfirmedNoPrBranchesByRepositoryID: [Repository.ID: Set] = [:] + var prRefreshNoPrBranchesByID: [Repository.ID: Set] = [:] /// Cross-host PR refresh batches complete independently; keep the intended remote /// order so same-branch collisions are resolved by priority, not arrival time. var prRefreshRemotePrioritiesByRepositoryID: [Repository.ID: [String: Int]] = [:] diff --git a/supacodeTests/BatchedPullRequestRefreshReducerTests.swift b/supacodeTests/BatchedPullRequestRefreshReducerTests.swift index 2ac7dde5..8e52d73e 100644 --- a/supacodeTests/BatchedPullRequestRefreshReducerTests.swift +++ b/supacodeTests/BatchedPullRequestRefreshReducerTests.swift @@ -116,7 +116,7 @@ struct BatchedPullRequestRefreshReducerTests { ) { $0.prRefreshBatchCountsByRepositoryID[context.repository.id] = 1 $0.prRefreshResultsByRepositoryID[context.repository.id] = ["feature": githubPullRequest] - $0.prRefreshConfirmedNoPrBranchesByRepositoryID[context.repository.id] = [] + $0.prRefreshNoPrBranchesByID[context.repository.id] = [] $0.prRefreshResultPrioritiesByRepositoryID[context.repository.id] = ["feature": .max] } @@ -134,7 +134,7 @@ struct BatchedPullRequestRefreshReducerTests { ) { $0.prRefreshBatchCountsByRepositoryID = [:] $0.prRefreshResultsByRepositoryID = [:] - $0.prRefreshConfirmedNoPrBranchesByRepositoryID = [:] + $0.prRefreshNoPrBranchesByID = [:] $0.prRefreshResultPrioritiesByRepositoryID = [:] } await store.receive(\.githubIntegration.repositoryPullRequestsLoaded) { @@ -211,7 +211,7 @@ struct BatchedPullRequestRefreshReducerTests { ) { $0.prRefreshBatchCountsByRepositoryID[context.repository.id] = 1 $0.prRefreshResultsByRepositoryID[context.repository.id] = ["feature": enterprisePullRequest] - $0.prRefreshConfirmedNoPrBranchesByRepositoryID[context.repository.id] = [] + $0.prRefreshNoPrBranchesByID[context.repository.id] = [] $0.prRefreshResultPrioritiesByRepositoryID[context.repository.id] = ["feature": 1] } @@ -229,7 +229,7 @@ struct BatchedPullRequestRefreshReducerTests { ) { $0.prRefreshBatchCountsByRepositoryID = [:] $0.prRefreshResultsByRepositoryID = [:] - $0.prRefreshConfirmedNoPrBranchesByRepositoryID = [:] + $0.prRefreshNoPrBranchesByID = [:] $0.prRefreshResultPrioritiesByRepositoryID = [:] } await store.receive(\.githubIntegration.repositoryPullRequestsLoaded) {