Merge branch 'develop' into 'feature/ActivityStatistic'
Develop See merge request witelgroup/rms_v2!89
This commit is contained in:
@@ -2,17 +2,62 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\V3;
|
namespace App\Http\Controllers\V3;
|
||||||
|
|
||||||
|
use App\Facades\DataTable\DataTableFacade;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Http\Requests\V3\LogList\StoreRequest;
|
||||||
|
use App\Http\Requests\V3\LogList\UpdateRequest;
|
||||||
use App\Http\Traits\ApiResponse;
|
use App\Http\Traits\ApiResponse;
|
||||||
use App\Models\LogList;
|
use App\Models\LogList;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
class LogListController extends Controller
|
class LogListController extends Controller
|
||||||
{
|
{
|
||||||
use ApiResponse;
|
use ApiResponse;
|
||||||
|
|
||||||
public function index(): JsonResponse
|
public function index(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
return $this->successResponse(LogList::all('description','log_unique_code'));
|
return response()->json(DataTableFacade::run(
|
||||||
|
LogList::query(),
|
||||||
|
$request,
|
||||||
|
allowedFilters: ['*'],
|
||||||
|
allowedSortings: ['*']));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function list(): JsonResponse
|
||||||
|
{
|
||||||
|
return $this->successResponse(LogList::all('description', 'log_unique_code'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function store(StoreRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
LogList::query()->create([
|
||||||
|
'description' => $request->description,
|
||||||
|
'log_unique_code' => $request->log_unique_code,
|
||||||
|
'action_type' => $request->action_type,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return $this->successResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function show(LogList $logList): JsonResponse
|
||||||
|
{
|
||||||
|
return $this->successResponse($logList);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(UpdateRequest $request, LogList $logList): JsonResponse
|
||||||
|
{
|
||||||
|
LogList::query()->update([
|
||||||
|
'description' => $request->description,
|
||||||
|
'log_unique_code' => $request->log_unique_code,
|
||||||
|
'action_type' => $request->action_type,
|
||||||
|
]);
|
||||||
|
return $this->successResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function destroy(LogList $logList): JsonResponse
|
||||||
|
{
|
||||||
|
$logList->delete();
|
||||||
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
30
app/Http/Requests/V3/LogList/StoreRequest.php
Normal file
30
app/Http/Requests/V3/LogList/StoreRequest.php
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Requests\V3\LogList;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class StoreRequest extends FormRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determine if the user is authorized to make this request.
|
||||||
|
*/
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the validation rules that apply to the request.
|
||||||
|
*
|
||||||
|
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'description' =>'required|string',
|
||||||
|
'log_unique_code' =>'required|numeric|unique:log_lists,log_unique_code',
|
||||||
|
'action_type' =>'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
31
app/Http/Requests/V3/LogList/UpdateRequest.php
Normal file
31
app/Http/Requests/V3/LogList/UpdateRequest.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Requests\V3\LogList;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class UpdateRequest extends FormRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Determine if the user is authorized to make this request.
|
||||||
|
*/
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the validation rules that apply to the request.
|
||||||
|
*
|
||||||
|
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'description' => 'required|string',
|
||||||
|
'log_unique_code' => ['required', 'numeric', Rule::unique('log_lists', 'log_unique_code')->ignore($this->logList->id)],
|
||||||
|
'action_type' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,4 +10,6 @@ class LogList extends Model
|
|||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
|
|
||||||
|
protected $guarded = [];
|
||||||
}
|
}
|
||||||
@@ -324,6 +324,11 @@ Route::prefix('log_list')
|
|||||||
->controller(LogListController::class)
|
->controller(LogListController::class)
|
||||||
->group(function () {
|
->group(function () {
|
||||||
Route::get('/', 'index')->name('index');
|
Route::get('/', 'index')->name('index');
|
||||||
|
Route::get('/list', 'list')->name('list');
|
||||||
|
Route::post('/', 'store')->name('store');
|
||||||
|
Route::get('/{logList}', 'show')->name('show');
|
||||||
|
Route::post('/{logList}', 'update')->name('update');
|
||||||
|
Route::delete('/{logList}', 'destroy')->name('destroy');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::prefix('safety_and_privacy')
|
Route::prefix('safety_and_privacy')
|
||||||
|
|||||||
Reference in New Issue
Block a user