Refactor KontrakMitra model to use jenis_kontrak_id instead of jenis_kontrak

laravelwebdev · laravelwebdev · commit 24e68363f3bc · 2024-10-23T11:43:56.000Z
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
@@ -364,6 +364,41 @@ public static function createDateFromString($tanggal)
         return Carbon::createFromFormat('Y-m-d', $tanggal)->endOfDay()->format('Y-m-d H:i:s');
     }
 
+    /**
+     * Mem-parsing filter dari URL yang diberikan.
+     *
+     * @param string $url URL yang akan di-parsing.
+     * @param string $filterUri URI filter yang akan dicari dalam query URL.
+     * @param string $filterKey Kunci filter yang akan diambil nilainya.
+     * 
+     * @return string Nilai filter yang ditemukan berdasarkan kunci filter yang diberikan.
+     */
+    public static function parseFilterFromUrl($url, $filterUri, $filterKey, $defaultValue = null)
+    {
+        $filterValue = $defaultValue ?? '';
+        $queries = [];
+        if ($url) {
+            $parsed_url = parse_url($url, PHP_URL_QUERY);
+        }
+
+        if ($parsed_url) {
+            parse_str($parsed_url, $queries);
+        }
+
+        if (isset($queries[$filterUri])) {
+            $filters = array_merge(
+                ...json_decode(
+                    base64_decode($queries[$filterUri], true),
+                    true
+                )
+            );
+
+            $filterValue= $filters[$filterKey];
+        }
+
+        return $filterValue;
+    }
+
     /**
      * Membuat Nomor.
      *
@@ -870,7 +905,6 @@ public static function setOptionsJenisNaskah($tanggal)
      * Membuat option value select field Kode Arsip berdasarkan tanggal yang diberikan.
      *
      * @param  string  $tanggal
-     * @param  array  $filterId
      * @return array
      */
     public static function setOptionsKodeArsip($tanggal, array $filterId = [])
diff --git a/app/Models/DaftarKontrakMitra.php b/app/Models/DaftarKontrakMitra.php
@@ -38,7 +38,7 @@ protected static function booted(): void
         static::creating(function (DaftarKontrakMitra $daftar) {
             $daftar->status = 'dibuat';
             $kontrak = KontrakMitra::find($daftar->kontrak_mitra_id);
-            $jenis_kontrak = Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kontrak->jenis_kontrak)->first(), 'jenis');
+            $jenis_kontrak = Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kontrak->jenis_kontrak_id)->first(), 'jenis');
             $bulan_kontrak = Helper::$bulan[$kontrak->bulan];
             $default_naskah = NaskahDefault::cache()->get('all')
                 ->where('jenis', 'kontrak')
diff --git a/app/Models/HonorKegiatan.php b/app/Models/HonorKegiatan.php
@@ -66,7 +66,7 @@ protected static function booted(): void
             }
             if ($honor->jenis_honor !== 'Kontrak Mitra Bulanan') {
                 $honor->bulan = null;
-                $honor->jenis_kontrak = null;
+                $honor->jenis_kontrak_id = null;
             }
             if ($honor->isDirty('tahun')) {
                 $DaftarHonorMitraIds = DaftarHonorMitra::where('honor_kegiatan_id', $honor->id)->pluck('id');
@@ -90,12 +90,12 @@ protected static function booted(): void
                 if ($honor->jenis_honor === 'Kontrak Mitra Bulanan') {
                     $kontrak = KontrakMitra::firstOrNew(
                         [
-                            'jenis_kontrak' => $honor->jenis_kontrak,
+                            'jenis_kontrak_id' => $honor->jenis_kontrak_id,
                             'bulan' => $honor->bulan,
                             'tahun' => $honor->tahun,
                         ]
                     );
-                    $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan];
+                    $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak_id), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan];
                     $kontrak->status = 'dibuat';
                     $kontrak->jenis_honor = $honor->jenis_honor;
                     $kontrak->awal_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->startOfMonth();
