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).
57 lines
1.9 KiB
PHP
57 lines
1.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Models\Traits;
|
|
|
|
use App\Features\MemberLimit;
|
|
use App\Features\MonthlyCreditsLimit;
|
|
use App\Features\SocialAccountLimit;
|
|
use App\Features\WorkspaceLimit;
|
|
use App\Models\AiUsageLog;
|
|
use App\Models\Invite;
|
|
use Laravel\Pennant\Feature;
|
|
|
|
/**
|
|
* Provides account-level usage counts and plan-resolved feature limits.
|
|
*
|
|
* The `featureLimits()` call resolves Pennant features for the account,
|
|
* which writes to the features cache table on first access. Pennant cache
|
|
* is invalidated automatically when `plan_id` changes (see Account::booted).
|
|
*/
|
|
trait HasUsage
|
|
{
|
|
/**
|
|
* @return array{workspaceCount: int, socialAccountCount: int, memberCount: int, pendingInviteCount: int, postCount: int, creditsUsed: int}
|
|
*/
|
|
public function usage(): array
|
|
{
|
|
$workspaces = $this->workspaces()
|
|
->withCount(['socialAccounts', 'posts'])
|
|
->get();
|
|
|
|
return [
|
|
'workspaceCount' => $workspaces->count(),
|
|
'socialAccountCount' => (int) $workspaces->sum('social_accounts_count'),
|
|
'memberCount' => $this->users()->count(),
|
|
'pendingInviteCount' => Invite::where('account_id', $this->id)
|
|
->whereNull('accepted_at')
|
|
->count(),
|
|
'postCount' => (int) $workspaces->sum('posts_count'),
|
|
'creditsUsed' => AiUsageLog::monthlyCredits($this->id),
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @return array{workspaceLimit: int, socialAccountLimit: int, memberLimit: int, monthlyCreditsLimit: int}
|
|
*/
|
|
public function featureLimits(): array
|
|
{
|
|
return [
|
|
'workspaceLimit' => Feature::for($this)->value(WorkspaceLimit::class),
|
|
'socialAccountLimit' => Feature::for($this)->value(SocialAccountLimit::class),
|
|
'memberLimit' => Feature::for($this)->value(MemberLimit::class),
|
|
'monthlyCreditsLimit' => Feature::for($this)->value(MonthlyCreditsLimit::class),
|
|
];
|
|
}
|
|
}
|