Skip to content

Fix bundle purchases summary showing identical totals for every row #288

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
simonhamp merged 1 commit into from
Mar 20, 2026
Merged

Fix bundle purchases summary showing identical totals for every row #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions app/Filament/Resources/PluginBundleResource/RelationManagers/LicensesRelationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,17 @@ public function table(Table $table): Table
->select('plugin_licenses.*')
->addSelect([
'sale_total' => PluginLicense::query()
->selectRaw('SUM(price_paid)')
->whereColumn('user_id', 'plugin_licenses.user_id')
->whereColumn('purchased_at', 'plugin_licenses.purchased_at')
->where('plugin_bundle_id', $bundleId),
->from('plugin_licenses as sale_pl')
->selectRaw('SUM(sale_pl.price_paid)')
->whereColumn('sale_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('sale_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('sale_pl.plugin_bundle_id', $bundleId),
'sale_plugins_count' => PluginLicense::query()
->from('plugin_licenses as count_pl')
->selectRaw('COUNT(*)')
->whereColumn('user_id', 'plugin_licenses.user_id')
->whereColumn('purchased_at', 'plugin_licenses.purchased_at')
->where('plugin_bundle_id', $bundleId),
->whereColumn('count_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('count_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('count_pl.plugin_bundle_id', $bundleId),
])
->whereIn('plugin_licenses.id', function ($sub) use ($bundleId): void {
$sub->selectRaw('MIN(id)')
Expand Down
113 changes: 113 additions & 0 deletions tests/Feature/Filament/BundlePurchasesRelationManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,55 @@ public function test_it_groups_bundle_licenses_into_a_single_sale_row(): void
->assertCountTableRecords(1);
}

public function test_it_computes_correct_totals_per_sale(): void
{
$buyer = User::factory()->create();
$purchasedAt = now();

$plugins = Plugin::factory()->count(3)->approved()->create();
$this->bundle->plugins()->attach($plugins->pluck('id'));

foreach ($plugins as $plugin) {
PluginLicense::factory()->create([
'user_id' => $buyer->id,
'plugin_id' => $plugin->id,
'plugin_bundle_id' => $this->bundle->id,
'price_paid' => 1000,
'purchased_at' => $purchasedAt,
]);
}

$bundleId = $this->bundle->id;

$row = PluginLicense::query()
->select('plugin_licenses.*')
->addSelect([
'sale_total' => PluginLicense::query()
->from('plugin_licenses as sale_pl')
->selectRaw('SUM(sale_pl.price_paid)')
->whereColumn('sale_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('sale_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('sale_pl.plugin_bundle_id', $bundleId),
'sale_plugins_count' => PluginLicense::query()
->from('plugin_licenses as count_pl')
->selectRaw('COUNT(*)')
->whereColumn('count_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('count_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('count_pl.plugin_bundle_id', $bundleId),
])
->where('plugin_bundle_id', $bundleId)
->whereIn('plugin_licenses.id', function ($sub) use ($bundleId): void {
$sub->selectRaw('MIN(id)')
->from('plugin_licenses as pl')
->where('pl.plugin_bundle_id', $bundleId)
->groupBy('pl.user_id', 'pl.purchased_at');
})
->sole();

$this->assertEquals(3, $row->sale_plugins_count);
$this->assertEquals(3000, $row->sale_total);
}

public function test_it_shows_separate_rows_for_different_sales(): void
{
$buyer1 = User::factory()->create();
Expand Down Expand Up @@ -102,6 +151,70 @@ public function test_it_shows_separate_rows_for_different_sales(): void
->assertCountTableRecords(2);
}

public function test_it_computes_correct_totals_for_each_buyer(): void
{
$buyer1 = User::factory()->create();
$buyer2 = User::factory()->create();
$purchasedAt = now();

$plugins = Plugin::factory()->count(2)->approved()->create();
$this->bundle->plugins()->attach($plugins->pluck('id'));

foreach ($plugins as $plugin) {
PluginLicense::factory()->create([
'user_id' => $buyer1->id,
'plugin_id' => $plugin->id,
'plugin_bundle_id' => $this->bundle->id,
'price_paid' => 1500,
'purchased_at' => $purchasedAt,
]);
}

foreach ($plugins as $plugin) {
PluginLicense::factory()->create([
'user_id' => $buyer2->id,
'plugin_id' => $plugin->id,
'plugin_bundle_id' => $this->bundle->id,
'price_paid' => 2000,
'purchased_at' => $purchasedAt,
]);
}

$bundleId = $this->bundle->id;

$rows = PluginLicense::query()
->select('plugin_licenses.*')
->addSelect([
'sale_total' => PluginLicense::query()
->from('plugin_licenses as sale_pl')
->selectRaw('SUM(sale_pl.price_paid)')
->whereColumn('sale_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('sale_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('sale_pl.plugin_bundle_id', $bundleId),
'sale_plugins_count' => PluginLicense::query()
->from('plugin_licenses as count_pl')
->selectRaw('COUNT(*)')
->whereColumn('count_pl.user_id', 'plugin_licenses.user_id')
->whereColumn('count_pl.purchased_at', 'plugin_licenses.purchased_at')
->where('count_pl.plugin_bundle_id', $bundleId),
])
->where('plugin_bundle_id', $bundleId)
->whereIn('plugin_licenses.id', function ($sub) use ($bundleId): void {
$sub->selectRaw('MIN(id)')
->from('plugin_licenses as pl')
->where('pl.plugin_bundle_id', $bundleId)
->groupBy('pl.user_id', 'pl.purchased_at');
})
->get()
->keyBy('user_id');

$this->assertEquals(2, $rows[$buyer1->id]->sale_plugins_count);
$this->assertEquals(3000, $rows[$buyer1->id]->sale_total);

$this->assertEquals(2, $rows[$buyer2->id]->sale_plugins_count);
$this->assertEquals(4000, $rows[$buyer2->id]->sale_total);
}

public function test_it_shows_grandfathered_status(): void
{
$buyer = User::factory()->create();
Expand Down
Loading