Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Add validation for task time logs

Browse Source
This commit is contained in:
David Bomba 2022-08-18 13:29:18 +10:00
parent e37b24eab6
commit e1fd87d174
3 changed files with 173 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/Http/Requests/Task/StoreTaskRequest.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Requests\Task;
use App\Http\Requests\Request;
use App\Models\Project;
use App\Models\Task;
use App\Utils\Traits\MakesHash;
use Illuminate\Validation\Rule;
@ -38,19 +39,49 @@ class StoreTaskRequest extends Request
$rules['number'] = Rule::unique('tasks')->where('company_id', auth()->user()->company()->id);
}
if(isset($this->client_id))
$rules['client_id'] = 'bail|required|exists:clients,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
if(isset($this->project_id))
$rules['project_id'] = 'bail|required|exists:projects,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
$rules['timelog'] = ['bail','array',function ($attribute, $values, $fail) {
foreach($values as $k)
{
if(!is_int($k[0]) || !is_int($k[1]))
$fail('The '.$attribute.' - '.print_r($k,1).' is invalid. Unix timestamps only.');
}
}];
return $this->globalRules($rules);
}
public function prepareForValidation()
{
$input = $this->all();
$input = $this->decodePrimaryKeys($this->all());
if (array_key_exists('status_id', $input) && is_string($input['status_id'])) {
$input['status_id'] = $this->decodePrimaryKey($input['status_id']);
}
/* Ensure the project is related */
if (array_key_exists('project_id', $input) && isset($input['project_id'])) {
$project = Project::withTrashed()->find($input['project_id'])->company()->first();
if($project){
$input['client_id'] = $project->client_id;
}
else
{
unset($input['project_id']);
}
}
$this->replace($input);
}
}

31
app/Http/Requests/Task/UpdateTaskRequest.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Requests\Task;
use App\Http\Requests\Request;
use App\Models\Project;
use App\Utils\Traits\ChecksEntityStatus;
use App\Utils\Traits\MakesHash;
use Illuminate\Validation\Rule;
@ -39,6 +40,22 @@ class UpdateTaskRequest extends Request
$rules['number'] = Rule::unique('tasks')->where('company_id', auth()->user()->company()->id)->ignore($this->task->id);
}
if(isset($this->client_id))
$rules['client_id'] = 'bail|required|exists:clients,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
if(isset($this->project_id))
$rules['project_id'] = 'bail|required|exists:projects,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
$rules['timelog'] = ['bail','array',function ($attribute, $values, $fail) {
foreach($values as $k)
{
if(!is_int($k[0]) || !is_int($k[1]))
$fail('The '.$attribute.' - '.print_r($k,1).' is invalid. Unix timestamps only.');
}
}];
return $this->globalRules($rules);
}
@ -50,6 +67,20 @@ class UpdateTaskRequest extends Request
$input['status_id'] = $this->decodePrimaryKey($input['status_id']);
}
/* Ensure the project is related */
if (array_key_exists('project_id', $input) && isset($input['project_id'])) {
$project = Project::withTrashed()->find($input['project_id'])->company()->first();
if($project){
$input['client_id'] = $project->client_id;
}
else
{
unset($input['project_id']);
}
}
if (array_key_exists('color', $input) && is_null($input['color'])) {
$input['color'] = '';
}

110
tests/Feature/TaskApiTest.php
View File

@ -42,6 +42,97 @@ class TaskApiTest extends TestCase
Model::reguard();
}
public function testTimeLogValidation()
{
$data = [
'timelog' => $this->faker->firstName(),
];
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
} catch (ValidationException $e) {
$response->assertStatus(302);
}
}
public function testTimeLogValidation1()
{
$data = [
'timelog' => [[1,2],[3,4]],
];
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
$response->assertStatus(200);
}
public function testTimeLogValidation2()
{
$data = [
'timelog' => [],
];
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
$response->assertStatus(200);
}
public function testTimeLogValidation3()
{
$data = [
'timelog' => [["a","b"],["c","d"]],
];
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
} catch (ValidationException $e) {
$response->assertStatus(302);
}
}
public function testTimeLogValidation4()
{
$data = [
'timelog' => [[1,2],[3,0]],
];
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
$response->assertStatus(200);
}
public function testStartTask()
{
$log = [
@ -76,6 +167,7 @@ class TaskApiTest extends TestCase
$data = [
'description' => $this->faker->firstName(),
'number' => 'taskynumber',
'client_id' => $this->client->id,
];
$response = $this->withHeaders([
@ -126,6 +218,24 @@ class TaskApiTest extends TestCase
$this->assertNotEmpty($arr['data']['number']);
}
public function testTaskWithBadClientId()
{
$data = [
'client_id' => $this->faker->firstName(),
];
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/tasks', $data);
$arr = $response->json();
} catch (ValidationException $e) {
$response->assertStatus(302);
}
}
public function testTaskPostWithActionStart()
{
$data = [