From d4e5849f7da98c6a6d4c43a0cbd8b6da092934c9 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Thu, 2 Oct 2025 14:09:45 +0700 Subject: [PATCH] update --- .../Opendata/DatasetController.php | 8 ++-- .../Eloquent/DatasetRepository.php | 47 +++++++------------ 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index d0140ca..ea4894a 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -158,10 +158,10 @@ class DatasetController extends Controller try { $insert = $this->repository->createDatasetTable($modelClass,$importClass,$request->file('file'),$request->all()); - return redirect()->back()->with([ - 'message' => 'Berhasil update data', - 'type' => 'success', - ]); + // return redirect()->back()->with([ + // 'message' => 'Berhasil update data', + // 'type' => 'success', + // ]); } catch (\Exception $e) { return redirect()->back()->with([ 'message' => $e->getMessage(), diff --git a/app/Repositories/Eloquent/DatasetRepository.php b/app/Repositories/Eloquent/DatasetRepository.php index 49b1b43..88573b9 100644 --- a/app/Repositories/Eloquent/DatasetRepository.php +++ b/app/Repositories/Eloquent/DatasetRepository.php @@ -129,42 +129,29 @@ class DatasetRepository implements DatasetRepositoryInterface } }else{ - $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, - // ]); + $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){ Excel::import(new $importClass($masterModel->DatasetId,auth()->user()->id),$path.'/'.$newFilename); } - return $masterModel; + dd($masterModel); }); }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { $failures = $e->failures();