Merge branch 'feature/NewRoadItemWeb' into 'develop'
create new user for web service See merge request witelgroup/rms_v2!135
This commit is contained in:
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Controllers\V3\Dashboard\RoadItem;
|
||||||
|
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Http\Requests\V3\RoadItem\WebService\CheckRequest;
|
||||||
|
use App\Http\Traits\ApiResponse;
|
||||||
|
use App\Models\RoadItemsProject;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
|
class WebServiceController extends Controller
|
||||||
|
{
|
||||||
|
use ApiResponse;
|
||||||
|
public function getRoadItem(CheckRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$fromDate = $request->from_date;
|
||||||
|
$toDate = $request->to_date;
|
||||||
|
$roadItems = RoadItemsProject::query()
|
||||||
|
->whereBetween('created_at', [$fromDate, $toDate])
|
||||||
|
->get();
|
||||||
|
|
||||||
|
return $this->successResponse($roadItems);
|
||||||
|
}
|
||||||
|
}
|
||||||
35
app/Http/Requests/V3/RoadItem/WebService/CheckRequest.php
Normal file
35
app/Http/Requests/V3/RoadItem/WebService/CheckRequest.php
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Requests\V3\RoadItem\WebService;
|
||||||
|
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
|
||||||
|
class CheckRequest extends FormRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determine if the user is authorized to make this request.
|
||||||
|
*/
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
$user = Auth::user();
|
||||||
|
return (
|
||||||
|
$user->username === 'service_user257'&&
|
||||||
|
Hash::check('S3rv1ce@123', $user->password) );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the validation rules that apply to the request.
|
||||||
|
*
|
||||||
|
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'from_date' => 'required|date_format:Y-m-d',
|
||||||
|
'to_date' => 'required|date_format:Y-m-d',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,7 +15,7 @@ use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController;
|
|||||||
use App\Http\Controllers\V3\Dashboard\Mission\TransportationUnitController;
|
use App\Http\Controllers\V3\Dashboard\Mission\TransportationUnitController;
|
||||||
use App\Http\Controllers\V3\Dashboard\ObservedItemController;
|
use App\Http\Controllers\V3\Dashboard\ObservedItemController;
|
||||||
use App\Http\Controllers\V3\Dashboard\OtpManagementController;
|
use App\Http\Controllers\V3\Dashboard\OtpManagementController;
|
||||||
use App\Http\Controllers\V3\Dashboard\Reports\RoadItemsReportController;
|
use App\Http\Controllers\V3\Dashboard\RoadItem\WebServiceController;
|
||||||
use App\Http\Controllers\V3\Dashboard\RoadMaintenanceStationController;
|
use App\Http\Controllers\V3\Dashboard\RoadMaintenanceStationController;
|
||||||
use App\Http\Controllers\V3\Dashboard\RoadPatrol\ReportController;
|
use App\Http\Controllers\V3\Dashboard\RoadPatrol\ReportController;
|
||||||
use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorController;
|
use App\Http\Controllers\V3\Dashboard\SafetyAndPrivacy\OperatorController;
|
||||||
@@ -158,6 +158,12 @@ Route::prefix('road_items')
|
|||||||
Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
|
Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
|
||||||
Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
|
Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
|
||||||
});
|
});
|
||||||
|
Route::prefix('webservice')
|
||||||
|
->name('webservice.')
|
||||||
|
->controller(WebServiceController::class)
|
||||||
|
->group(function () {
|
||||||
|
Route::get('/', 'getRoadItems')->name('getRoadItem');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::prefix('cmms_machines')
|
Route::prefix('cmms_machines')
|
||||||
|
|||||||
Reference in New Issue
Block a user