70ca2fa74a
Client sees only Total. Salary is calculated from salary_base = client_price
× (1 − margin/100). Margin never appears in customer-facing surfaces (PDF,
tracking JSON, portal).
Terminology: "marjă internă" — internal profit margin. NOT VAT/TVA. Never
called NDS/TVA anywhere in the code to avoid confusion with real Moldova
tax reporting (Doc 19/1C integration).
== Configuration ==
Fallback chain (in MarginResolver::resolve):
1. WorkOrder.override_margin_pct — per-Fișă for special contracts/VIP
2. User.internal_margin_pct — per-mechanic (main setting)
3. Company.settings.default_internal_margin_pct — tenant default
4. 0.0 — no margin
Example (mechanic Andrei with 20% margin):
User enters price_per_hour = 250 for 1h diagnosis
→ total = 250 (what client sees, goes into PDF)
→ salary_base = 250 × 0.80 = 200 (what mechanic gets salaried on)
→ applied_margin_pct = 20 (frozen)
If admin later changes Andrei's margin to 40%, the row's salary_base does
NOT change — history is immutable. Only new rows use the new margin.
Solves the retroactive-recompute problem for closed payroll periods.
== salary_base freeze semantics ==
wo_works gains 2 columns:
salary_base decimal(10,2) nullable
applied_margin_pct decimal(5,2) nullable
Frozen at save time by WorkOrderWork::saving hook. Recomputes only if
total OR master_id changes (i.e., someone actively edits the price or
reassigns the mechanic — in those cases we WANT the salary_base to
follow). Legacy rows (before this feature) have null salary_base;
PayrollCalculator falls back to total for them.
== PayrollCalculator uses salary_base ==
Previously: sum(wo_works.total) × works_pct → gave the mechanic a cut
of the price INCLUDING margin.
Now: sum(salary_base ?? total) × works_pct → the cut is from the
labor rate excluding margin.
Impact: for a 250 lei diagnosis at 20% margin with 50% payroll cut, the
mechanic gets 200 × 50% = 100 lei (was 250 × 50% = 125 lei). The shop
keeps the 50 lei margin regardless of the payroll %.
== RBAC gate ==
New permission FINANCE_VIEW_INTERNAL_MARGIN. Assigned to owner + admin +
manager + accountant in seed matrix. Not granted to mechanic,
receptionist, or viewer — those roles never see the "Bază salariu"
disclosure line or the margin % fields.
== UI surfaces ==
UserResource — new "Salariu & marjă" section (visible only with
FINANCE_VIEW_INTERNAL_MARGIN):
- Tarif orar (MDL)
- Marjă internă (%) with helper text explaining the -X% semantics
- Placeholder tells manager the exact formula
WorkOrderResource form — new override_margin_pct field in the "Plată &
total" section, gated by same permission. Helper text: "Doar pentru
cazuri speciale. Lasă gol pentru a folosi marja mecanicului."
WorksRelationManager (WO edit page) — Total column now shows a gray
subtitle line "Bază salariu: 200.00 MDL · marjă 20%" ONLY for users
with FINANCE_VIEW_INTERNAL_MARGIN. Everyone else sees just Total.
== Contract tests: NO leak ==
InternalMarginTest verifies with black-box grepping that:
- WorkOrderPdfService::generate output contains NONE of
{salary_base, internal_margin, applied_margin_pct, marja intern,
Bază salariu}
- /api/track/{token} JSON payload contains NONE of the same terms
- wo_parts table has no salary_base column (margin ONLY on labor)
- Changing mechanic.internal_margin_pct after work is saved does NOT
rewrite the historical salary_base (frozen)
- WO override wins over mechanic margin (contract-priced clients)
- Fallback chain: WO → mechanic → company default → 0
== Suite ==
298 passed (828 assertions). Was 285. +13 InternalMarginTest.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
204 lines
7.8 KiB
PHP
204 lines
7.8 KiB
PHP
<?php
|
|
|
|
namespace Tests\Feature;
|
|
|
|
use App\Auth\Permissions;
|
|
use App\Mail\UserInvitationMail;
|
|
use App\Models\Central\Company;
|
|
use App\Models\Central\Plan;
|
|
use App\Models\Tenant\User;
|
|
use App\Models\Tenant\UserPermissionOverride;
|
|
use App\Services\RbacSeeder;
|
|
use App\Tenancy\TenantManager;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Mail;
|
|
use Laravel\Sanctum\Sanctum;
|
|
use Spatie\Permission\Models\Permission;
|
|
use Spatie\Permission\PermissionRegistrar;
|
|
use Tests\TestCase;
|
|
|
|
class RbacApiTest extends TestCase
|
|
{
|
|
use RefreshDatabase;
|
|
|
|
private Company $company;
|
|
private User $admin;
|
|
private User $mechanic;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
parent::setUp();
|
|
$plan = Plan::firstOrCreate(['slug' => 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
|
|
$this->company = Company::create([
|
|
'plan_id' => $plan->id, 'slug' => 'api-' . uniqid(),
|
|
'name' => 'API Co', 'status' => 'active',
|
|
]);
|
|
app(TenantManager::class)->setCurrent($this->company);
|
|
app(RbacSeeder::class)->seedTenantRoles($this->company->id);
|
|
app(PermissionRegistrar::class)->setPermissionsTeamId($this->company->id);
|
|
|
|
$this->admin = User::create(['name' => 'A', 'email' => 'a@e.com', 'password' => bcrypt('x'), 'role' => 'admin', 'status' => 'active']);
|
|
$this->admin->syncRoles(['admin']);
|
|
|
|
$this->mechanic = User::create(['name' => 'M', 'email' => 'm@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
|
|
$this->mechanic->syncRoles(['mechanic']);
|
|
}
|
|
|
|
public function test_admin_can_list_users_via_api(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->getJson('/api/v1/users');
|
|
$resp->assertOk();
|
|
$this->assertGreaterThanOrEqual(2, count($resp->json('data')));
|
|
}
|
|
|
|
public function test_mechanic_cannot_list_users_403(): void
|
|
{
|
|
Sanctum::actingAs($this->mechanic);
|
|
|
|
$resp = $this->getJson('/api/v1/users');
|
|
$resp->assertForbidden();
|
|
}
|
|
|
|
public function test_admin_can_create_user_and_invitation_is_sent(): void
|
|
{
|
|
Mail::fake();
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->postJson('/api/v1/users', [
|
|
'name' => 'New U', 'email' => 'newu@e.com',
|
|
'role' => 'receptionist', 'send_invitation' => true,
|
|
]);
|
|
|
|
$resp->assertCreated();
|
|
$this->assertEquals('inactive', $resp->json('data.status')); // inactive until invitation accepted
|
|
$this->assertTrue($resp->json('invitation_sent'));
|
|
Mail::assertQueued(UserInvitationMail::class);
|
|
}
|
|
|
|
public function test_admin_can_assign_and_remove_roles_via_api(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->postJson("/api/v1/users/{$this->mechanic->id}/roles", ['role' => 'receptionist']);
|
|
$resp->assertOk();
|
|
$this->mechanic->refresh();
|
|
$this->assertTrue($this->mechanic->hasRole('receptionist'));
|
|
|
|
$resp = $this->deleteJson("/api/v1/users/{$this->mechanic->id}/roles/receptionist");
|
|
$resp->assertOk();
|
|
$this->mechanic->refresh();
|
|
$this->assertFalse($this->mechanic->hasRole('receptionist'));
|
|
}
|
|
|
|
public function test_effective_permissions_endpoint_subtracts_denies(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
// Admin has FINANCE_VIEW_OVERVIEW. Add a deny override.
|
|
$perm = Permission::where('name', Permissions::FINANCE_VIEW_OVERVIEW)->first();
|
|
UserPermissionOverride::create([
|
|
'user_id' => $this->admin->id, 'permission_id' => $perm->id,
|
|
'mode' => 'deny', 'reason' => 'test', 'granted_at' => now(),
|
|
]);
|
|
|
|
$resp = $this->getJson("/api/v1/users/{$this->admin->id}/permissions");
|
|
$resp->assertOk();
|
|
$effective = collect($resp->json('data'));
|
|
$this->assertFalse($effective->contains(Permissions::FINANCE_VIEW_OVERVIEW));
|
|
$denies = collect($resp->json('overrides.denies'));
|
|
$this->assertTrue($denies->contains(Permissions::FINANCE_VIEW_OVERVIEW));
|
|
}
|
|
|
|
public function test_add_override_via_api_persists(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->postJson("/api/v1/users/{$this->mechanic->id}/permission-overrides", [
|
|
'permission' => Permissions::WORK_ORDERS_VIEW_ALL,
|
|
'mode' => 'grant',
|
|
'reason' => 'pinch hitter',
|
|
'expires_at' => now()->addDays(3)->toIso8601String(),
|
|
]);
|
|
$resp->assertOk();
|
|
|
|
$this->mechanic->refresh();
|
|
$this->assertEquals(1, $this->mechanic->permissionOverrides()->count());
|
|
$this->assertTrue($this->mechanic->canDo(Permissions::WORK_ORDERS_VIEW_ALL));
|
|
}
|
|
|
|
public function test_remove_override_via_api(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
$perm = Permission::where('name', Permissions::WORK_ORDERS_VIEW_ALL)->first();
|
|
UserPermissionOverride::create(['user_id' => $this->mechanic->id, 'permission_id' => $perm->id, 'mode' => 'grant', 'granted_at' => now()]);
|
|
|
|
$resp = $this->deleteJson("/api/v1/users/{$this->mechanic->id}/permission-overrides/" . Permissions::WORK_ORDERS_VIEW_ALL);
|
|
$resp->assertOk();
|
|
$this->assertEquals(0, $this->mechanic->fresh()->permissionOverrides()->count());
|
|
}
|
|
|
|
public function test_role_index_returns_all_roles_with_counts(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->getJson('/api/v1/roles');
|
|
$resp->assertOk();
|
|
$roles = collect($resp->json('data'));
|
|
$this->assertGreaterThanOrEqual(7, $roles->count());
|
|
$owner = $roles->firstWhere('name', 'owner');
|
|
$this->assertNotNull($owner);
|
|
$this->assertEquals(52, $owner['permissions_count']);
|
|
}
|
|
|
|
public function test_role_sync_permissions_updates_role(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
$role = \Spatie\Permission\Models\Role::create(['name' => 'custom_role', 'guard_name' => 'web']);
|
|
|
|
$resp = $this->putJson("/api/v1/roles/{$role->id}/permissions", [
|
|
'permissions' => [Permissions::CLIENTS_VIEW_ALL, Permissions::VEHICLES_VIEW_ALL],
|
|
]);
|
|
$resp->assertOk();
|
|
|
|
$this->assertEquals(2, $role->fresh()->permissions()->count());
|
|
}
|
|
|
|
public function test_role_destroy_rejects_system_role(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
$owner = \Spatie\Permission\Models\Role::where('name', 'owner')->where('company_id', $this->company->id)->first();
|
|
|
|
$resp = $this->deleteJson("/api/v1/roles/{$owner->id}");
|
|
$resp->assertStatus(422);
|
|
$this->assertEquals('Cannot delete system role', $resp->json('error'));
|
|
}
|
|
|
|
public function test_permission_catalog_endpoint_returns_full_list_and_groups(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
|
|
$resp = $this->getJson('/api/v1/permissions');
|
|
$resp->assertOk();
|
|
$this->assertEquals(52, count($resp->json('data')));
|
|
$this->assertArrayHasKey('grouped', $resp->json());
|
|
$this->assertArrayHasKey('clients', $resp->json('grouped'));
|
|
$this->assertArrayHasKey('roles', $resp->json());
|
|
}
|
|
|
|
public function test_revoke_all_sessions_endpoint(): void
|
|
{
|
|
Sanctum::actingAs($this->admin);
|
|
\DB::table('sessions')->insert([
|
|
['id' => 's1', 'user_id' => $this->mechanic->id, 'ip_address' => '1.1.1.1', 'user_agent' => 'X', 'payload' => '', 'last_activity' => time()],
|
|
['id' => 's2', 'user_id' => $this->mechanic->id, 'ip_address' => '2.2.2.2', 'user_agent' => 'Y', 'payload' => '', 'last_activity' => time()],
|
|
]);
|
|
|
|
$resp = $this->deleteJson("/api/v1/users/{$this->mechanic->id}/sessions");
|
|
$resp->assertOk();
|
|
$this->assertEquals(2, $resp->json('revoked_count'));
|
|
$this->assertEquals(0, \DB::table('sessions')->where('user_id', $this->mechanic->id)->count());
|
|
}
|
|
}
|