diff --git a/app/Http/Controllers/Data/PengurusController.php b/app/Http/Controllers/Data/PengurusController.php index d4e589d5d..0eda9f9cc 100644 --- a/app/Http/Controllers/Data/PengurusController.php +++ b/app/Http/Controllers/Data/PengurusController.php @@ -56,8 +56,6 @@ class PengurusController extends Controller /** * Display a listing of the resource. - * - * @return mixed */ public function index(Request $request) { @@ -106,9 +104,9 @@ public function index(Request $request) ->editColumn('status', function ($row) { if ($row->status == 0) { return 'Tidak Aktif'; - } else { - return 'Aktif'; } + return 'Aktif'; + }) ->rawColumns(['foto', 'identitas', 'status']) ->make(true); @@ -150,7 +148,7 @@ public function store(PengurusRequest $request): RedirectResponse $this->handleFileUpload($request, $input, 'foto', 'pengurus', false); $pengurus = new Pengurus; - $fillableFields = ['nama', 'nik', 'gelar_depan', 'gelar_belakang', 'nip', 'tempat_lahir', 'tanggal_lahir', 'sex', 'pendidikan_id', 'agama_id', 'pangkat', 'no_sk', 'tanggal_sk', 'no_henti', 'tanggal_henti', 'masa_jabatan', 'jabatan_id', 'atasan', 'bagan_tingkat', 'bagan_warna']; + $fillableFields = ['nama', 'nik', 'gelar_depan', 'gelar_belakang', 'nip', 'tempat_lahir', 'tanggal_lahir', 'sex', 'pendidikan_id', 'agama_id', 'pangkat', 'no_sk', 'tanggal_sk', 'no_henti', 'tanggal_henti', 'masa_jabatan', 'jabatan_id', 'atasan', 'bagan_tingkat', 'bagan_warna', 'foto']; foreach ($fillableFields as $field) { if (isset($input[$field])) { @@ -221,7 +219,7 @@ public function update(PengurusRequest $request, int $id): RedirectResponse } public function destroy(Pengurus $penguru): RedirectResponse - { + { try { $penguru->delete(); } catch (\Exception $e) { diff --git a/catatan_rilis.md b/catatan_rilis.md index d9990a485..1f9516ee0 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -9,5 +9,7 @@ Terimakasih [isi disini] yang telah berkontribusi langsung mengembangkan aplikas #### BUG 1. [#1771](https://github.com/OpenSID/OpenDK/issues/1771) Administrator utama bisa mengubah email hanya untuk akunnya sendiri. +2. [#1770](https://github.com/OpenSID/OpenDK/issues/1770) Perbaiki foto pengurus tidak tersimpan saat tambah data baru. + #### TEKNIS diff --git a/tests/Feature/Controllers/Data/PengurusControllerTest.php b/tests/Feature/Controllers/Data/PengurusControllerTest.php index 1bd36cc90..a423beb16 100644 --- a/tests/Feature/Controllers/Data/PengurusControllerTest.php +++ b/tests/Feature/Controllers/Data/PengurusControllerTest.php @@ -39,6 +39,7 @@ use App\Models\Pengurus; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\Storage; use Spatie\Permission\Middleware\PermissionMiddleware; use Spatie\Permission\Middleware\RoleMiddleware; @@ -115,6 +116,8 @@ }); test('store creates pengurus with file upload', function () { + Storage::fake('local'); + $jabatan = Jabatan::factory()->create(); $pendidikan = PendidikanKK::factory()->create(); $agama = Agama::factory()->create(); @@ -142,6 +145,11 @@ 'nama' => 'Jane Doe', 'nik' => '1234567890123457', ]); + + $pengurus = Pengurus::where('nik', '1234567890123457')->first(); + $foto = $pengurus?->getRawOriginal('foto'); + expect($foto)->not->toBeNull() + ->and(Storage::disk('local')->exists('public/pengurus/'.$foto))->toBeTrue(); }); test('store fails with duplicate nik', function () {