e3538df2f0
Wire PostHog identify + dual-group context across the stack so events
land on the right person and account/workspace groups, with counts kept
fresh by Inertia navigations rather than per-domain triggers.
- New `app/Jobs/SyncUserToPostHog.php` (queue `posthog`): centralised
high-level sync — identifies the user and group-identifies their
account + current workspace using `$account->usage()` so the metrics
reuse the same source of truth Inertia ships in shared props.
- `app/Actions/User/CreateUser.php`: dispatches `SyncUserToPostHog` on
signup instead of calling `PostHogService` inline. Keeps the action
fast and routes everything through the queue.
- `app/Listeners/StripeEventListener.php`: webhook now captures
`subscription.created`/`updated`/`cancelled` against the account
owner profile (with `account` group auto-attached) and re-dispatches
`SyncUserToPostHog` so plan/has_active_subscription/is_on_trial
refresh after Stripe state changes.
- `app/Services/PostHogService.php`: `capture()` accepts an optional
`Account` that auto-attaches `$groups.account`, `account_id`, and
`plan` properties. Each public method short-circuits when
`POSTHOG_API_KEY` is unset so self-hosted installs are unaffected.
- `app/Models/Traits/HasUsage.php`: adds `postCount` to the usage
shape (combined `withCount(['socialAccounts','posts'])` query) so
posts count is part of the same payload Inertia already ships.
- `config/horizon.php`: adds `posthog` to `supervisor-1` queues so the
queued PostHog jobs actually drain in production.
- `resources/js/app.ts`: extracts `syncPostHogContext(page)` and calls
it on boot AND on every Inertia navigation, reading the fresh
`usage` props. This:
- Refreshes account group counts (workspaces, social accounts,
posts, members, credits) without per-domain triggers.
- Resolves the workspace-switch case where `setup()` does not
re-run but `navigate` fires with the new `auth.currentWorkspace`.
- Captures the initial `$pageview` so the first page of a session
is no longer dropped.
- `resources/js/components/UserMenuContent.vue`: `posthog.reset()` on
logout so a follow-up login on the same browser doesn't keep events
attributed to the previous user.
- `resources/js/composables/useFeatureAccess.ts`: TS `Usage`
interface gains `postCount`.
- `tests/Feature/Models/HasUsageTraitTest.php`: updated for the new
usage shape. Full suite: 1407 passed.
Hierarchy aligned with the domain model: person = User,
group `account` = billing/plan parent, group `workspace` =
collaboration child (carries `account_id` for drill-down).
70 lines
2.1 KiB
PHP
70 lines
2.1 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\Account;
|
|
use App\Models\Invite;
|
|
use App\Models\Plan;
|
|
use App\Models\SocialAccount;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
|
|
beforeEach(function () {
|
|
$this->account = Account::factory()->create();
|
|
$this->owner = User::factory()->create(['account_id' => $this->account->id]);
|
|
$this->account->update(['owner_id' => $this->owner->id]);
|
|
});
|
|
|
|
test('usage returns correct counts across the account', function () {
|
|
Workspace::factory()->count(2)->create([
|
|
'account_id' => $this->account->id,
|
|
'user_id' => $this->owner->id,
|
|
]);
|
|
$workspace = $this->account->workspaces()->first();
|
|
SocialAccount::factory()->count(3)->create(['workspace_id' => $workspace->id]);
|
|
|
|
User::factory()->count(2)->create(['account_id' => $this->account->id]);
|
|
Invite::factory()->count(2)->create([
|
|
'account_id' => $this->account->id,
|
|
'invited_by' => $this->owner->id,
|
|
]);
|
|
|
|
$usage = $this->account->usage();
|
|
|
|
expect($usage)->toBe([
|
|
'workspaceCount' => 2,
|
|
'socialAccountCount' => 3,
|
|
'memberCount' => 3,
|
|
'pendingInviteCount' => 2,
|
|
'postCount' => 0,
|
|
'creditsUsed' => 0,
|
|
]);
|
|
});
|
|
|
|
test('featureLimits returns plan-resolved limits', function () {
|
|
$plan = Plan::where('slug', 'plus')->first();
|
|
$this->account->update(['plan_id' => $plan->id]);
|
|
|
|
$limits = $this->account->featureLimits();
|
|
|
|
expect($limits)->toBe([
|
|
'workspaceLimit' => $plan->workspace_limit,
|
|
'socialAccountLimit' => $plan->social_account_limit,
|
|
'memberLimit' => $plan->member_limit,
|
|
'monthlyCreditsLimit' => $plan->monthly_credits_limit,
|
|
]);
|
|
});
|
|
|
|
test('pendingInviteCount excludes accepted invites', function () {
|
|
Invite::factory()->create([
|
|
'account_id' => $this->account->id,
|
|
'invited_by' => $this->owner->id,
|
|
]);
|
|
Invite::factory()->create([
|
|
'account_id' => $this->account->id,
|
|
'invited_by' => $this->owner->id,
|
|
'accepted_at' => now(),
|
|
]);
|
|
|
|
expect($this->account->usage()['pendingInviteCount'])->toBe(1);
|
|
});
|