|
@@ -6,7 +6,10 @@ use App\Http\Controllers\Controller;
|
|
|
use App\Http\Requests\API\Task\CreateOrUpdateRequest;
|
|
|
use App\Http\Resources\API\TaskDetailResource;
|
|
|
use App\Http\Resources\API\TaskResource;
|
|
|
+use App\Models\CustomField;
|
|
|
+use App\Models\NamingRule;
|
|
|
use App\Models\Task;
|
|
|
+use App\Repositories\CustomFieldRepository;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
|
|
@@ -28,14 +31,21 @@ class TaskController extends Controller
|
|
|
/**
|
|
|
* Store a newly created resource in storage.
|
|
|
*/
|
|
|
- public function store(CreateOrUpdateRequest $request)
|
|
|
+ public function store(CreateOrUpdateRequest $request, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
- Task::create([
|
|
|
+ $formData = [
|
|
|
...$request->all(),
|
|
|
'company_id' => Auth::user()->company_id,
|
|
|
'created_by' => Auth::id(),
|
|
|
'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
- ]);
|
|
|
+ ];
|
|
|
+
|
|
|
+ if ($request->has("naming_rule_id") && $request->get("naming_rule_id") > 0) {
|
|
|
+ $keys = $customFieldRepo->keysByGroup($request->get("naming_rule_id"));
|
|
|
+ $formData['naming_rules'] = $request->only($keys);
|
|
|
+ }
|
|
|
+
|
|
|
+ Task::create($formData);
|
|
|
|
|
|
return $this->created();
|
|
|
}
|
|
@@ -53,13 +63,20 @@ class TaskController extends Controller
|
|
|
/**
|
|
|
* Update the specified resource in storage.
|
|
|
*/
|
|
|
- public function update(CreateOrUpdateRequest $request, string $id)
|
|
|
+ public function update(CreateOrUpdateRequest $request, string $id, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
$task = Task::query()->findOrFail($id);
|
|
|
|
|
|
- $task->fill([...$request->all(),
|
|
|
+ $formData = [...$request->all(),
|
|
|
'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
- ]);
|
|
|
+ ];
|
|
|
+
|
|
|
+ if ($request->has("naming_rule_id") && $request->get("naming_rule_id") > 0) {
|
|
|
+ $keys = $customFieldRepo->keysByGroup($request->get("naming_rule_id"));
|
|
|
+ $formData['naming_rules'] = $request->only($keys);
|
|
|
+ }
|
|
|
+
|
|
|
+ $task->fill($formData);
|
|
|
$task->save();
|
|
|
|
|
|
return $this->noContent();
|