Skip to content

Extend the eligibility for the "Forever" product #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keeshux merged 3 commits into from
May 30, 2025
Merged

Extend the eligibility for the "Forever" product #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
791f4ec
Extend .complete product eligibility
keeshux May 17, 2025
debce46
Merge branch 'master' into bugfix/extend-complete
keeshux May 19, 2025
0ac3fd1
Update tests
keeshux May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Packages/App/Sources/CommonIAP/Domain/AppProduct+Features.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@ extension AppProduct {
}
}

public var isEssentials: Bool {
switch self {
case .Essentials.iOS,
.Essentials.macOS,
.Essentials.iOS_macOS:
return true
default:
return false
}
}

public var isRecurring: Bool {
switch self {
case .Complete.Recurring.monthly, .Complete.Recurring.yearly:
Expand Down
12 changes: 9 additions & 3 deletions Packages/App/Sources/CommonLibrary/IAP/IAPManager+Suggestions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ extension IAPManager {
}
}

// TODO: ###, this condition may be improved by excluding very old products
let isEligibleForComplete = purchasedProducts.isEmpty
if filter != .excludingComplete && isEligibleForComplete {
if filter != .excludingComplete && purchasedProducts.isEligibleForComplete {
suggested.insert(.Complete.Recurring.yearly)
suggested.insert(.Complete.Recurring.monthly)
suggested.insert(.Complete.OneTime.lifetime)
Expand All @@ -113,3 +111,11 @@ extension IAPManager {
return suggested
}
}

private extension Collection where Element == AppProduct {
var isEligibleForComplete: Bool {
!contains {
$0.isComplete || $0.isEssentials || $0 == .Features.appleTV
}
}
}
20 changes: 19 additions & 1 deletion Packages/App/Tests/CommonLibraryTests/Business/IAPManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,26 @@ extension IAPManagerTests {
])
}

func test_givenNonFree_whenWithComplete_thenSuggestsEssentials() async {
func test_givenOldProducts_whenWithComplete_thenSuggestsEssentialsAndComplete() async {
let sut = await IAPManager(products: [.Features.trustedNetworks])
XCTAssertEqual(sut.suggestedProducts(for: .iOS, filter: .includingComplete), [
.Essentials.iOS_macOS,
.Essentials.iOS,
.Complete.OneTime.lifetime,
.Complete.Recurring.monthly,
.Complete.Recurring.yearly
])
XCTAssertEqual(sut.suggestedProducts(for: .macOS, filter: .includingComplete), [
.Essentials.iOS_macOS,
.Essentials.macOS,
.Complete.OneTime.lifetime,
.Complete.Recurring.monthly,
.Complete.Recurring.yearly
])
}

func test_givenNewProducts_whenWithComplete_thenSuggestsEssentials() async {
let sut = await IAPManager(products: [.Features.appleTV])
XCTAssertEqual(sut.suggestedProducts(for: .iOS, filter: .includingComplete), [
.Essentials.iOS_macOS,
.Essentials.iOS
Expand Down