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

fix relation, fix migration, fix all route use token, fix service sync simbg, fix detail pbg

Browse Source
This commit is contained in:
arifal
2025-02-07 16:03:52 +07:00
parent 97ffd322a1
commit 55dc0751d3
18 changed files with 3184 additions and 3033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Api/DashboardController.php
View File

@@ -28,7 +28,7 @@ class DashboardController extends Controller
->first();
});
$taskCount = $query->total_data;
$taskCount = $query->total_data ?? 0;
$taskTotal = $query->total_retribution ?? 0;
return $this->resSuccess([
@@ -54,7 +54,7 @@ class DashboardController extends Controller
SUM(ptr.nilai_retribusi_bangunan) AS total_retribution') // Menambahkan SUM dari pbg_task_retributions
->first();
});
$taskCount = $query->total_data;
$taskCount = $query->total_data ?? 0;
$taskTotal = $query->total_retribution ?? 0;
return $this->resSuccess([
"count" => $taskCount,
@@ -71,8 +71,8 @@ class DashboardController extends Controller
)
->first();
});
$taskCount = $query->task_count;
$taskTotal = $query->total_retribution;
$taskCount = $query->task_count ?? 0;
$taskTotal = $query->total_retribution ?? 0;
return $this->resSuccess([
"count" => $taskCount,
"total" => $taskTotal
@@ -90,8 +90,8 @@ class DashboardController extends Controller
->first();
});
$taskCount = $query->total_data;
$taskTotal = $query->total_retribution;
$taskCount = $query->total_data ?? 0;
$taskTotal = $query->total_retribution ?? 0;
return $this->resSuccess([
"count"=> $taskCount,
@@ -113,7 +113,7 @@ class DashboardController extends Controller
->first();
});
$taskCount = $query->total_data;
$taskCount = $query->total_data ?? 0;
$taskTotal = $query->total_retribution ?? 0;
return $this->resSuccess([

2
app/Http/Controllers/Api/PbgTaskController.php
View File

@@ -70,7 +70,7 @@ class PbgTaskController extends Controller
public function show(string $id)
{
try{
$pbg_task = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations'])->findOrFail($id);
$pbg_task = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations','pbg_task_retributions.pbg_task_prasarana'])->findOrFail($id);
return response()->json([
"success"=> true,
"message"=> "Data ditemukan",

2
app/Http/Controllers/RequestAssignment/PbgTaskController.php
View File

@@ -37,7 +37,7 @@ class PbgTaskController extends Controller
*/
public function show(string $id)
{
$data = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations'])->findOrFail($id);
$data = PbgTask::with(['pbg_task_retributions','pbg_task_index_integrations', 'pbg_task_retributions.pbg_task_prasarana'])->findOrFail($id);
return view("pbg_task.show", compact("data"));
}

5
app/Models/PbgTaskPrasarana.php
View File

@@ -20,5 +20,10 @@ class PbgTaskPrasarana extends Model
'quantity',
'unit',
'index_prasarana',
'pbg_task_retribution_id'
];
public function pbg_task_retributions(){
return $this->hasMany(PbgTaskRetributions::class, 'pbg_task_retribution_id', 'id');
}
}

4
app/Models/PbgTaskRetributions.php
View File

@@ -35,4 +35,8 @@ class PbgTaskRetributions extends Model
public function pbg_task(){
return $this->belongsTo(PbgTask::class, 'pbg_task_uid', 'uuid');
}
public function pbg_task_prasarana(){
return $this->hasMany(PbgTaskPrasarana::class, 'pbg_task_retribution_id', 'id');
}
}

7
app/ServiceSIMBG.php
View File

@@ -227,8 +227,6 @@ class ServiceSIMBG
$res = $this->service_client->get($url, $headers);
Log::info("response task detail submit", ['res' => $res]);
if (empty($res->original['success']) || !$res->original['success']) {
// Log error
Log::error("API response indicates failure", ['url' => $url, 'uuid' => $uuid]);
@@ -249,7 +247,7 @@ class ServiceSIMBG
? Carbon::parse($data['updated_at'])->format('Y-m-d H:i:s')
: null;
PbgTaskRetributions::updateOrCreate(
$pbg_task_retributions = PbgTaskRetributions::updateOrCreate(
['detail_id' => $data['id']],
[
'detail_uid' => $data['uid'] ?? null,
@@ -273,10 +271,13 @@ class ServiceSIMBG
]
);
$pbg_task_retribution_id = $pbg_task_retributions->id;
$prasaranaData = $data['prasarana'] ?? [];
if (!empty($prasaranaData)) {
$insertData = array_map(fn($item) => [
'pbg_task_uid' => $uuid,
'pbg_task_retribution_id' => $pbg_task_retribution_id,
'prasarana_id' => $item['id'] ?? null,
'prasarana_type' => $item['prasarana_type'] ?? null,
'building_type' => $item['building_type'] ?? null,