Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:54:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for schedule form validation

Browse Source
This commit is contained in:
David Bomba 2022-05-29 16:43:07 +10:00
parent a25a90d3d1
commit 56e83f6e6c
3 changed files with 30 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/Services/TaskScheduler/TaskSchedulerService.php
View File

@ -37,6 +37,7 @@ use App\Models\Scheduler;
use App\Utils\Ninja; use App\Utils\Ninja;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Validator;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
class TaskSchedulerService class TaskSchedulerService
@ -83,110 +84,91 @@ class TaskSchedulerService
} }
private function runValidation($form_request, $data)
{
$_syn_request_class = new $form_request();
$_syn_request_class->setContainer(app());
$_syn_request_class->initialize($data);
$_syn_request_class->prepareForValidation();
$_syn_request_class->setValidator(Validator::make($_syn_request_class->all(), $_syn_request_class->rules()));
return $_syn_request_class->validated();
}
public function setJobParameters(ScheduledJob $job, $request): ScheduledJob public function setJobParameters(ScheduledJob $job, $request): ScheduledJob
{ {
switch ($request->job) { switch ($request->job) {
case ScheduledJob::CREATE_CLIENT_REPORT: case ScheduledJob::CREATE_CLIENT_REPORT:
$rules = (new GenericReportRequest)->rules();
//custom rules for example here we require date_range but in genericRequest class we don't
$rules['date_range'] = 'string|required';
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_CLIENT_REPORT; $job->action_name = ScheduledJob::CREATE_CLIENT_REPORT;
$job->action_class = $this->getClassPath(ClientExport::class); $job->action_class = $this->getClassPath(ClientExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_CLIENT_CONTACT_REPORT: case ScheduledJob::CREATE_CLIENT_CONTACT_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_CLIENT_CONTACT_REPORT; $job->action_name = ScheduledJob::CREATE_CLIENT_CONTACT_REPORT;
$job->action_class = $this->getClassPath(ContactExport::class); $job->action_class = $this->getClassPath(ContactExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_CREDIT_REPORT: case ScheduledJob::CREATE_CREDIT_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_CREDIT_REPORT; $job->action_name = ScheduledJob::CREATE_CREDIT_REPORT;
$job->action_class = $this->getClassPath(CreditExport::class); $job->action_class = $this->getClassPath(CreditExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_DOCUMENT_REPORT: case ScheduledJob::CREATE_DOCUMENT_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_DOCUMENT_REPORT; $job->action_name = ScheduledJob::CREATE_DOCUMENT_REPORT;
$job->action_class = $this->getClassPath(DocumentExport::class); $job->action_class = $this->getClassPath(DocumentExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_EXPENSE_REPORT: case ScheduledJob::CREATE_EXPENSE_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_EXPENSE_REPORT; $job->action_name = ScheduledJob::CREATE_EXPENSE_REPORT;
$job->action_class = $this->getClassPath(ExpenseExport::class); $job->action_class = $this->getClassPath(ExpenseExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_INVOICE_ITEM_REPORT: case ScheduledJob::CREATE_INVOICE_ITEM_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_INVOICE_ITEM_REPORT; $job->action_name = ScheduledJob::CREATE_INVOICE_ITEM_REPORT;
$job->action_class = $this->getClassPath(InvoiceItemExport::class); $job->action_class = $this->getClassPath(InvoiceItemExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_INVOICE_REPORT: case ScheduledJob::CREATE_INVOICE_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_INVOICE_REPORT; $job->action_name = ScheduledJob::CREATE_INVOICE_REPORT;
$job->action_class = $this->getClassPath(InvoiceExport::class); $job->action_class = $this->getClassPath(InvoiceExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_PAYMENT_REPORT: case ScheduledJob::CREATE_PAYMENT_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_PAYMENT_REPORT; $job->action_name = ScheduledJob::CREATE_PAYMENT_REPORT;
$job->action_class = $this->getClassPath(PaymentExport::class); $job->action_class = $this->getClassPath(PaymentExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_PRODUCT_REPORT: case ScheduledJob::CREATE_PRODUCT_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_PRODUCT_REPORT; $job->action_name = ScheduledJob::CREATE_PRODUCT_REPORT;
$job->action_class = $this->getClassPath(ProductExport::class); $job->action_class = $this->getClassPath(ProductExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_PROFIT_AND_LOSS_REPORT: case ScheduledJob::CREATE_PROFIT_AND_LOSS_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_PROFIT_AND_LOSS_REPORT; $job->action_name = ScheduledJob::CREATE_PROFIT_AND_LOSS_REPORT;
$job->action_class = $this->getClassPath(ProfitAndLoss::class); $job->action_class = $this->getClassPath(ProfitAndLoss::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_QUOTE_ITEM_REPORT: case ScheduledJob::CREATE_QUOTE_ITEM_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_QUOTE_ITEM_REPORT; $job->action_name = ScheduledJob::CREATE_QUOTE_ITEM_REPORT;
$job->action_class = $this->getClassPath(QuoteItemExport::class); $job->action_class = $this->getClassPath(QuoteItemExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_QUOTE_REPORT: case ScheduledJob::CREATE_QUOTE_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_QUOTE_REPORT; $job->action_name = ScheduledJob::CREATE_QUOTE_REPORT;
$job->action_class = $this->getClassPath(QuoteExport::class); $job->action_class = $this->getClassPath(QuoteExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_RECURRING_INVOICE_REPORT: case ScheduledJob::CREATE_RECURRING_INVOICE_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_RECURRING_INVOICE_REPORT; $job->action_name = ScheduledJob::CREATE_RECURRING_INVOICE_REPORT;
$job->action_class = $this->getClassPath(RecurringInvoiceExport::class); $job->action_class = $this->getClassPath(RecurringInvoiceExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
case ScheduledJob::CREATE_TASK_REPORT: case ScheduledJob::CREATE_TASK_REPORT:
$validator = GenericReportRequest::runFormRequest($request->all());
$validatedJobData = $validator->validate();
$job->action_name = ScheduledJob::CREATE_TASK_REPORT; $job->action_name = ScheduledJob::CREATE_TASK_REPORT;
$job->action_class = $this->getClassPath(TaskExport::class); $job->action_class = $this->getClassPath(TaskExport::class);
$job->parameters = $validatedJobData; $job->parameters = $this->runValidation(GenericReportRequest::class, $request->all());
break; break;
} }

2
app/Utils/Traits/Pdf/PageNumbering.php
View File

@ -18,7 +18,7 @@ trait PageNumbering
private function pageNumbering($pdf_data_object, $company) private function pageNumbering($pdf_data_object, $company)
{ {
if(!$company->settings->page_numbering) if(!property_exists($company->settings, 'page_numbering') || !$company->settings->page_numbering)
return $pdf_data_object; return $pdf_data_object;
try try

37
tests/Feature/Scheduler/SchedulerTest.php
View File

@ -22,7 +22,7 @@ class SchedulerTest extends TestCase
use MakesHash; use MakesHash;
use MockUnitData; use MockUnitData;
use WithoutEvents; use WithoutEvents;
use RefreshDatabase; // use RefreshDatabase;
public function setUp(): void public function setUp(): void
{ {
@ -77,7 +77,6 @@ class SchedulerTest extends TestCase
{ {
$response = $this->createScheduler(); $response = $this->createScheduler();
nlog($response);
$arr = $response->json(); $arr = $response->json();
$id = $arr['data']['id']; $id = $arr['data']['id'];
@ -115,23 +114,6 @@ class SchedulerTest extends TestCase
} }
public function testSchedulerCanBeDeleted()
{
$response = $this->createScheduler();
$arr = $response->json();
$id = $arr['data']['id'];
$scheduler = Scheduler::find($this->decodePrimaryKey($id));
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->delete('/api/v1/task_scheduler/' . $this->encodePrimaryKey($scheduler->id));
$this->assertEquals(0, Scheduler::count());
}
public function testSchedulerJobCanBeUpdated() public function testSchedulerJobCanBeUpdated()
{ {
@ -161,23 +143,6 @@ class SchedulerTest extends TestCase
$this->assertSame('create_credit_report', $arr['data']['job']['action_name']); $this->assertSame('create_credit_report', $arr['data']['job']['action_name']);
} }
public function testSchedulerCanBeCreated()
{
$response = $this->createScheduler();
$arr = $response->json();
$id = $arr['data']['id'];
$scheduler = Scheduler::find($this->decodePrimaryKey($id));
$all_schedulers = Scheduler::count();
$this->assertSame(1, $all_schedulers);
$response->assertStatus(200);
}
public function createScheduler() public function createScheduler()
{ {
$data = [ $data = [