diff --git a/app/Http/Controllers/Api/BigDataResumeController.php b/app/Http/Controllers/Api/BigDataResumeController.php index f5f9991..98734c6 100644 --- a/app/Http/Controllers/Api/BigDataResumeController.php +++ b/app/Http/Controllers/Api/BigDataResumeController.php @@ -19,11 +19,12 @@ class BigDataResumeController extends Controller try{ $filterDate = $request->get("filterByDate"); - // If filterByDate is "latest" or empty, get the most recent record if (!$filterDate || $filterDate === "latest") { - $big_data_resume = BigdataResume::latest()->first(); + $big_data_resume = BigdataResume::where('year', now()->year)->latest()->first(); + if (!$big_data_resume) { + return $this->response_empty_resume(); + } } else { - // Filter by specific date $big_data_resume = BigdataResume::whereDate('created_at', $filterDate) ->orderBy('id', 'desc') ->first(); diff --git a/app/Services/ServiceSIMBG.php b/app/Services/ServiceSIMBG.php index 089b01d..1f81c22 100644 --- a/app/Services/ServiceSIMBG.php +++ b/app/Services/ServiceSIMBG.php @@ -118,7 +118,8 @@ class ServiceSIMBG $importDatasource = ImportDatasource::create([ 'status' => ImportDatasourceStatus::Processing->value, ]); - + + $initResToken = $this->getToken(); if (empty($initResToken->original['data']['token']['access'])) { $importDatasource->update([ 'status' => ImportDatasourceStatus::Failed->value, @@ -126,8 +127,6 @@ class ServiceSIMBG ]); return $this->resError("Failed to retrieve token"); } - - $initResToken = $this->getToken(); $apiToken = $initResToken->original['data']['token']['access']; $headers = ['Authorization' => "Bearer " . $apiToken]; diff --git a/public/index.php b/public/index.php index ee72fab..4b4fcd4 100755 --- a/public/index.php +++ b/public/index.php @@ -5,6 +5,7 @@ use Illuminate\Http\Request; define('LARAVEL_START', microtime(true)); ini_set('max_execution_time',14400); +ini_set('memory_limit', '2G'); // Determine if the application is in maintenance mode... if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) { diff --git a/resources/views/customers/upload.blade.php b/resources/views/customers/upload.blade.php index fb56b8c..a6fa821 100644 --- a/resources/views/customers/upload.blade.php +++ b/resources/views/customers/upload.blade.php @@ -1,8 +1,8 @@ -@extends('layouts.vertical', ['subtitle' => 'Data']) +@extends('layouts.vertical', ['subtitle' => 'PDAM']) @section('content') -@include('layouts.partials/page-title', ['title' => 'Data', 'subtitle' => 'Tata Ruang']) +@include('layouts.partials/page-title', ['title' => 'Data', 'subtitle' => 'PDAM'])