Visuelle iCal-Regelengine mit Originaldaten und individuellen Exportfeldern integrieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m37s

This commit is contained in:
Lars committed 2026-10-27 19:00:25 +01:00
1 parent c4ebccbbea
commit e9db98701b
30 files changed
+1269 -15

No files matched your search

+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Actions;
use App\Channels\ChannelSyncException;
use App\Channels\ICal\ICalAnalysis;
use App\Channels\ICal\ICalConnector;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
class AnalyzeChannelCalendar
{
public function handle(Channel $channel): Channel
{
if ($channel->connector !== 'ical' || blank($channel->setting('import_url')) || ! $channel->servesItsLandlord()) {
throw new ChannelSyncException('Für die Analyse eine iCal-Importadresse hinterlegen und den Kalenderdienst freischalten.');
}
$url = $channel->setting('import_url');
$analysis = app(ICalAnalysis::class)->summarize(app(ICalConnector::class)->fetchDocument($channel));
return DB::transaction(function () use ($channel, $url, $analysis): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
if ($locked->setting('import_url') !== $url) {
throw new ChannelSyncException('Die Importadresse wurde während der Analyse geändert. Bitte erneut analysieren.');
}
$locked->forceFill(['ical_analysis' => $analysis, 'ical_analyzed_at' => now()])->save();
return $locked;
});
}
}
+72
View File
@@ -0,0 +1,72 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalRuleEngine;
use App\Models\BlockedPeriod;
use App\Models\Channel;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
class ApplyChannelRules
{
public function attributes(Channel $channel, ?BlockedPeriod $block, array $properties): array
{
$result = app(ICalRuleEngine::class)->evaluate($channel, $properties);
$attributes = ['ical_interpretation' => $result, 'ical_event_type' => $result['event_type'],
'leading_priority' => $result['representation'] === 'leading_candidate' ? max(1, 10001 - $result['priority']) : 0];
$previousOrigin = $block?->ical_interpretation['origin_channel_id'] ?? null;
if ($block === null || ($block->reviewed_at === null && ($block->origin_channel_id === null || $block->origin_channel_id === $previousOrigin))) {
$attributes['origin_channel_id'] = $result['origin_channel_id'];
}
return $attributes;
}
public function store(BlockedPeriod $block, array $attributes): void
{
foreach ($attributes as $field => $value) {
if ($block->getAttribute($field) !== $value) {
$block->forceFill([$field => $value]);
}
}
if ($block->isDirty()) {
$block->saveQuietly();
}
}
/** @return array{classified: int, missing_raw: int} */
public function handle(Channel $channel): array
{
return DB::transaction(function () use ($channel): array {
$channel = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
app(ICalRuleEngine::class)->validate($channel, $channel->ical_rules ?? []);
$channel->forceFill(['ical_active_rules' => $channel->ical_rules ?? []])->save();
Property::query()->whereKey($channel->property_id)->lockForUpdate()->firstOrFail();
$events = collect($channel->ical_analysis['events'] ?? [])->keyBy('uid');
$counts = ['classified' => 0, 'missing_raw' => 0];
foreach ($channel->blockedPeriods()->where('source', 'channel')->lockForUpdate()->get() as $block) {
$event = $events->get($block->external_uid);
if ($event && $block->ical_raw !== null && $channel->ical_analyzed_at !== null
&& $block->updated_at->greaterThan($channel->ical_analyzed_at) && $block->ical_raw !== $event['raw']) {
throw ValidationException::withMessages(['rules' => 'Der Importbestand hat sich seit der Vorschau geändert. Den Kalender erneut analysieren und die Vorschau prüfen.']);
}
$properties = $event['properties'] ?? $block->ical_properties;
if ($properties === null) {
$counts['missing_raw']++;
continue;
}
$attributes = $this->attributes($channel, $block, $properties);
if ($event && $event['starts_on'] !== null && ($block->starts_on->toDateString() !== $event['starts_on'] || $block->ends_on->toDateString() !== $event['ends_on'])) {
$attributes = [...$attributes, 'needs_review' => true, 'review_note' => 'Die Analyse meldet einen anderen Zeitraum. Die Klassifikation ändert keine Termine; Kalenderabgleich und Zuordnung prüfen.'];
}
$this->store($block, [...$attributes, 'ical_properties' => $properties, 'ical_raw' => $event['raw'] ?? $block->ical_raw]);
$counts['classified']++;
}
return $counts;
});
}
}
+3
View File
@@ -21,6 +21,9 @@ public function handle(Property $property, array $data, ?Channel $channel = null
$candidate->fill($data);
$candidate->property_id = $property->id;
$candidate->tenant_id = $property->tenant_id;
if ($stored && $stored->setting('import_url') !== $candidate->setting('import_url')) {
$candidate->forceFill(['ical_analysis' => null, 'ical_analyzed_at' => null]);
}
if ($stored) {
$candidate->is_active = $candidate->status === ChannelStatus::Active;
}
+36
View File
@@ -0,0 +1,36 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalExportFields;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class ConfigureChannelExport
{
public function handle(Channel $channel, array $mapping, bool $allowNames): Channel
{
Validator::make(['export_mapping' => $mapping], [
'export_mapping' => ['array', 'max:3'],
'export_mapping.*.field' => ['required', 'distinct', Rule::in(array_keys(ICalExportFields::ICAL_FIELDS))],
'export_mapping.*.items' => ['required', 'array', 'min:1'],
'export_mapping.*.items.*' => ['required', Rule::in(array_keys(ICalExportFields::FIELDS))],
'export_mapping.*.separator' => ['nullable', 'string', 'max:30'],
])->validate();
foreach ($mapping as $row) {
if (! $allowNames && array_intersect($row['items'], ['guest_first_name', 'guest_full_name']) !== []) {
throw ValidationException::withMessages(['export_names' => 'Für Gastnamen die Namensweitergabe an genau diesen Zielkanal ausdrücklich einschalten.']);
}
}
return DB::transaction(function () use ($channel, $mapping, $allowNames): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
$locked->forceFill(['ical_export_mapping' => array_values($mapping), 'ical_export_names' => $allowNames])->save();
return $locked;
});
}
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalRuleEngine;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
class SaveChannelRules
{
public function handle(Channel $channel, array $rules): Channel
{
return DB::transaction(function () use ($channel, $rules): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
$validated = app(ICalRuleEngine::class)->validate($locked, $rules);
$locked->forceFill(['ical_rules' => $validated])->save();
return $locked;
});
}
}
+7 -1
View File
@@ -66,6 +66,7 @@ public function handle(Channel $channel): ChannelSyncLog
$attributes = ['property_id' => $channel->property_id, 'starts_on' => $period->startsOn->toDateString(),
'ends_on' => $period->endsOn->toDateString(), 'reason' => $channel->name, 'source' => 'channel',
'external_uid' => $period->uid, 'missing_imports' => 0];
$interpretation = $period->properties !== [] ? app(ApplyChannelRules::class)->attributes($locked, $block ?? $matchedMail, $period->properties) : [];
if ($matchedMail) {
$block = $matchedMail;
$block->update($attributes);
@@ -85,9 +86,14 @@ public function handle(Channel $channel): ChannelSyncLog
$overlap = $channel->property->blockedPeriods()->occupying()->overlapping($period->startsOn, $period->endsOn)->exists()
|| $channel->property->bookings()->occupying()->overlapping($period->startsOn, $period->endsOn)->exists();
$attributes['export_approved'] = ! $overlap && $locked->echo_behavior !== ChannelEchoBehavior::Reexports;
$block = $channel->blockedPeriods()->create($attributes);
$block = new BlockedPeriod($attributes);
$block->forceFill($interpretation);
$channel->blockedPeriods()->save($block);
$counts['added']++;
}
if ($period->properties !== []) {
app(ApplyChannelRules::class)->store($block, [...$interpretation, 'ical_properties' => $period->properties, 'ical_raw' => $period->raw]);
}
$existing->put($period->uid, $block);
$overlap = $channel->blockedPeriods()->occupying()->overlapping($block->starts_on, $block->ends_on)->whereKeyNot($block->id)->exists();
$foundConflicts = $block->is_representation ? [] : $this->conflictDetector->conflictsFor($block);