diff --git a/app/Models/KontrakMitra.php b/app/Models/KontrakMitra.php
@@ -11,7 +11,7 @@ class KontrakMitra extends Model
 {
     use HasFactory;
 
-    protected $fillable = ['status', 'tahun', 'bulan', 'jenis_kontrak', 'jenis_honor', 'honor_kegiatan_id'];
+    protected $fillable = ['status', 'tahun', 'bulan', 'jenis_kontrak_id', 'jenis_honor', 'honor_kegiatan_id'];
 
     protected $casts = [
         'awal_kontrak' => 'date',
diff --git a/app/Nova/Actions/GenerateBastMitra.php b/app/Nova/Actions/GenerateBastMitra.php
@@ -37,7 +37,7 @@ public function handle(ActionFields $fields, Collection $models)
             $daftar_kontrak->bast_mitra_id = $model->id;
             if (is_null($daftar_kontrak->bast_naskah_keluar_id)) {
                 $kontrak = KontrakMitra::find($model->kontrak_mitra_id);
-                $jenis_kontrak = Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kontrak->jenis_kontrak)->first(), 'jenis');
+                $jenis_kontrak_id = Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kontrak->jenis_kontrak_id)->first(), 'jenis');
                 $bulan_kontrak = Helper::$bulan[$kontrak->bulan];
                 $default_naskah = NaskahDefault::cache()->get('all')
                     ->where('jenis', 'bast')
@@ -48,7 +48,7 @@ public function handle(ActionFields $fields, Collection $models)
                 $naskahkeluar->kode_arsip_id = $model->kode_arsip_id;
                 $naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
                 $naskahkeluar->tujuan = Helper::getPropertyFromCollection(Helper::getMitraById($daftar_kontrak->mitra_id), 'nama');
-                $naskahkeluar->perihal = 'BERITA ACARA SERAH TERIMA HASIL PEKERJAAN MITRA STATISTIK PETUGAS '.strtoupper($jenis_kontrak).' BULAN '.strtoupper($bulan_kontrak).' TAHUN '.$kontrak->tahun;
+                $naskahkeluar->perihal = 'BERITA ACARA SERAH TERIMA HASIL PEKERJAAN MITRA STATISTIK PETUGAS '.strtoupper($jenis_kontrak_id).' BULAN '.strtoupper($bulan_kontrak).' TAHUN '.$kontrak->tahun;
                 $naskahkeluar->generate = 'A';
                 $naskahkeluar->save();
                 $daftar_kontrak->bast_naskah_keluar_id = $naskahkeluar->id;
diff --git a/app/Nova/Actions/GenerateKontrakMitra.php b/app/Nova/Actions/GenerateKontrakMitra.php
@@ -34,7 +34,7 @@ public function handle(ActionFields $fields, Collection $models)
         if ($model->jenis_honor === 'Kontrak Mitra Bulanan') {
             $honorKegiatanIds = HonorKegiatan::where('bulan', $model->bulan)
                 ->where('tahun', $model->tahun)
-                ->where('jenis_kontrak', $model->jenis_kontrak)
+                ->where('jenis_kontrak_id', $model->jenis_kontrak_id)
                 ->get()
                 ->pluck('id');
         }
@@ -61,9 +61,9 @@ public function handle(ActionFields $fields, Collection $models)
                 ->get()
                 ->pluck('honor_kegiatan_id');
             $jumlah_kontrak = HonorKegiatan::whereIn('id', $daftarHonorIds)
-                ->distinct(['jenis_kontrak', 'jenis_honor', 'bulan', 'tahun'])
+                ->distinct(['jenis_kontrak_id', 'jenis_honor', 'bulan', 'tahun'])
                 ->count();
