JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

POST subtask - employees array instead of employee_id

Browse Source
This commit is contained in:
StudioTem committed 2023-05-23 14:58:19 +02:00
1 parent f3ed454d6f
commit 721bc24c14
1 file changed
+29 -18
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/SubTaskController.php
+29 -18
View File
@@ -130,18 +130,17 @@ class SubTaskController extends Controller
public function store($mastertask_id, Request $request) public function store($mastertask_id, Request $request)
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'data.employee_id' => 'required', 'data.employees' => 'required',
'data.duration' => 'required',
]); ]);
// validacia, ci uz subtask pre tohto usera a mastertask neexistuje // validacia, ci uz subtask pre tohto usera a mastertask neexistuje
$validator->after(function ($validator) use ($mastertask_id, $request) { // $validator->after(function ($validator) use ($mastertask_id, $request) {
if (SubTask::where('master_task_id', $mastertask_id)->where('user_id', $request->all()['data']['employee_id'])->exists()) { // if (SubTask::where('master_task_id', $mastertask_id)->where('user_id', $request->all()['data']['employee_id'])->exists()) {
$validator->errors()->add( // $validator->errors()->add(
'data.employee_id', 'Sub task already exists for this employee and master task.' // 'data.employee_id', 'Sub task already exists for this employee and master task.'
); // );
} // }
}); // });
if ($validator->fails()){ if ($validator->fails()){
return response()->json($validator->errors(), 400); return response()->json($validator->errors(), 400);
@@ -159,27 +158,38 @@ class SubTaskController extends Controller
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data']; $data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'];
$data['data']['estimated_time'] = $request->all()['data']['duration']; foreach ( $request->all()['data']['employees'] as $key => $employee ) {
$data['data']['created_by'] = User::getUserIdFromBearerToken($request->bearerToken()); $data['data']['employees'][$key]['user_id'] = $employee['id'];
$data['data']['employees'][$key]['title'] = isset($request->all()['data']['name']) ? $request->all()['data']['name']: null;
$data['data']['employees'][$key]['estimated_time'] = $employee['duration'];
$data['data']['employees'][$key]['created_by'] = User::getUserIdFromBearerToken($request->bearerToken());
$data['data']['employees'][$key]['description'] = $request->all()['data']['description'];
}
$request->merge($data); $request->merge($data);
$mastertask = MasterTask::find($mastertask_id); $mastertask = MasterTask::find($mastertask_id);
$subtask = $mastertask->subtasks()->create($request->all()['data']); $subtasks = $mastertask->subtasks()->createMany($request->all()['data']['employees']);
// syncnutie timeblocks
$subtask->syncTimeblocks($data['data']['timeblocks']);
// upload attachmentu // upload attachmentu
if ($request->file('data')) { if ($request->file('data')) {
$attachments = Attachment::uploadAttachmentsToS3($request->file('data')['files'], $mastertask); $attachments = Attachment::uploadAttachmentsToS3($request->file('data')['files'], $mastertask);
$subtask->attachments()->createMany($attachments); }
foreach ( $subtasks as $subtask ) {
// syncnutie timeblocks
$subtask->syncTimeblocks($data['data']['timeblocks']);
// upload attachmentu
if ($request->file('data')) {
$subtask->attachments()->createMany($attachments);
}
} }
return response()->json([ return response()->json([
'message' => 'Sub Task created successfully', 'message' => 'Sub Task created successfully',
'subtask' => $subtask 'subtasks' => $subtasks
], 201); ], 201);
} }
@@ -224,6 +234,7 @@ class SubTaskController extends Controller
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data']; $data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id']; $data['data']['user_id'] = $request->all()['data']['employee_id'];
$data['data']['title'] = isset($request->all()['data']['name']) ? $request->all()['data']['name'] : null;
$data['data']['estimated_time'] = $request->all()['data']['duration']; $data['data']['estimated_time'] = $request->all()['data']['duration'];
$data['data']['updated_by'] = User::getUserIdFromBearerToken($request->bearerToken()); $data['data']['updated_by'] = User::getUserIdFromBearerToken($request->bearerToken());