From 8f86378bfe6db5b467bb4e739427baad2704d27f Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Thu, 2 Oct 2025 13:32:05 +0700 Subject: [PATCH] update --- app/Imports/DatasetTable32Import.php | 89 +++++++++---------- .../Eloquent/DatasetRepository.php | 45 ++++++---- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/app/Imports/DatasetTable32Import.php b/app/Imports/DatasetTable32Import.php index 95f6070..a833965 100644 --- a/app/Imports/DatasetTable32Import.php +++ b/app/Imports/DatasetTable32Import.php @@ -31,53 +31,48 @@ public function model(array $row) { // cek kalau row kosong jangan insert - try { - if ( - $row[0] === null && - $row[1] === null && - $row[2] === null && - $row[3] === null && - $row[4] === null && - $row[5] === null && - $row[6] === null && - $row[7] === null && - $row[8] === null && - $row[9] === null && - $row[10] === null && - $row[11] === null && - $row[12] === null && - $row[13] === null && - $row[14] === null && - $row[15] === null && - $row[16] === null && - $row[17] === null - ) { - return null; // baris kosong dilewati - } - return new DatasetTable32([ - 'dataset_id' => $this->datasetId, - 'created_by' => $this->userId, - 'lokasi' => $row[1], - 'tidak_sekolah_l' => $row[2], - 'tidak_sekolah_p' => $row[3], - 'sd_l' => $row[4], - 'sd_p' => $row[5], - 'sltp_l' => $row[6], - 'sltp_p' => $row[7], - 'slta_smk_l' => $row[8], - 'slta_smk_p' => $row[9], - 'pt_l' => $row[10], - 'pt_p' => $row[11], - 's1_l' => $row[12], - 's1_p' => $row[13], - 's2_l' => $row[14], - 's2_p' => $row[15], - 's3_l' => $row[16], - 's3_p' => $row[17], - ]); - } catch (\Throwable $th) { - dd($th->getMessage()); + if ( + $row[0] === null && + $row[1] === null && + $row[2] === null && + $row[3] === null && + $row[4] === null && + $row[5] === null && + $row[6] === null && + $row[7] === null && + $row[8] === null && + $row[9] === null && + $row[10] === null && + $row[11] === null && + $row[12] === null && + $row[13] === null && + $row[14] === null && + $row[15] === null && + $row[16] === null && + $row[17] === null + ) { + return null; // baris kosong dilewati } - + return new DatasetTable32([ + 'dataset_id' => $this->datasetId, + 'created_by' => $this->userId, + 'lokasi' => $row[1], + 'tidak_sekolah_l' => $row[2], + 'tidak_sekolah_p' => $row[3], + 'sd_l' => $row[4], + 'sd_p' => $row[5], + 'sltp_l' => $row[6], + 'sltp_p' => $row[7], + 'slta_smk_l' => $row[8], + 'slta_smk_p' => $row[9], + 'pt_l' => $row[10], + 'pt_p' => $row[11], + 's1_l' => $row[12], + 's1_p' => $row[13], + 's2_l' => $row[14], + 's2_p' => $row[15], + 's3_l' => $row[16], + 's3_p' => $row[17], + ]); } } diff --git a/app/Repositories/Eloquent/DatasetRepository.php b/app/Repositories/Eloquent/DatasetRepository.php index 68bb9e8..29e62c0 100644 --- a/app/Repositories/Eloquent/DatasetRepository.php +++ b/app/Repositories/Eloquent/DatasetRepository.php @@ -131,22 +131,35 @@ class DatasetRepository implements DatasetRepositoryInterface } }else{ - $masterModel = Dataset::updateOrCreate([ - 'instansi_id' => decode_id($data['instansi_id']), - 'template_id' => decode_id($data['template_id']), - 'tahun' => $data['tahun'], - ],[ - 'instansi_id' => decode_id($data['instansi_id']), - 'template_id' => decode_id($data['template_id']), - 'tahun' => $data['tahun'], - 'name' => $data['name'], - 'publik' => $data['publik'], - // 'tags' => json_encode($data['tags']), - 'data' => json_encode($json), - 'file' => $filePath, - 'deskripsi' => $data['deskripsi'], - 'created_by' => auth()->user()->id, - ]); + $masterModel = new Dataset; + $masterModel->instansi_id = decode_id($data['instansi_id']); + $masterModel->template_id = decode_id($data['template_id']); + $masterModel->tahun = $data['tahun']; + $masterModel->name = $data['name']; + $masterModel->publik = $data['publik']; + // $masterModel->tags = json_encode($data['tags']); + $masterModel->data = json_encode($json); + $masterModel->file = $filePath; + $masterModel->deskripsi = $data['deskripsi']; + $masterModel->created_by = auth()->user()->id; + $masterModel->save(); + + // $masterModel = Dataset::updateOrCreate([ + // 'instansi_id' => decode_id($data['instansi_id']), + // 'template_id' => decode_id($data['template_id']), + // 'tahun' => $data['tahun'], + // ],[ + // 'instansi_id' => decode_id($data['instansi_id']), + // 'template_id' => decode_id($data['template_id']), + // 'tahun' => $data['tahun'], + // 'name' => $data['name'], + // 'publik' => $data['publik'], + // // 'tags' => json_encode($data['tags']), + // 'data' => json_encode($json), + // 'file' => $filePath, + // 'deskripsi' => $data['deskripsi'], + // 'created_by' => auth()->user()->id, + // ]); } if(@$file){