-            if ($mitra->nilai_kontrak <= Helper::getPropertyFromCollection(Helper::getJenisKontrakById($model->jenis_kontrak), 'sbml')) {
+            if ($mitra->nilai_kontrak <= Helper::getPropertyFromCollection(Helper::getJenisKontrakById($model->jenis_kontrak_id), 'sbml')) {
                 $daftar_mitra->valid_sbml = true;
             }
 
diff --git a/app/Nova/KontrakMitra.php b/app/Nova/KontrakMitra.php
@@ -50,7 +50,7 @@ public static function indexQuery(NovaRequest $request, $query)
      * @var array
      */
     public static $search = [
-        'nama_kontrak', 'bulan', 'jenis_kontrak', 'jenis_honor',
+        'nama_kontrak', 'bulan', 'jenis_kontrak_id', 'jenis_honor',
     ];
 
     /**
@@ -69,7 +69,7 @@ public function fields(NovaRequest $request)
                 ->readonly()
                 ->exceptOnForms()
                 ->displayUsing(fn ($bulan) => $bulan ? Helper::$bulan[$bulan] : null),
-            Text::make('Jenis Kegiatan', 'jenis_kontrak')
+            Text::make('Jenis Kegiatan', 'jenis_kontrak_id')
                 ->readonly()
                 ->exceptOnForms()
                 ->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kode)->first(), 'jenis')),
diff --git a/app/Nova/Metrics/JumlahKegiatan.php b/app/Nova/Metrics/JumlahKegiatan.php
@@ -4,7 +4,6 @@
 
 use App\Helpers\Helper;
 use Illuminate\Support\Facades\DB;
-use Laravel\Nova\Http\Requests\LensMetricRequest;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Metrics\Value;
 
@@ -27,24 +26,17 @@ public function name()
      */
     public function calculate(NovaRequest $request)
     {
-        $filtered_bulan = date('m');
-        $filtered_jenis = null;
-        $queries = [];
-
-        parse_str(parse_url(request()->headers->get('referer'), PHP_URL_QUERY), $queries);
-
-        if (isset($queries['daftar-honor-mitras_filter'])) {
-            $filters = json_decode(base64_decode($queries['daftar-honor-mitras_filter'], true), true);
-            $filtered_bulan = $filters['App\\Nova\\Filters\\BulanKontrak'][1] ?? $filtered_bulan;
-            $filtered_jenis = $filters['App\\Nova\\Filters\\JenisKontrak'][1] ?? null;
-        }
+        $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
+        $filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
         $bulan_ini = DB::table('daftar_honor_mitras')
             ->select('honor_kegiatans.id')
             ->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
             ->where('jenis_honor', 'Kontrak Mitra Bulanan')
             ->where('tahun', session('year'))
-            ->where('bulan', $filtered_bulan)
-            ->when(isset($filtered_jenis), function ($query) use ($filtered_jenis) {
+            ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
+                return $query->where('bulan', $filtered_bulan);
+            })
+            ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
                 return $query->where('jenis_kontrak_id', $filtered_jenis);
             })
             ->distinct('honor_kegiatans.id')
@@ -54,8 +46,10 @@ public function calculate(NovaRequest $request)
             ->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
             ->where('jenis_honor', 'Kontrak Mitra Bulanan')
             ->where('tahun', session('year'))
-            ->where('bulan', $filtered_bulan - 1)
-            ->when(isset($filtered_jenis), function ($query) use ($filtered_jenis) {
+            ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
+                return $query->where('bulan', $filtered_bulan-1);
+            })
+            ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
                 return $query->where('jenis_kontrak_id', $filtered_jenis);
             })
             ->distinct('honor_kegiatans.id')
diff --git a/app/Nova/Metrics/JumlahMitra.php b/app/Nova/Metrics/JumlahMitra.php
@@ -27,17 +27,7 @@ public function name()
      */
     public function calculate(NovaRequest $request)
     {
-        $filtered_bulan = date('m');
-        $filtered_jenis = null;
-        $queries = [];
-
-        parse_str(parse_url(request()->headers->get('referer'), PHP_URL_QUERY), $queries);
-
-        if (isset($queries['daftar-honor-mitras_filter'])) {
-            $filters = json_decode(base64_decode($queries['daftar-honor-mitras_filter'], true), true);
-            $filtered_bulan = $filters['App\\Nova\\Filters\\BulanKontrak'][1] ?? $filtered_bulan;
-            $filtered_jenis = $filters['App\\Nova\\Filters\\JenisKontrak'][1] ?? null;
-        }
+        $filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak');
         $arr = [];
         foreach (Helper::$bulan as $key => $value) {
             $arr[$value] = DB::table('daftar_honor_mitras')
@@ -51,15 +41,15 @@ public function calculate(NovaRequest $request)
                 ->where('jenis_honor', 'Kontrak Mitra Bulanan')
                 ->where('tahun', session('year'))
                 ->where('bulan', $key)
-                ->when(isset($filtered_jenis), function ($query) use ($filtered_jenis) {
+                ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) {
                     return $query->where('jenis_kontrak_id', $filtered_jenis);
                 })
                 ->distinct('mitra_id')
                 ->count();
         }
 
         return (new TrendResult)->trend($arr)
-            ->result($arr[Helper::$bulan[$filtered_bulan]])
+            ->result($arr[Helper::$bulan[date('m')]])
             ->suffix('Mitra')
             ->withoutSuffixInflection();
     }
