From 04e66230b5bc29843f031959a028ff5eff521cb8 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sat, 28 Dec 2024 12:44:23 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Console/Commands/SendReminder.php | 5 +---- app/Helpers/Fonnte.php | 21 ++++++++++----------- app/Helpers/Helper.php | 7 +++---- app/Nova/DaftarKegiatan.php | 13 ++++++------- app/Nova/DaftarReminder.php | 1 - app/Providers/CalendarDataProvider.php | 7 ++----- public/webhook.php | 2 +- routes/web.php | 1 - 8 files changed, 23 insertions(+), 34 deletions(-) diff --git a/app/Console/Commands/SendReminder.php b/app/Console/Commands/SendReminder.php index be7ab7f2..c807bb57 100644 --- a/app/Console/Commands/SendReminder.php +++ b/app/Console/Commands/SendReminder.php @@ -5,7 +5,6 @@ use App\Helpers\Fonnte; use App\Helpers\Helper; use App\Models\DaftarReminder; -use App\Models\DaftarSp2d; use App\Models\UnitKerja; use App\Models\User; use Illuminate\Console\Command; @@ -43,11 +42,9 @@ public function handle() '{pj}' => $kegiatan->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($kegiatan->daftar_kegiatanable_id)->unit : User::find($kegiatan->daftar_kegiatanable_id)->name, ]); $response = Fonnte::make()->sendWhatsAppMessage($kegiatan->wa_group_id, $pesan); - $reminder->status = $response['data']['process'] ?? 'Gagal'; + $reminder->status = $response['data']['process'] ?? 'Gagal'; $reminder->message_id = $response['data']['id'][0]; $reminder->save(); } - - } } diff --git a/app/Helpers/Fonnte.php b/app/Helpers/Fonnte.php index 30a5f522..18605bbf 100644 --- a/app/Helpers/Fonnte.php +++ b/app/Helpers/Fonnte.php @@ -10,9 +10,9 @@ class Fonnte // Konstanta endpoint API Fonnte const ENDPOINTS = [ - 'send_message' => 'https://api.fonnte.com/send', - 'update_group' =>'https://api.fonnte.com/fetch-group', - 'list_group' =>'https://api.fonnte.com/get-whatsapp-group', + 'send_message' => 'https://api.fonnte.com/send', + 'update_group' => 'https://api.fonnte.com/fetch-group', + 'list_group' => 'https://api.fonnte.com/get-whatsapp-group', ]; @@ -28,35 +28,35 @@ public function __construct() protected function makeRequest($endpoint, $params = []) { - $token = $this->account_token; + $token = $this->account_token; - if (!$token) { + if (! $token) { return ['status' => false, 'error' => 'API token or device token is required.']; } // Gunakan JSON format dan pastikan Content-Type header benar $response = Http::withHeaders([ 'Authorization' => $token, - 'Content-Type' => 'application/json', // Tambahkan header + 'Content-Type' => 'application/json', // Tambahkan header ])->post($endpoint, $params); if ($response->failed()) { return [ 'status' => false, - 'error' => $response->json()['reason'] ?? 'Unknown error occurred', + 'error' => $response->json()['reason'] ?? 'Unknown error occurred', ]; } return [ 'status' => true, - 'data' => $response->json(), + 'data' => $response->json(), ]; } public function sendWhatsAppMessage($phoneNumber, $message) { return $this->makeRequest(self::ENDPOINTS['send_message'], [ - 'target' => $phoneNumber, + 'target' => $phoneNumber, 'message' => $message, ]); } @@ -70,5 +70,4 @@ public function getWhatsappGroupList() { return $this->makeRequest(self::ENDPOINTS['list_group']); } - -} \ No newline at end of file +} diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 775cce32..3d95b839 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -443,7 +443,7 @@ public static function getTanggalSebelum($tanggal_deadline, $jumlah_hari, $ref = $hariLibur = array_map(function ($date) { return Carbon::parse($date)->format('Y-m-d'); }, $hariLibur); - + $count = 0; while ($count < $jumlah_hari) { $tanggal_deadline->subDay(); @@ -452,9 +452,7 @@ public static function getTanggalSebelum($tanggal_deadline, $jumlah_hari, $ref = } $count++; } - - } - else { + } else { $tanggal_deadline->subDay($jumlah_hari); } @@ -1523,6 +1521,7 @@ public static function setOptionsWaGroup() $result[$group['id']] = $group['name']; } } + return $result; } diff --git a/app/Nova/DaftarKegiatan.php b/app/Nova/DaftarKegiatan.php index 41c1e2a6..d6e0c758 100644 --- a/app/Nova/DaftarKegiatan.php +++ b/app/Nova/DaftarKegiatan.php @@ -14,7 +14,6 @@ use Laravel\Nova\Actions\Action; use Laravel\Nova\Actions\DestructiveAction; use Laravel\Nova\Fields\ActionFields; -use Laravel\Nova\Fields\Badge; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\FormData; use Laravel\Nova\Fields\MorphTo; @@ -234,12 +233,12 @@ public function actions(NovaRequest $request) } } })->standalone(); - $actions[] = - Action::using('Stop Reminder', function (ActionFields $fields, Collection $models) { - $model = $models->first(); - $model->query()->where('id', $model->id)->update(['status' => 'sent']); - $model->daftarReminder()->update(['status' => 'sent']); - }) + $actions[] = + Action::using('Stop Reminder', function (ActionFields $fields, Collection $models) { + $model = $models->first(); + $model->query()->where('id', $model->id)->update(['status' => 'sent']); + $model->daftarReminder()->update(['status' => 'sent']); + }) ->showInline() ->showOnDetail() ->canSee(function ($request) { diff --git a/app/Nova/DaftarReminder.php b/app/Nova/DaftarReminder.php index 8f0aafd9..e211a182 100644 --- a/app/Nova/DaftarReminder.php +++ b/app/Nova/DaftarReminder.php @@ -3,7 +3,6 @@ namespace App\Nova; use App\Helpers\Helper; -use Laravel\Nova\Fields\Badge; use Laravel\Nova\Fields\BelongsTo; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Text; diff --git a/app/Providers/CalendarDataProvider.php b/app/Providers/CalendarDataProvider.php index 1e5f2b62..43f0cb55 100644 --- a/app/Providers/CalendarDataProvider.php +++ b/app/Providers/CalendarDataProvider.php @@ -86,14 +86,11 @@ protected function customizeEvent(Event $event): Event } if ($event->model()->jenis == 'Kegiatan' || $event->model()->jenis == 'Deadline') { $pj = $event->model()->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($event->model()->daftar_kegiatanable_id)->unit : User::find($event->model()->daftar_kegiatanable_id)->name; - $event->notes('PJ: '. $pj); + $event->notes('PJ: '.$pj); } - - + $event->notes($event->model()->notes); return $event; } - - } diff --git a/public/webhook.php b/public/webhook.php index 457bb1dc..02f9948d 100644 --- a/public/webhook.php +++ b/public/webhook.php @@ -34,7 +34,7 @@ // Cek koneksi if ($conn->connect_error) { echo json_encode(['error' => 'Failed to connect to MySQL: '.$conn->connect_error]); - exit(); + exit; } // Mendapatkan data JSON dari input diff --git a/routes/web.php b/routes/web.php index 8a7f5b0e..18bb300f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,4 +29,3 @@ ->name('daftar-file') ->middleware(ValidateAccessToken::class) ->prefix(Nova::path()); -