Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added apps/backend.zip
Binary file not shown.
6 changes: 4 additions & 2 deletions apps/backend/app/Enums/AssignedRole.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

enum AssignedRole: string
{
case Rw = 'rw';
case KasiPelayanan = 'kasi_pelayanan';
case KaurTuUmum = 'kaur_tu_umum';

public function label(): string
{
return match ($this) {
self::Rw => 'RW',
self::KasiPelayanan => 'Kasi Pelayanan',
self::KaurTuUmum => 'Kaur TU & Umum',
};
}
}
5 changes: 0 additions & 5 deletions apps/backend/app/Enums/LetterStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ enum LetterStatus: string
case RtRejected = 'rt_rejected';
case RwApproved = 'rw_approved';
case RwRejected = 'rw_rejected';
case WaitingRevisionWarga = 'waiting_revision_warga';
case RejectedRevision = 'rejected_revision';
case KadusApproved = 'kadus_approved';
case KadusRejected = 'kadus_rejected';
case KasiApproved = 'kasi_approved';
Expand All @@ -26,8 +24,6 @@ public function label(): string
self::RtRejected => 'Ditolak RT',
self::RwApproved => 'Disetujui RW',
self::RwRejected => 'Ditolak RW',
self::WaitingRevisionWarga => 'Menunggu Revisi Warga',
self::RejectedRevision => 'Ditolak Revisi',
self::KadusApproved => 'Disetujui Kadus',
self::KadusRejected => 'Ditolak Kadus',
self::KasiApproved => 'Disetujui Kasi Pelayanan',
Expand All @@ -40,7 +36,6 @@ public function isRejected(): bool
return in_array($this, [
self::RtRejected,
self::RwRejected,
self::RejectedRevision,
self::KadusRejected,
self::KasiRejected,
], true);
Expand Down
51 changes: 0 additions & 51 deletions apps/backend/app/Http/Controllers/Api/LetterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,57 +57,6 @@ public function show($id)
]);
}

public function resubmit(Request $request, Letter $letter)
{
$user = auth()->user();

if ($letter->submitted_by !== $user->id) {
abort(403, 'Anda tidak berwenang mengubah surat ini.');
}

if ($letter->status !== LetterStatus::WaitingRevisionWarga) {
abort(422, 'Surat tidak dalam status revisi warga.');
}

if ($letter->revision_count >= 2) {
abort(422, 'Batas revisi telah tercapai (maksimal 2x). Silakan ajukan surat baru.');
}

$data = $request->validate([
'letter_type_id' => ['nullable', 'exists:letter_types,id'],
'purpose' => ['required', 'string', 'max:500'],
'payload' => ['nullable', 'array'],
'notes' => ['nullable', 'string', 'max:255'],
]);

DB::transaction(function () use ($letter, $data) {
$oldStatus = $letter->status->value;

$letter->update([
'letter_type_id' => $data['letter_type_id'] ?? $letter->letter_type_id,
'purpose' => $data['purpose'],
'payload' => $data['payload'] ?? $letter->payload,
'notes' => $data['notes'] ?? $letter->notes,
'status' => LetterStatus::RwApproved->value,
'letter_number' => null,
'expires_at' => null,
'processed_at' => now(),
]);

$letter->statusLogs()->create([
'actor_id' => auth()->id(),
'old_status' => $oldStatus,
'new_status' => LetterStatus::RwApproved->value,
'reason' => $data['notes'] ?? 'Warga mengirim ulang surat hasil revisi.',
]);
});

return response()->json([
'message' => 'Surat berhasil dikirim ulang untuk verifikasi.',
'data' => $letter->fresh(),
]);
}

public function destroy(Letter $letter)
{
$user = auth()->user();
Expand Down
79 changes: 24 additions & 55 deletions apps/backend/app/Services/KasiApprovalService.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ public function __construct(
protected OfficialService $officialService
) {}

public function getPendingLetters(User $user)
public function getPendingLetters(User $user): \Illuminate\Database\Eloquent\Collection
{
return Letter::query()
->whereIn('status', [

LetterStatus::RwApproved,
LetterStatus::WaitingRevisionWarga,
LetterStatus::KasiApproved,
LetterStatus::KasiRejected,

Expand Down Expand Up @@ -97,47 +96,32 @@ public function approve(

$oldStatus = $letter->status->value;

if ($data['status'] === 'needs_revision') {
$newRevisionCount = $letter->revision_count + 1;
$newStatus = $data['status'] === 'approved'
? LetterStatus::KasiApproved->value
: LetterStatus::KasiRejected->value;

// Revisi ke-3+ → auto-reject (maks 2x revisi)
if ($newRevisionCount > 2) {
$newStatus = LetterStatus::RejectedRevision->value;
} else {
$newStatus = LetterStatus::WaitingRevisionWarga->value;
}
$letterNumber = null;
$expiresAt = null;

$letter->revision_count = $newRevisionCount;
$letterNumber = null;
$expiresAt = null;
} else {
$newStatus = $data['status'] === 'approved'
? LetterStatus::KasiApproved->value
: LetterStatus::KasiRejected->value;

$letterNumber = null;
$expiresAt = null;

if ($data['status'] === 'approved') {

$letter->approvals()
->where('approval_level', 'kasi')
->update([
'approved_by' => $user->id,
]);

$letterNumber = sprintf(
'%03d/%s/%d',
$letter->id,
strtoupper($letter->letterType->code),
now()->year
);
if ($data['status'] === 'approved') {

if ($letter->letterType->validity_days) {
$expiresAt = now()->addDays(
$letter->letterType->validity_days
);
}
$letter->approvals()
->where('approval_level', 'kasi')
->update([
'approved_by' => $user->id,
]);

$letterNumber = sprintf(
'%03d/%s/%d',
$letter->id,
strtoupper($letter->letterType->code),
now()->year
);

if ($letter->letterType->validity_days) {
$expiresAt = now()->addDays(
$letter->letterType->validity_days
);
}
}

Expand All @@ -157,21 +141,6 @@ public function approve(

$citizenUser = $letter->citizen->user;

if ($data['status'] === 'needs_revision') {
if ($citizenUser) {
$citizenUser->notify(
new LetterStatusNotification(
$letter,
'Perlu Revisi Data',
'Permohonan surat Anda perlu diperbaiki sebelum verifikasi final.',
'waiting_revision_warga'
)
);
}

return;
}

if ($data['status'] === 'approved') {

if ($citizenUser) {
Expand Down
Loading
Loading