diff --git a/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php b/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php
@@ -26,19 +26,8 @@ public function name()
      */
     public function calculate(NovaRequest $request)
     {
-        $filtered_bulan = date('m');
-        $filtered_jenis = null;
-        $queries = [];
-
-        parse_str(parse_url(request()->headers->get('referer'), PHP_URL_QUERY), $queries);
-
-        if (isset($queries['daftar-honor-mitras_filter'])) {
-            $filters = json_decode(base64_decode($queries['daftar-honor-mitras_filter'], true), true);
-            $filtered_bulan = $filters['App\\Nova\\Filters\\BulanKontrak'][1] ?? $filtered_bulan;
-            $filtered_jenis = $filters['App\\Nova\\Filters\\JenisKontrak'][1] ?? null;
-        }
-
-        $arr= DB::table('daftar_honor_mitras')
+        $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m'));
+        $arr = DB::table('daftar_honor_mitras')
             ->selectRaw('jenis, count(distinct(mitra_id)) as jumlah_mitra')
             ->join(
                 'honor_kegiatans',
@@ -55,9 +44,8 @@ public function calculate(NovaRequest $request)
             ->join('mitras', 'mitras.id', '=', 'daftar_honor_mitras.mitra_id')
             ->where('jenis_honor', 'Kontrak Mitra Bulanan')
             ->where('tahun', session('year'))
-            ->where('bulan', $filtered_bulan)
-            ->when(isset($filtered_jenis), function ($query) use ($filtered_jenis) {
-                return $query->where('jenis_kontrak_id', $filtered_jenis);
+            ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) {
+                return $query->where('bulan', $filtered_bulan);
             })
             ->groupBy('jenis_kontrak_id')
             ->pluck('jumlah_mitra', 'jenis')
diff --git a/database/migrations/2024_10_04_140919_create_kontrak_mitras_table.php b/database/migrations/2024_10_04_140919_create_kontrak_mitras_table.php
@@ -20,7 +20,7 @@ public function up(): void
             $table->date('tanggal_spk')->nullable();
             $table->string('bulan', 2)->nullable();
             $table->string('tahun', 4)->nullable();
-            $table->string('jenis_kontrak', 40)->nullable();
+            $table->mediumInteger('jenis_kontrak_id')->nullable()->unsigned();
             $table->string('status', 20)->nullable();
             $table->mediumInteger('ppk_user_id')->nullable()->unsigned();
             $table->mediumInteger('kode_arsip_id')->nullable()->unsigned();

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ protected static function booted(): void`
`66`	`66`	`}`
`67`	`67`	`if ($honor->jenis_honor !== 'Kontrak Mitra Bulanan') {`
`68`	`68`	`$honor->bulan = null;`
`69`		`- $honor->jenis_kontrak = null;`
	`69`	`+ $honor->jenis_kontrak_id = null;`
`70`	`70`	`}`
`71`	`71`	`if ($honor->isDirty('tahun')) {`
`72`	`72`	`$DaftarHonorMitraIds = DaftarHonorMitra::where('honor_kegiatan_id', $honor->id)->pluck('id');`
`@@ -90,12 +90,12 @@ protected static function booted(): void`
`90`	`90`	`if ($honor->jenis_honor === 'Kontrak Mitra Bulanan') {`
`91`	`91`	`$kontrak = KontrakMitra::firstOrNew(`
`92`	`92`	`[`
`93`		`- 'jenis_kontrak' => $honor->jenis_kontrak,`
	`93`	`+ 'jenis_kontrak_id' => $honor->jenis_kontrak_id,`
`94`	`94`	`'bulan' => $honor->bulan,`
`95`	`95`	`'tahun' => $honor->tahun,`
`96`	`96`	`]`
`97`	`97`	`);`
`98`		`- $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan];`
	`98`	`+ $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak_id), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan];`
`99`	`99`	`$kontrak->status = 'dibuat';`
`100`	`100`	`$kontrak->jenis_honor = $honor->jenis_honor;`
`101`	`101`	`$kontrak->awal_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->startOfMonth();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class KontrakMitra extends Model`
`11`	`11`	`{`
`12`	`12`	`use HasFactory;`
`13`	`13`
`14`		`- protected $fillable = ['status', 'tahun', 'bulan', 'jenis_kontrak', 'jenis_honor', 'honor_kegiatan_id'];`
	`14`	`+ protected $fillable = ['status', 'tahun', 'bulan', 'jenis_kontrak_id', 'jenis_honor', 'honor_kegiatan_id'];`
`15`	`15`
`16`	`16`	`protected $casts = [`
`17`	`17`	`'awal_kontrak' => 'date',`