tasks endpoint update

This commit is contained in:
StudioTem committed 2023-02-08 13:01:43 +01:00
1 parent ce454ffd0e
commit 17ed7616ee
6 files changed
+183 -11

No files matched your search

+90 -1
View File
@@ -6,11 +6,56 @@ use App\Models\Attachment;
use App\Models\MasterTask;
use App\Models\SubTask;
use App\Models\Team;
use App\Models\Timesheet;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
class SubTaskController extends Controller
{
public function index(Request $request)
{
// get query parameter from request
$parameters = $request->query();
$parameters['user_id'] = ( $parameters['employee_id'] ?? null );
$validator = Validator::make($request->all(), [
'start' => 'required',
'end' => 'required',
]);
$validator->after(function ($validator) use ($parameters) {
if ( !isset($parameters['employee_id']) && !isset($parameters['team_id'])) {
$validator->errors()->add(
'error', 'You must provide either employee_id or team_id.'
);
}
});
if ($validator->fails()){
return response()->json($validator->errors(), 400);
}
if (isset($parameters['team_id'])) {
$subtasks = SubTask::whereHas('mastertask', function ($query) use ($parameters) {
$query->where('team_id', $parameters['team_id']);
})->whereHas('timeblocks', function ($query) use ($parameters) {
$query->where('start', '>=', $parameters['start']);
$query->where('end', '<=', $parameters['end']);
})->get();
} else if (isset($parameters['user_id'])) {
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($parameters) {
$query->where('start', '>=', $parameters['start']);
$query->where('end', '<=', $parameters['end']);
})->get();
}
return response()->json([
'subtasks' => $subtasks
], 200);
}
public function store($mastertask_id, Request $request)
{
$validator = Validator::make($request->all(), [
@@ -27,7 +72,7 @@ class SubTaskController extends Controller
}
});
if($validator->fails()){
if ($validator->fails()){
return response()->json($validator->errors(), 400);
}
@@ -41,6 +86,11 @@ class SubTaskController extends Controller
$mastertask = MasterTask::find($mastertask_id);
$subtask = $mastertask->subtasks()->create($request->all()['data']);
// syncnutie timeblocks
if (!empty($data['data']['timeblocks'])) {
$subtask->syncTimeblocks($data['data']['timeblocks']);
}
// upload attachmentu
if ($request->file('data')) {
$attachments = Attachment::uploadAttachmentsToS3($request->file('data')['files'], $mastertask);
@@ -53,6 +103,45 @@ class SubTaskController extends Controller
], 201);
}
// TODO zabezpecit, ze ked sa meni user, tak nech sa dvojmu nevlozia jeho vykazy
public function update($id, Request $request)
{
$subtask = SubTask::find($id);
$validator = Validator::make($request->all(), [
'data.employee_id' => 'required',
'data.duration' => 'required',
]);
if ($validator->fails()){
return response()->json($validator->errors(), 400);
}
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'];
$data['data']['estimated_time'] = $request->all()['data']['duration'];
$request->merge($data);
$subtask->update($request->all()['data']);
// syncnutie vykazu
if (!empty($data['data']['timesheets'])) {
$subtask->syncTimesheets($data['data']['timesheets']);
}
// syncnutie timeblocks
if (!empty($data['data']['timeblocks'])) {
$subtask->syncTimeblocks($data['data']['timeblocks']);
}
return response()->json([
'message' => 'Subtask updated successfully',
'subtask' => $subtask
]);
}
public function delete($id)
{
$subtask = SubTask::find($id);