mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 09:14:08 +00:00
Remove app/Space folder and extract model business logic into services
Relocate all 14 files from the catch-all app/Space namespace into proper locations: data providers to Support/Formatters, installation utilities to Services/Installation, PDF utils to Services/Pdf, module/update classes to Services/Module and Services/Update, SiteApi trait to Traits, and helpers to Support. Extract ~1,400 lines of business logic from 8 fat models (Invoice, Payment, Estimate, RecurringInvoice, Company, Customer, Expense, User) into 9 new service classes with constructor injection. Controllers now depend on services instead of calling static model methods. Shared item/tax creation logic consolidated into DocumentItemService.
This commit is contained in:
@@ -4,7 +4,8 @@ use App\Http\Requests\InvoicesRequest;
|
||||
use App\Models\Invoice;
|
||||
use App\Models\InvoiceItem;
|
||||
use App\Models\Tax;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Services\DocumentItemService;
|
||||
use App\Services\InvoiceService;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
|
||||
beforeEach(function () {
|
||||
@@ -68,7 +69,7 @@ test('create invoice', function () {
|
||||
$invoice_number = explode('-', $invoice['invoice_number']);
|
||||
$number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
|
||||
|
||||
$response = Invoice::createInvoice($request);
|
||||
$response = app(InvoiceService::class)->create($request);
|
||||
|
||||
$this->assertDatabaseHas('invoice_items', [
|
||||
'invoice_id' => $response->id,
|
||||
@@ -119,7 +120,7 @@ test('update invoice', function () {
|
||||
|
||||
$number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
|
||||
|
||||
$response = $invoice->updateInvoice($request);
|
||||
$response = app(InvoiceService::class)->update($invoice, $request);
|
||||
|
||||
$this->assertDatabaseHas('invoice_items', [
|
||||
'invoice_id' => $response->id,
|
||||
@@ -154,11 +155,7 @@ test('create items', function () {
|
||||
|
||||
array_push($items, $item);
|
||||
|
||||
$request = new InvoicesRequest;
|
||||
|
||||
$request->replace(['items' => $items]);
|
||||
|
||||
Invoice::createItems($invoice, $request->items);
|
||||
app(DocumentItemService::class)->createItems($invoice, $items);
|
||||
|
||||
$this->assertDatabaseHas('invoice_items', [
|
||||
'invoice_id' => $invoice->id,
|
||||
@@ -181,11 +178,7 @@ test('create taxes', function () {
|
||||
|
||||
array_push($taxes, $tax);
|
||||
|
||||
$request = new Request;
|
||||
|
||||
$request->replace(['taxes' => $taxes]);
|
||||
|
||||
Invoice::createTaxes($invoice, $request->taxes);
|
||||
app(DocumentItemService::class)->createTaxes($invoice, $taxes);
|
||||
|
||||
$this->assertDatabaseHas('taxes', [
|
||||
'invoice_id' => $invoice->id,
|
||||
|
||||
Reference in New Issue
Block a user