Mandanten Phase 3: Einstellungen, Texte und Dienste gehören dem Mandanten
Vermieterdaten, Bank, Steuerangabe, Adressen, Betriebsart und Fristen sind
Spalten von `tenants`. `App\Tenancy\TenantConfig` legt sie über
`config('fewo.*')` und `mail.from`, sobald der Mandantenkontext wechselt –
so lesen Vorlagen, Mails und der Mietvertrag weiter dieselben Schlüssel und
`resources/themes/**` bleibt unangetastet.
Die `.env` ist die Grundlinie: Rückfall, solange kein Mandant feststeht, und
Grenze für Löschfristen und Bot-Schutz (nur verschärfen, nicht lockern). Die
Flutgrenze bleibt global. Bank, Steuerangabe und eigene Dienst-Schlüssel
liegen verschlüsselt.
Die Seite System › Betrieb schreibt jetzt den Mandanten und enthält
zusätzlich Vermieterdaten, Bank und die Fristen. Tabelle `settings` und
Modell `Setting` entfallen; die Migration übernimmt die bisherigen Werte
aus `settings` und der Konfiguration in den Mandanten Stommer.
Neu: `tenant_services` (Freischaltung je Dienst mit optionalem eigenem
API-Schlüssel, nur im Betreiber-Bereich schaltbar) und `service_usages`.
Es zählt noch nichts, weil kein Dienst aufruft.
235 Feature-Tests grün. Der Umbauweg wurde zusätzlich auf einer Kopie der
lokalen Datenbank durchgespielt.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
12e4079126
commit
e6d4d89141
24 files changed
+1123
-135
No files matched your search
+24
-76
@@ -2,72 +2,37 @@
|
||||
|
||||
namespace App\Support;
|
||||
|
||||
use App\Models\Setting;
|
||||
use Illuminate\Mail\MailManager;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Throwable;
|
||||
use App\Models\Tenant;
|
||||
use App\Tenancy\TenantConfig;
|
||||
|
||||
/**
|
||||
* Operational settings from the admin (System › Betrieb), cached. The most important one: the operating mode.
|
||||
* Operating mode and addresses of the current landlord (admin page System › Betrieb, stored on the landlord).
|
||||
* In **test mode** (the default until the site is switched live) every e-mail goes to the test recipient only,
|
||||
* whatever address was entered on the website.
|
||||
* whatever address was entered on the website. Without any landlord the .env values apply.
|
||||
*/
|
||||
class Settings
|
||||
{
|
||||
public const MODE = 'operations.mode';
|
||||
|
||||
public const TEST_RECIPIENT = 'operations.test_recipient';
|
||||
|
||||
/** Comma-separated: who is informed about new requests, answered offers, portal events … */
|
||||
public const NOTIFICATION_RECIPIENTS = 'addresses.notifications';
|
||||
|
||||
/** Contact address shown on the website and in the contract; reply-to of guest mails. */
|
||||
public const CONTACT_EMAIL = 'addresses.contact';
|
||||
|
||||
public const SENDER_EMAIL = 'addresses.sender_email';
|
||||
|
||||
public const SENDER_NAME = 'addresses.sender_name';
|
||||
|
||||
public const MODE_TEST = 'test';
|
||||
|
||||
public const MODE_LIVE = 'live';
|
||||
|
||||
private const CACHE_KEY = 'settings.all';
|
||||
|
||||
public static function get(string $key, ?string $default = null): ?string
|
||||
{
|
||||
try {
|
||||
$values = Cache::rememberForever(self::CACHE_KEY, fn (): array => Setting::query()->pluck('value', 'key')->all());
|
||||
} catch (Throwable) {
|
||||
return $default; // e.g. before the migrations ran
|
||||
}
|
||||
|
||||
return $values[$key] ?? $default;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, ?string> $values
|
||||
* The landlord of the context, else the only landlord.
|
||||
*/
|
||||
public static function save(array $values): void
|
||||
public static function tenant(): ?Tenant
|
||||
{
|
||||
foreach ($values as $key => $value) {
|
||||
Setting::query()->updateOrCreate(['key' => $key], ['value' => $value]);
|
||||
}
|
||||
|
||||
Cache::forget(self::CACHE_KEY);
|
||||
self::applyAddressOverrides();
|
||||
self::applyMailRouting();
|
||||
return app(TenantConfig::class)->effectiveTenant();
|
||||
}
|
||||
|
||||
/**
|
||||
* The recipients of internal notifications (admin setting, else FEWO_NOTIFICATION_EMAIL).
|
||||
* The recipients of internal notifications (the landlord's setting, else FEWO_NOTIFICATION_EMAIL while no landlord is known).
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
public static function notificationRecipients(): array
|
||||
{
|
||||
return self::addressList(self::get(self::NOTIFICATION_RECIPIENTS) ?: (string) config('fewo.notification_email'));
|
||||
return self::tenant()?->notificationRecipients()
|
||||
?: self::addressList((string) config('fewo.notification_email'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -83,25 +48,9 @@ public static function addressList(?string $value): array
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Admin settings for the contact address and the sender override the .env values for this request.
|
||||
*/
|
||||
public static function applyAddressOverrides(): void
|
||||
{
|
||||
$overrides = array_filter([
|
||||
'fewo.owner.email' => self::get(self::CONTACT_EMAIL),
|
||||
'mail.from.address' => self::get(self::SENDER_EMAIL),
|
||||
'mail.from.name' => self::get(self::SENDER_NAME),
|
||||
]);
|
||||
|
||||
if ($overrides !== []) {
|
||||
config($overrides);
|
||||
}
|
||||
}
|
||||
|
||||
public static function isLive(): bool
|
||||
{
|
||||
return self::get(self::MODE, self::MODE_TEST) === self::MODE_LIVE;
|
||||
return (self::tenant()?->operating_mode ?? self::MODE_TEST) === self::MODE_LIVE;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,34 +58,33 @@ public static function isLive(): bool
|
||||
* FEWO_MAIL_REDIRECT_TO in .env always wins (hard override for test servers).
|
||||
*/
|
||||
public static function mailRedirect(): ?string
|
||||
{
|
||||
return self::mailRedirectFor(self::tenant());
|
||||
}
|
||||
|
||||
public static function mailRedirectFor(?Tenant $tenant): ?string
|
||||
{
|
||||
$override = config('fewo.mail_redirect_to');
|
||||
if (filled($override)) {
|
||||
return (string) $override;
|
||||
}
|
||||
|
||||
if (self::isLive()) {
|
||||
if ($tenant?->isLive()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return self::get(self::TEST_RECIPIENT) ?: (self::notificationRecipients()[0] ?? null);
|
||||
// A landlord without any address of their own must not fall through to normal delivery: the operator's
|
||||
// address catches the mails until the landlord has entered their own.
|
||||
$recipients = $tenant?->notificationRecipients() ?: self::addressList((string) config('fewo.notification_email'));
|
||||
|
||||
return $tenant?->test_recipient ?: ($recipients[0] ?? null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies the redirect to the mailer; called at boot and after saving.
|
||||
* Applies the redirect of the current landlord to the mailer; called after saving.
|
||||
*/
|
||||
public static function applyMailRouting(): void
|
||||
{
|
||||
$manager = Mail::getFacadeRoot();
|
||||
if (! $manager instanceof MailManager) {
|
||||
return; // Mail::fake() in tests
|
||||
}
|
||||
|
||||
$redirect = self::mailRedirect();
|
||||
$manager->purge();
|
||||
|
||||
if (filled($redirect)) {
|
||||
$manager->alwaysTo($redirect);
|
||||
}
|
||||
app(TenantConfig::class)->refresh();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user