Merge branch 'feature/service_retrieve_data' into develop

# Conflicts:
#	dashboard/app/Http/Controllers/Api/DashboardController.php
This commit is contained in:
pcalengratha
2026-03-25 10:09:12 +07:00
9 changed files with 814 additions and 11 deletions

View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api;
use App\Services\DataRetrievalService;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Services\DashboardService;
@@ -10,10 +11,12 @@ use Carbon\Carbon;
class DashboardController extends Controller
{
protected $service;
protected $dataRetrievalService;
public function __construct(DashboardService $service)
{
$this->service = $service;
$this->dataRetrievalService = new DataRetrievalService();
}
/*
@@ -152,13 +155,19 @@ class DashboardController extends Controller
// return response()->json(['error' => 'Missing epiweek range'], 400);
// }
// $data = $this->service->sentinelSites(
// $range['startYear'],
// $range['startWeek'],
// $range['endYear'],
// $range['endWeek']
// );
return response()->json($data);
}
// return response()->json($data);
// }
}
public function fetchSourceData(){
try{
$this->dataRetrievalService->getSurveillanceData();
return response()->json(['message' => 'Data loaded successfully!'], 200);
}
catch (\Exception $e)
{
return response()->json(['error' => 'Data loaded unsuccessfully!'], 400);
}
}
}