refactor: implement error handling in EmployeeAdvanceService methods to ensure transaction safety and improve code robustness
This commit is contained in:
parent
a3d5ac2eb2
commit
abe84899c9
@ -76,21 +76,25 @@ public function create(array $validated, User $user): void
|
|||||||
{
|
{
|
||||||
$employee = $this->resolveAuthenticatedEmployee($user);
|
$employee = $this->resolveAuthenticatedEmployee($user);
|
||||||
|
|
||||||
$employeeAdvance = DB::transaction(function () use ($validated, $employee) {
|
try {
|
||||||
return EmployeeAdvance::create([
|
$employeeAdvance = DB::transaction(function () use ($validated, $employee) {
|
||||||
'employee_id' => $employee->id,
|
return EmployeeAdvance::create([
|
||||||
'amount' => (int) $validated['amount'],
|
'employee_id' => $employee->id,
|
||||||
'description' => $validated['description'],
|
'amount' => (int) $validated['amount'],
|
||||||
'due_date' => $validated['due_date'],
|
'description' => $validated['description'],
|
||||||
'status' => EmployeeAdvanceStatus::PENDING,
|
'due_date' => $validated['due_date'],
|
||||||
]);
|
'status' => EmployeeAdvanceStatus::PENDING,
|
||||||
});
|
]);
|
||||||
|
});
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
'💰 Pengajuan Kasbon Baru',
|
'💰 Pengajuan Kasbon Baru',
|
||||||
"Karyawan {$user->profil?->full_name} mengajukan kasbon sebesar {$employeeAdvance->amount_formatted} dengan keterangan: {$employeeAdvance->description}.",
|
"Karyawan {$user->profil?->full_name} mengajukan kasbon sebesar {$employeeAdvance->amount_formatted} dengan keterangan: {$employeeAdvance->description}.",
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.finance.employee-advances.index'),
|
route('admin.finance.employee_advances.index'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,19 +103,23 @@ public function create(array $validated, User $user): void
|
|||||||
*/
|
*/
|
||||||
public function update(EmployeeAdvance $employeeAdvance, array $validated, User $user): void
|
public function update(EmployeeAdvance $employeeAdvance, array $validated, User $user): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($employeeAdvance, $validated): void {
|
try {
|
||||||
$employeeAdvance->update([
|
DB::transaction(function () use ($employeeAdvance, $validated): void {
|
||||||
'amount' => (int) $validated['amount'],
|
$employeeAdvance->update([
|
||||||
'description' => $validated['description'],
|
'amount' => (int) $validated['amount'],
|
||||||
'due_date' => $validated['due_date'],
|
'description' => $validated['description'],
|
||||||
]);
|
'due_date' => $validated['due_date'],
|
||||||
});
|
]);
|
||||||
|
});
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
'✏️ Kasbon Diperbarui',
|
'✏️ Kasbon Diperbarui',
|
||||||
"Kasbon sebesar {$employeeAdvance->amount_formatted} telah diperbarui oleh {$user->profile?->full_name}.",
|
"Kasbon sebesar {$employeeAdvance->amount_formatted} telah diperbarui oleh {$user->profile?->full_name}.",
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.finance.employee-advances.index'),
|
route('admin.finance.employee_advances.index'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,34 +134,38 @@ public function delete(EmployeeAdvance $employeeAdvance, User $user): void
|
|||||||
'🗑️ Kasbon Dihapus',
|
'🗑️ Kasbon Dihapus',
|
||||||
"Kasbon sebesar {$amount} dengan keterangan {$description} telah dihapus.",
|
"Kasbon sebesar {$amount} dengan keterangan {$description} telah dihapus.",
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.finance.employee-advances.index'),
|
route('admin.finance.employee_advances.index'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function approve(EmployeeAdvance $employeeAdvance, User $user): void
|
public function approve(EmployeeAdvance $employeeAdvance, User $user): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($employeeAdvance, $user): void {
|
try {
|
||||||
$employeeAdvance->loadMissing('employee.user.profile');
|
DB::transaction(function () use ($employeeAdvance, $user): void {
|
||||||
|
$employeeAdvance->loadMissing('employee.user.profile');
|
||||||
|
|
||||||
$description = sprintf(
|
$description = sprintf(
|
||||||
'Pencairan kasbon: %s',
|
'Pencairan kasbon: %s',
|
||||||
$employeeAdvance->employeeName,
|
$employeeAdvance->employeeName,
|
||||||
);
|
);
|
||||||
|
|
||||||
$cashTransaction = $this->cashService->recordOutgoing(
|
$cashTransaction = $this->cashService->recordOutgoing(
|
||||||
$employeeAdvance,
|
$employeeAdvance,
|
||||||
$employeeAdvance->amount,
|
$employeeAdvance->amount,
|
||||||
$description,
|
$description,
|
||||||
$user,
|
$user,
|
||||||
);
|
);
|
||||||
|
|
||||||
$employeeAdvance->update([
|
$employeeAdvance->update([
|
||||||
'cash_transaction_id' => $cashTransaction->id,
|
'cash_transaction_id' => $cashTransaction->id,
|
||||||
'status' => EmployeeAdvanceStatus::APPROVED,
|
'status' => EmployeeAdvanceStatus::APPROVED,
|
||||||
'verified_at' => now(),
|
'verified_at' => now(),
|
||||||
'verified_by_id' => $user->id,
|
'verified_by_id' => $user->id,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
$employeeAdvance->loadMissing('employee.user');
|
$employeeAdvance->loadMissing('employee.user');
|
||||||
if ($employeeAdvance->employee?->user_id) {
|
if ($employeeAdvance->employee?->user_id) {
|
||||||
@ -161,25 +173,29 @@ public function approve(EmployeeAdvance $employeeAdvance, User $user): void
|
|||||||
'💰 Kasbon Disetujui',
|
'💰 Kasbon Disetujui',
|
||||||
"Pengajuan kasbon Anda sebesar {$employeeAdvance->amount_formatted} telah disetujui.",
|
"Pengajuan kasbon Anda sebesar {$employeeAdvance->amount_formatted} telah disetujui.",
|
||||||
$employeeAdvance->employee->user_id,
|
$employeeAdvance->employee->user_id,
|
||||||
route('admin.finance.employee-advances.index'),
|
route('admin.finance.employee_advances.index'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reject(EmployeeAdvance $employeeAdvance, string $reason, User $user): void
|
public function reject(EmployeeAdvance $employeeAdvance, string $reason, User $user): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($employeeAdvance, $user, $reason): void {
|
try {
|
||||||
$employeeAdvance->update([
|
DB::transaction(function () use ($employeeAdvance, $user, $reason): void {
|
||||||
'status' => EmployeeAdvanceStatus::REJECTED,
|
$employeeAdvance->update([
|
||||||
'verified_at' => now(),
|
'status' => EmployeeAdvanceStatus::REJECTED,
|
||||||
'verified_by_id' => $user->id,
|
'verified_at' => now(),
|
||||||
]);
|
'verified_by_id' => $user->id,
|
||||||
|
]);
|
||||||
|
|
||||||
$employeeAdvance->rejection()->create([
|
$employeeAdvance->rejection()->create([
|
||||||
'reason' => $reason,
|
'reason' => $reason,
|
||||||
'rejected_by_id' => $user->id,
|
'rejected_by_id' => $user->id,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
$employeeAdvance->loadMissing('employee.user');
|
$employeeAdvance->loadMissing('employee.user');
|
||||||
if ($employeeAdvance->employee?->user_id) {
|
if ($employeeAdvance->employee?->user_id) {
|
||||||
@ -187,35 +203,39 @@ public function reject(EmployeeAdvance $employeeAdvance, string $reason, User $u
|
|||||||
'💰 Kasbon Ditolak',
|
'💰 Kasbon Ditolak',
|
||||||
"Pengajuan kasbon Anda sebesar {$employeeAdvance->amount_formatted} ditolak dengan alasan: {$reason}.",
|
"Pengajuan kasbon Anda sebesar {$employeeAdvance->amount_formatted} ditolak dengan alasan: {$reason}.",
|
||||||
$employeeAdvance->employee->user_id,
|
$employeeAdvance->employee->user_id,
|
||||||
route('admin.finance.employee-advances.index'),
|
route('admin.finance.employee_advances.index'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function pay(EmployeeAdvance $employeeAdvance, User $user): void
|
public function pay(EmployeeAdvance $employeeAdvance, User $user): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($employeeAdvance, $user): void {
|
try {
|
||||||
$employeeAdvance->loadMissing('employee.user.profile');
|
DB::transaction(function () use ($employeeAdvance, $user): void {
|
||||||
|
$employeeAdvance->loadMissing('employee.user.profile');
|
||||||
|
|
||||||
$description = sprintf(
|
$description = sprintf(
|
||||||
'Pelunasan kasbon: %s',
|
'Pelunasan kasbon: %s',
|
||||||
$employeeAdvance->employeeName,
|
$employeeAdvance->employeeName,
|
||||||
);
|
);
|
||||||
|
|
||||||
$cashTransaction = $this->cashService->recordIncoming(
|
$cashTransaction = $this->cashService->recordIncoming(
|
||||||
$employeeAdvance,
|
$employeeAdvance,
|
||||||
$employeeAdvance->amount,
|
$employeeAdvance->amount,
|
||||||
$description,
|
$description,
|
||||||
$user,
|
$user,
|
||||||
);
|
);
|
||||||
|
|
||||||
$employeeAdvance->update([
|
$employeeAdvance->update([
|
||||||
'repayment_cash_transaction_id' => $cashTransaction->id,
|
'repayment_cash_transaction_id' => $cashTransaction->id,
|
||||||
'paid_at' => now(),
|
'paid_at' => now(),
|
||||||
'paid_by_id' => $user->id,
|
'paid_by_id' => $user->id,
|
||||||
'status' => EmployeeAdvanceStatus::PAID,
|
'status' => EmployeeAdvanceStatus::PAID,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function applySorting(Builder $query, string $sort, string $direction): void
|
private function applySorting(Builder $query, string $sort, string $direction): void
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user