arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix new hit endpoint pbg status

Browse Source
This commit is contained in:
arifal hidayat
2025-08-31 01:22:51 +07:00
parent 63310f2748
commit 65d9247b46
7 changed files with 186 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/QuickSearchController.php
View File

@@ -100,7 +100,8 @@ class QuickSearchController extends Controller
$query = PbgTask::select([
'pbg_task.*',
DB::raw('(SELECT name_building FROM pbg_task_details WHERE pbg_task_details.pbg_task_uid = pbg_task.uuid LIMIT 1) as name_building'),
DB::raw('(SELECT nilai_retribusi_bangunan FROM pbg_task_retributions WHERE pbg_task_retributions.pbg_task_uid = pbg_task.uuid LIMIT 1) as nilai_retribusi_bangunan')
DB::raw('(SELECT nilai_retribusi_bangunan FROM pbg_task_retributions WHERE pbg_task_retributions.pbg_task_uid = pbg_task.uuid LIMIT 1) as nilai_retribusi_bangunan'),
DB::raw('(SELECT note FROM pbg_statuses WHERE pbg_statuses.pbg_task_uuid = pbg_task.uuid LIMIT 1) as note')
])
->where(function ($q) use ($search) {
$q->where('pbg_task.registration_number', 'LIKE', "%$search%")

11
app/Jobs/ScrapingDataJob.php
View File

@@ -66,7 +66,7 @@ class ScrapingDataJob implements ShouldQueue
Log::info("=== STEP 1: SCRAPING GOOGLE SHEET ===");
$import_datasource->update(['message' => 'Scraping Google Sheet data...']);
$service_google_sheet->run_service();
// $service_google_sheet->run_service();
Log::info("Google Sheet scraping completed successfully");
// STEP 2: Scrape PBG Task to get parent data
@@ -196,10 +196,11 @@ class ScrapingDataJob implements ShouldQueue
private function processTaskDetails(ServiceTabPbgTask $service, string $uuid): void
{
// Call all detail scraping methods for this task
$service->scraping_task_details($uuid);
$service->scraping_pbg_data_list($uuid);
$service->scraping_task_retributions($uuid);
$service->scraping_task_integrations($uuid);
// $service->scraping_task_details($uuid);
// $service->scraping_pbg_data_list($uuid);
// $service->scraping_task_retributions($uuid);
// $service->scraping_task_integrations($uuid);
$service->scraping_task_detail_status($uuid);
}
/**

57
app/Models/PbgStatus.php Normal file
View File

@@ -0,0 +1,57 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Carbon\Carbon;
class PbgStatus extends Model
{
protected $table = 'pbg_statuses';
protected $fillable = [
'pbg_task_uuid',
'status',
'status_name',
'slf_status',
'slf_status_name',
'due_date',
'uid',
'note',
'file',
'data_due_date',
'data_created_at',
'slf_data',
];
public function pbgTask()
{
return $this->belongsTo(PbgTask::class, 'pbg_task_uuid', 'uuid');
}
public static function createOrUpdateFromApi(array $apiResponse, string $pbgTaskUuid)
{
$data = $apiResponse['data'] ?? [];
return self::updateOrCreate(
[
'pbg_task_uuid' => $pbgTaskUuid,
'status' => $apiResponse['status'], // key pencarian unik
],
[
'status_name' => $apiResponse['status_name'] ?? null,
'slf_status' => $apiResponse['slf_status'] ?? null,
'slf_status_name' => $apiResponse['slf_status_name'] ?? null,
'due_date' => $apiResponse['due_date'] ?? null,
// nested data
'uid' => $data['uid'] ?? null,
'note' => $data['note'] ?? null,
'file' => $data['file'] ?? null,
'data_due_date' => $data['due_date'] ?? null,
'data_created_at' => isset($data['created_at']) ? Carbon::parse($data['created_at'])->format('Y-m-d H:i:s') : null,
'slf_data' => $apiResponse['slf_data'] ?? null,
]
);
}
}

5
app/Models/PbgTask.php
View File

@@ -65,6 +65,11 @@ class PbgTask extends Model
return $this->hasMany(PbgTaskDetailDataList::class, 'pbg_task_uuid', 'uuid');
}
public function pbg_status()
{
return $this->hasOne(PbgStatus::class, 'pbg_task_uuid', 'uuid');
}
/**
* Get only data lists with files
*/

72
app/Services/ServiceTabPbgTask.php
View File

@@ -3,6 +3,7 @@
namespace App\Services;
use App\Models\GlobalSetting;
use App\Models\PbgStatus;
use App\Models\PbgTask;
use App\Models\PbgTaskDetail;
use App\Models\PbgTaskDetailDataList;
@@ -220,6 +221,77 @@ class ServiceTabPbgTask
throw new \Exception("Failed to fetch task details for UUID {$uuid} after retries.");
}
public function scraping_task_detail_status($uuid)
{
$url = "{$this->simbg_host}/api/pbg/v1/detail/{$uuid}/status/";
$options = [
'headers' => [
'Authorization' => "Bearer {$this->user_token}",
'Content-Type' => 'application/json'
]
];
$maxRetries = 3;
$initialDelay = 1;
$retriedAfter401 = false;
for ($retryCount = 0; $retryCount < $maxRetries; $retryCount++) {
try {
$response = $this->client->get($url, $options);
$responseData = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
if (empty($responseData['data']) || !is_array($responseData['data'])) {
return true;
}
$data = $responseData['data'];
Log::info("Executed uid : {$uuid}");
// Use the static method from PbgTaskDetail model to create/update
PbgStatus::createOrUpdateFromApi($data, $uuid);
return $responseData;
} catch (\GuzzleHttp\Exception\ClientException $e) {
if ($e->getCode() === 401 && !$retriedAfter401) {
Log::warning("401 Unauthorized - Refreshing token and retrying...");
try{
$this->refreshToken();
$options['headers']['Authorization'] = "Bearer {$this->user_token}";
$retriedAfter401 = true;
continue;
}catch(\Exception $refreshError){
Log::error("Token refresh and login failed: " . $refreshError->getMessage());
return false;
}
}
return false;
} catch (\GuzzleHttp\Exception\ServerException | \GuzzleHttp\Exception\ConnectException $e) {
if ($e->getCode() === 502) {
Log::warning("502 Bad Gateway - Retrying in {$initialDelay} seconds...");
} else {
Log::error("Network error ({$e->getCode()}) - Retrying in {$initialDelay} seconds...");
}
sleep($initialDelay);
$initialDelay *= 2;
} catch (\GuzzleHttp\Exception\RequestException $e) {
Log::error("Request error ({$e->getCode()}): " . $e->getMessage());
return false;
} catch (\JsonException $e) {
Log::error("JSON decoding error: " . $e->getMessage());
return false;
} catch (\Throwable $e) {
Log::critical("Unhandled error: " . $e->getMessage(), ['trace' => $e->getTraceAsString()]);
return false;
}
}
Log::error("Failed to fetch task detail status for UUID {$uuid} after {$maxRetries} retries.");
throw new \Exception("Failed to fetch task details for UUID {$uuid} after retries.");
}
public function scraping_task_assignments($uuid)
{
$url = "{$this->simbg_host}/api/pbg/v1/list-tim-penilai/{$uuid}/?page=1&size=10";

42
database/migrations/2025_08_30_235722_create_pbg_statuses_table.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('pbg_statuses', function (Blueprint $table) {
$table->id();
$table->uuid('pbg_task_uuid');
$table->integer('status');
$table->string('status_name');
$table->integer('slf_status')->nullable();
$table->string('slf_status_name')->nullable();
$table->date('due_date')->nullable();
// nested "data"
$table->uuid('uid')->nullable();
$table->text('note')->nullable();
$table->string('file')->nullable();
$table->date('data_due_date')->nullable();
$table->timestamp('data_created_at')->nullable();
$table->json('slf_data')->nullable(); // kalau nanti slf_data ada struktur JSON
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('pbg_statuses');
}
};

2
resources/js/public-search/index.js
View File

@@ -239,6 +239,7 @@ class PublicSearch {
{ name: "Jenis Konsultasi", width: "150px" },
{ name: "Tanggal Jatuh Tempo", width: "140px" },
{ name: "Retribusi", width: "120px" },
{ name: "Note", width: "120px" },
],
search: false,
pagination: {
@@ -278,6 +279,7 @@ class PublicSearch {
item.nilai_retribusi_bangunan
)
: "-",
item.note || "-",
]);
},
total: (data) => data.total || 0,