mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
TEAMS resource update
This commit is contained in:
1 parent
4baeac2981
commit
96954845a1
2 files changed
+9
-16
No files matched your search
@@ -56,17 +56,9 @@ class TeamController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function delete(Request $request)
|
public function delete($id)
|
||||||
{
|
{
|
||||||
$validator = Validator::make($request->all(), [
|
$team = Team::find($id);
|
||||||
'data.id' => 'required',
|
|
||||||
]);
|
|
||||||
|
|
||||||
if($validator->fails()){
|
|
||||||
return response()->json($validator->errors(), 400);
|
|
||||||
}
|
|
||||||
|
|
||||||
$team = Team::find($request->all()['data']['id']);
|
|
||||||
$team->users()->detach();
|
$team->users()->detach();
|
||||||
$team->delete();
|
$team->delete();
|
||||||
|
|
||||||
@@ -83,10 +75,10 @@ class TeamController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function update(Request $request)
|
public function update($id, Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
$validator = Validator::make($request->all(), [
|
$validator = Validator::make($request->all(), [
|
||||||
'data.id' => 'required',
|
|
||||||
'data.name' => 'required',
|
'data.name' => 'required',
|
||||||
'data.employees' => 'required',
|
'data.employees' => 'required',
|
||||||
]);
|
]);
|
||||||
@@ -97,7 +89,7 @@ class TeamController extends Controller
|
|||||||
|
|
||||||
$userIdsArray = array_column($request->all()['data']['employees'], 'id');
|
$userIdsArray = array_column($request->all()['data']['employees'], 'id');
|
||||||
|
|
||||||
$team = Team::find($request->all()['data']['id']);
|
$team = Team::find($id);
|
||||||
$team->users()->detach();
|
$team->users()->detach();
|
||||||
$team->users()->attach( $userIdsArray );
|
$team->users()->attach( $userIdsArray );
|
||||||
$team->update($request->all()['data']);
|
$team->update($request->all()['data']);
|
||||||
|
|||||||
+4
-3
@@ -1,5 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Http\Controllers\MasterTaskController;
|
||||||
use App\Http\Controllers\TeamController;
|
use App\Http\Controllers\TeamController;
|
||||||
use App\Http\Controllers\UserController;
|
use App\Http\Controllers\UserController;
|
||||||
use App\Http\Resources\MasterTaskCollection;
|
use App\Http\Resources\MasterTaskCollection;
|
||||||
@@ -37,9 +38,8 @@ Route::get('/v1/teams/{id}', function ($id) {
|
|||||||
return new TeamResource(Team::find($id));
|
return new TeamResource(Team::find($id));
|
||||||
});
|
});
|
||||||
Route::post('/v1/teams', TeamController::class . '@store');
|
Route::post('/v1/teams', TeamController::class . '@store');
|
||||||
Route::delete('/v1/teams', TeamController::class . '@delete');
|
Route::put('/v1/teams/{id}', TeamController::class . '@update');
|
||||||
Route::put('/v1/teams', TeamController::class . '@update');
|
Route::delete('/v1/teams/{id}', TeamController::class . '@delete');
|
||||||
|
|
||||||
|
|
||||||
Route::get('/v1/employees', function () {
|
Route::get('/v1/employees', function () {
|
||||||
return new UserCollection(User::all());
|
return new UserCollection(User::all());
|
||||||
@@ -55,6 +55,7 @@ Route::get('/v1/projects', function () {
|
|||||||
Route::get('/v1/mastertasks', function () {
|
Route::get('/v1/mastertasks', function () {
|
||||||
return new MasterTaskCollection( MasterTask::all());
|
return new MasterTaskCollection( MasterTask::all());
|
||||||
});
|
});
|
||||||
|
Route::post('/v1/mastertasks', MasterTaskController::class . '@store');
|
||||||
|
|
||||||
Route::get('/v1/mastertasks/{id}', function ($id) {
|
Route::get('/v1/mastertasks/{id}', function ($id) {
|
||||||
return new MasterTaskResource( MasterTask::find($id));
|
return new MasterTaskResource( MasterTask::find($id));
|
||||||
|
|||||||
Reference in new issue
Block a user