mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-07-16 22:05:20 +00:00
6d1816bd1b
The app/Services/ directory had grown into 22 flat files at the root plus 7 uneven subdirectories — finding anything required scrolling through an alphabetical mix of small CRUD services, infrastructure drivers, and install-time utilities. This commit groups services by domain, folds Backup into a new Storage namespace, and moves framework-infrastructure and install-time helpers out of Services and into Support where they belong. New Services layout: Documents/ (Invoice, Estimate, RecurringInvoice, Payment, Expense, Transaction, DocumentItem, SerialNumber, Currency — matches the 'Documents' navigation group); Company/ (Company, Member, Invitation); Mail/ (MailConfiguration, CompanyMailConfig); Storage/ (FileDisk, plus Backup folded in). ExchangeRateProviderService moves next to its drivers in ExchangeRate/; FontService moves into Pdf/ where it belongs. CustomerService, ItemService, CustomFieldService stay at the Services root as standalone single-file domains. Moves to Support/: Hashids/ (library wrapper — not business logic); Setup/ (one-shot install-time utilities — stateless helpers); Pdf/ (ImageUtils, PdfTemplateUtils, plus the existing PdfHtmlSanitizer consolidated into the same subdir). These are all framework infrastructure and stateless utilities — the 'service' label never really fit them. Namespace declarations in 29 moved files updated to match new paths. 62 consumer files (controllers, other services, tests, database factories, seeders, routes, bootstrap/providers.php) have their use statements rewritten via a literal-string replacement script — no regex meant no risk of half-matching. Three Documents services needed an explicit 'use App\Services\Mail\CompanyMailConfigService' added because the same-namespace short reference they relied on no longer resolves after the split. Verified: composer dump-autoload, 350 tests pass (850 assertions), vendor/bin/pint clean, npm run build succeeds.
112 lines
3.7 KiB
PHP
112 lines
3.7 KiB
PHP
<?php
|
|
|
|
use App\Models\CompanySetting;
|
|
use App\Models\Setting;
|
|
use App\Models\User;
|
|
use App\Services\Mail\CompanyMailConfigService;
|
|
use App\Services\Mail\MailConfigurationService;
|
|
use Illuminate\Support\Facades\Artisan;
|
|
use Laravel\Sanctum\Sanctum;
|
|
|
|
use function Pest\Laravel\getJson;
|
|
use function Pest\Laravel\postJson;
|
|
|
|
beforeEach(function () {
|
|
Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
|
|
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
|
|
|
|
$user = User::find(1);
|
|
$this->companyId = $user->companies()->first()->id;
|
|
|
|
$this->withHeaders([
|
|
'company' => $this->companyId,
|
|
]);
|
|
|
|
Sanctum::actingAs($user, ['*']);
|
|
});
|
|
|
|
test('get company mail configuration falls back to global config defaults', function () {
|
|
Setting::setSettings([
|
|
'mail_driver' => 'mail',
|
|
'from_name' => 'Global Mailer',
|
|
'from_mail' => 'global@example.com',
|
|
]);
|
|
|
|
app(MailConfigurationService::class)->applyGlobalConfig();
|
|
|
|
getJson('/api/v1/company/mail/company-config')
|
|
->assertOk()
|
|
->assertJson([
|
|
'use_custom_mail_config' => 'NO',
|
|
'mail_driver' => 'mail',
|
|
'from_name' => 'Global Mailer',
|
|
'from_mail' => 'global@example.com',
|
|
]);
|
|
});
|
|
|
|
test('save company mail configuration persists postmark settings', function () {
|
|
postJson('/api/v1/company/mail/company-config', [
|
|
'use_custom_mail_config' => 'YES',
|
|
'mail_driver' => 'postmark',
|
|
'mail_postmark_token' => 'company-postmark-token',
|
|
'mail_postmark_message_stream_id' => 'broadcasts',
|
|
'from_name' => 'Company Mailer',
|
|
'from_mail' => 'company@example.com',
|
|
])
|
|
->assertOk()
|
|
->assertJson([
|
|
'success' => true,
|
|
]);
|
|
|
|
$this->assertDatabaseHas('company_settings', [
|
|
'company_id' => $this->companyId,
|
|
'option' => 'use_custom_mail_config',
|
|
'value' => 'YES',
|
|
]);
|
|
|
|
$this->assertDatabaseHas('company_settings', [
|
|
'company_id' => $this->companyId,
|
|
'option' => 'company_mail_postmark_token',
|
|
'value' => 'company-postmark-token',
|
|
]);
|
|
});
|
|
|
|
test('disabling company mail configuration only flips the custom-config toggle', function () {
|
|
CompanySetting::setSettings([
|
|
'use_custom_mail_config' => 'YES',
|
|
'company_mail_driver' => 'postmark',
|
|
'company_mail_postmark_token' => 'existing-company-token',
|
|
], $this->companyId);
|
|
|
|
postJson('/api/v1/company/mail/company-config', [
|
|
'use_custom_mail_config' => 'NO',
|
|
])
|
|
->assertOk()
|
|
->assertJson([
|
|
'success' => true,
|
|
]);
|
|
|
|
expect(CompanySetting::getSetting('use_custom_mail_config', $this->companyId))->toBe('NO');
|
|
expect(CompanySetting::getSetting('company_mail_postmark_token', $this->companyId))
|
|
->toBe('existing-company-token');
|
|
});
|
|
|
|
test('company mail runtime apply maps postmark settings into laravel config', function () {
|
|
CompanySetting::setSettings([
|
|
'use_custom_mail_config' => 'YES',
|
|
'company_mail_driver' => 'postmark',
|
|
'company_mail_postmark_token' => 'runtime-postmark-token',
|
|
'company_mail_postmark_message_stream_id' => 'outbound',
|
|
'company_from_name' => 'Runtime Mailer',
|
|
'company_from_mail' => 'runtime@example.com',
|
|
], $this->companyId);
|
|
|
|
CompanyMailConfigService::apply($this->companyId);
|
|
|
|
expect(config('mail.default'))->toBe('postmark');
|
|
expect(config('services.postmark.token'))->toBe('runtime-postmark-token');
|
|
expect(config('mail.mailers.postmark.message_stream_id'))->toBe('outbound');
|
|
expect(config('mail.from.name'))->toBe('Runtime Mailer');
|
|
expect(config('mail.from.address'))->toBe('runtime@example.com');
|
|
});
|