refactor: update user type hints in services for improved clarity and consistency

This commit is contained in:
Yoga Pangestu 2026-06-29 20:08:02 +07:00
parent 175ec30a5c
commit 25c501c011
3 changed files with 66 additions and 67 deletions

View File

@ -8,7 +8,6 @@
use App\Models\CuttingResultPrice; use App\Models\CuttingResultPrice;
use App\Models\ProductPrice; use App\Models\ProductPrice;
use App\Models\ProductVariant; use App\Models\ProductVariant;
use App\Models\RawMaterialPrice;
use App\Models\User; use App\Models\User;
use App\Services\System\PushNotificationService; use App\Services\System\PushNotificationService;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;

View File

@ -23,7 +23,7 @@ class AnalysisService
{ {
public function getAttendance(): array public function getAttendance(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -120,7 +120,7 @@ public function getMyAttendance(User $user, ?Carbon $startDate = null, ?Carbon $
public function getCashOverview(): array public function getCashOverview(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -151,7 +151,7 @@ public function getCashOverview(): array
public function getTopSuppliers(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getTopSuppliers(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -174,7 +174,7 @@ public function getTopSuppliers(?Carbon $startDate = null, ?Carbon $endDate = nu
public function getTopCustomers(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getTopCustomers(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -200,7 +200,7 @@ public function getTopCustomers(?Carbon $startDate = null, ?Carbon $endDate = nu
public function getRevenueSummary(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getRevenueSummary(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -234,7 +234,7 @@ public function getRevenueSummary(?Carbon $startDate = null, ?Carbon $endDate =
public function getMonthlyRevenue(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getMonthlyRevenue(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -301,7 +301,7 @@ public function getMonthlyRevenue(?Carbon $startDate = null, ?Carbon $endDate =
public function getExpenseSummary(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getExpenseSummary(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -340,7 +340,7 @@ public function getExpenseSummary(?Carbon $startDate = null, ?Carbon $endDate =
public function getMonthlyExpense(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getMonthlyExpense(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -412,7 +412,7 @@ public function getMonthlyExpense(?Carbon $startDate = null, ?Carbon $endDate =
public function getProfitMetrics(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getProfitMetrics(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -573,7 +573,7 @@ public function getProductStock(): array
public function getBusyHours(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getBusyHours(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -601,7 +601,7 @@ public function getBusyHours(?Carbon $startDate = null, ?Carbon $endDate = null)
public function getTopProducts(?Carbon $startDate = null, ?Carbon $endDate = null): array public function getTopProducts(?Carbon $startDate = null, ?Carbon $endDate = null): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;

View File

@ -60,8 +60,8 @@ public function canCheckInForUser(User $user): bool
public function getAttendance(): array public function getAttendance(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -95,7 +95,7 @@ public function getAttendance(): array
public function getCashOverview(): array public function getCashOverview(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -126,7 +126,7 @@ public function getCashOverview(): array
public function getRevenueSummary(): array public function getRevenueSummary(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;
@ -161,7 +161,7 @@ public function getRevenueSummary(): array
public function getExpenseSummary(): array public function getExpenseSummary(): array
{ {
$today = Carbon::today(); $today = Carbon::today();
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
@ -200,7 +200,7 @@ public function getExpenseSummary(): array
public function getOrderStats(): array public function getOrderStats(): array
{ {
/** @var \App\Models\User|null $user */ /** @var User|null $user */
$user = auth()->user(); $user = auth()->user();
$isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false; $isSuper = $user?->hasAnyRole(['developer', 'owner', 'direktur']) ?? false;
$isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false; $isMarketing = $user?->hasAnyRole(['marketing-offline', 'marketing-online']) ?? false;