From fd6860efdaacdad54194fddecf0e71a9c4b62cdb Mon Sep 17 00:00:00 2001 From: Lars Date: Sun, 15 Nov 2026 09:04:08 +0100 Subject: [PATCH] =?UTF-8?q?=C3=96ffne=20Katalog,=20Bibliothek=20und=20Test?= =?UTF-8?q?kauf=20f=C3=BCr=20den=20MVP.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .env.example | 2 + app/Domain/Catalog/ContentService.php | 14 +- app/Domain/Commerce/Checkout.php | 187 ++++++++++++++++++ app/Domain/Commerce/Order.php | 39 ++++ app/Domain/Commerce/OrderLine.php | 35 ++++ app/Domain/Commerce/OrderScopeItem.php | 34 ++++ app/Domain/Commerce/Payment.php | 21 ++ app/Domain/Entitlement/AccessResult.php | 12 ++ app/Domain/Entitlement/DecideAccess.php | 81 ++++++++ app/Domain/Entitlement/GrantIssuer.php | 132 +++++++++++++ app/Domain/Entitlement/ManualGrant.php | 34 ++++ .../Resources/Bundles/BundleResource.php | 51 +++++ .../Resources/Bundles/Pages/ListBundles.php | 58 ++++++ .../Compositions/CompositionResource.php | 51 +++++ .../Compositions/Pages/ListCompositions.php | 72 +++++++ .../ContentElementResource.php | 62 ++++++ .../Pages/ListContentElements.php | 74 +++++++ .../LicenseArticleResource.php | 61 ++++++ .../Pages/ListLicenseArticles.php | 62 ++++++ .../Resources/Offers/OfferResource.php | 51 +++++ .../Resources/Offers/Pages/ListOffers.php | 78 ++++++++ .../Pages/ListRightsProfiles.php | 53 +++++ .../RightsProfiles/RightsProfileResource.php | 51 +++++ .../Resources/Users/Pages/EditUser.php | 39 ++++ app/Filament/Support/CatalogOptions.php | 100 ++++++++++ app/Filament/Support/ReportsDomainRules.php | 19 ++ .../Auth/EmailVerificationController.php | 2 + .../Controllers/Member/CheckoutController.php | 100 ++++++++++ .../Controllers/Member/LibraryController.php | 117 +++++++++++ .../Controllers/Member/MemberController.php | 15 -- app/Jobs/StoreContentFile.php | 58 ++++++ app/Mail/OrderConfirmed.php | 27 +++ config/services.php | 4 + ...26_11_15_120000_create_commerce_tables.php | 71 +++++++ database/seeders/DemoCatalogSeeder.php | 69 +++++++ deploy/luf.env.example | 3 + docs/betrieb/MVP-Stand.md | 25 +++ resources/css/app.css | 20 ++ .../views/mail/order-confirmed.blade.php | 1 + resources/views/member/article.blade.php | 29 +++ resources/views/member/dashboard.blade.php | 2 +- resources/views/member/grants.blade.php | 18 +- resources/views/member/library.blade.php | 18 +- resources/views/member/materials.blade.php | 21 +- resources/views/member/offers.blade.php | 36 ++++ resources/views/member/order.blade.php | 31 +++ resources/views/member/partials/nav.blade.php | 1 + resources/views/member/read.blade.php | 11 ++ routes/web.php | 19 +- scripts/deploy.sh | 4 + tests/Feature/MembershipAccessTest.php | 187 ++++++++++++++++++ 51 files changed, 2331 insertions(+), 31 deletions(-) create mode 100644 app/Domain/Commerce/Checkout.php create mode 100644 app/Domain/Commerce/Order.php create mode 100644 app/Domain/Commerce/OrderLine.php create mode 100644 app/Domain/Commerce/OrderScopeItem.php create mode 100644 app/Domain/Commerce/Payment.php create mode 100644 app/Domain/Entitlement/AccessResult.php create mode 100644 app/Domain/Entitlement/DecideAccess.php create mode 100644 app/Domain/Entitlement/GrantIssuer.php create mode 100644 app/Domain/Entitlement/ManualGrant.php create mode 100644 app/Filament/Resources/Bundles/BundleResource.php create mode 100644 app/Filament/Resources/Bundles/Pages/ListBundles.php create mode 100644 app/Filament/Resources/Compositions/CompositionResource.php create mode 100644 app/Filament/Resources/Compositions/Pages/ListCompositions.php create mode 100644 app/Filament/Resources/ContentElements/ContentElementResource.php create mode 100644 app/Filament/Resources/ContentElements/Pages/ListContentElements.php create mode 100644 app/Filament/Resources/LicenseArticles/LicenseArticleResource.php create mode 100644 app/Filament/Resources/LicenseArticles/Pages/ListLicenseArticles.php create mode 100644 app/Filament/Resources/Offers/OfferResource.php create mode 100644 app/Filament/Resources/Offers/Pages/ListOffers.php create mode 100644 app/Filament/Resources/RightsProfiles/Pages/ListRightsProfiles.php create mode 100644 app/Filament/Resources/RightsProfiles/RightsProfileResource.php create mode 100644 app/Filament/Support/CatalogOptions.php create mode 100644 app/Filament/Support/ReportsDomainRules.php create mode 100644 app/Http/Controllers/Member/CheckoutController.php create mode 100644 app/Http/Controllers/Member/LibraryController.php create mode 100644 app/Jobs/StoreContentFile.php create mode 100644 app/Mail/OrderConfirmed.php create mode 100644 database/migrations/2026_11_15_120000_create_commerce_tables.php create mode 100644 database/seeders/DemoCatalogSeeder.php create mode 100644 docs/betrieb/MVP-Stand.md create mode 100644 resources/views/mail/order-confirmed.blade.php create mode 100644 resources/views/member/article.blade.php create mode 100644 resources/views/member/offers.blade.php create mode 100644 resources/views/member/order.blade.php create mode 100644 resources/views/member/read.blade.php create mode 100644 tests/Feature/MembershipAccessTest.php diff --git a/.env.example b/.env.example index 5c4c35e..f8df09f 100644 --- a/.env.example +++ b/.env.example @@ -64,6 +64,8 @@ AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" +PAYMENT_DRIVER=test + # Leer lassen. Lokal gilt dann storage/. Im Container setzt Compose den Host-Mount (/srv/luf//media/...). MEDIA_PUBLIC_PATH= MEDIA_DERIVED_PATH= diff --git a/app/Domain/Catalog/ContentService.php b/app/Domain/Catalog/ContentService.php index ec6da25..5da5979 100644 --- a/app/Domain/Catalog/ContentService.php +++ b/app/Domain/Catalog/ContentService.php @@ -2,6 +2,7 @@ namespace App\Domain\Catalog; +use App\Jobs\StoreContentFile; use App\Models\User; use Illuminate\Support\Facades\DB; @@ -29,10 +30,10 @@ public function publishElementVersion( } $number = ((int) $element->versions()->max('number')) + 1; - - return $element->versions()->create([ + $incoming = $metadata['incoming'] ?? null; + $version = $element->versions()->create([ 'number' => $number, - 'status' => ContentVersionStatus::Bereit, + 'status' => is_string($incoming) && $incoming !== '' ? ContentVersionStatus::Entwurf : ContentVersionStatus::Bereit, 'content_hash' => hash('sha256', json_encode([ 'body' => $body, 'metadata' => $metadata, @@ -41,6 +42,13 @@ public function publishElementVersion( 'metadata' => $metadata === [] ? null : $metadata, 'change_note' => $changeNote, ]); + + if (is_string($incoming) && $incoming !== '') { + StoreContentFile::dispatch($version->id, $incoming); + $version->refresh(); + } + + return $version; } /** diff --git a/app/Domain/Commerce/Checkout.php b/app/Domain/Commerce/Checkout.php new file mode 100644 index 0000000..1064fa5 --- /dev/null +++ b/app/Domain/Commerce/Checkout.php @@ -0,0 +1,187 @@ +status !== AccountStatus::Aktiv || $user->party_id === null) { + throw new DomainRuleException('Nur ein aktives Mitglied kann kaufen.'); + } + + $version = $offer->versions()->where('status', OfferStatus::Aktiv)->orderByDesc('number')->first(); + + if ($version === null || $version->grant_kind !== 'kauf' || $version->holder_kind !== 'person') { + throw new DomainRuleException('Dieses Angebot kann nicht als persönlicher Kauf bestellt werden.'); + } + + if ($version->price_cents === null) { + throw new DomainRuleException('Der Kauf braucht einen Preis an der Angebotsfassung.'); + } + + return DB::transaction(function () use ($user, $version): Order { + $order = Order::query()->create([ + 'user_id' => $user->id, + 'party_id' => $user->party_id, + 'status' => 'offen', + 'holder_kind' => 'person', + ]); + $line = $order->lines()->create([ + 'offer_version_id' => $version->id, + 'price_cents' => $version->price_cents, + 'term_rule' => $version->term_rule, + 'update_promise' => $version->update_promise, + 'holder_kind' => $version->holder_kind, + ]); + $version->load('resolvedScopes.rights'); + + foreach ($version->resolvedScopes as $scope) { + $line->scopeItems()->create([ + 'license_article_id' => $scope->license_article_id, + 'rights_profile_version_id' => $scope->rights_profile_version_id, + 'rights_snapshot' => [ + 'purpose' => $scope->rights->purpose, + 'capabilities' => $scope->rights->capabilities, + 'options' => $scope->rights->options ?? [], + ], + ]); + } + + return $order->load('lines.scopeItems'); + }); + } + + public function confirmTestPayment(Order $order, string $reference): Order + { + $this->assertTestDriver(); + $reference = trim($reference); + + if ($reference === '') { + throw new DomainRuleException('Die Zahlungsreferenz fehlt.'); + } + + $paidNow = false; + $order = DB::transaction(function () use ($order, $reference, &$paidNow): Order { + $order = Order::query()->lockForUpdate()->findOrFail($order->id); + + if ($order->status === 'bezahlt') { + return $order->load('lines', 'payments'); + } + + if ($order->status !== 'offen') { + throw new DomainRuleException('Diese Bestellung nimmt keine Zahlung mehr an.'); + } + + $order->payments()->create([ + 'provider' => 'test', + 'status' => 'bestaetigt', + 'provider_reference' => $reference, + ]); + $order->status = 'bezahlt'; + $order->save(); + $paidNow = true; + $line = $order->lines()->firstOrFail(); + $this->grants->issue( + $order->user, + $line->offerVersion, + AcquisitionType::Bestellposition, + 'order_line', + $line->id, + ); + + return $order->load('lines', 'payments'); + }); + + if ($paidNow) { + Mail::to($order->user)->send(new OrderConfirmed($order)); + } + + return $order; + } + + public function failTestPayment(Order $order, string $reference): Order + { + $this->assertTestDriver(); + + return DB::transaction(function () use ($order, $reference): Order { + $order = Order::query()->lockForUpdate()->findOrFail($order->id); + + if ($order->status !== 'offen') { + return $order; + } + + $order->payments()->create([ + 'provider' => 'test', + 'status' => 'fehlgeschlagen', + 'provider_reference' => $reference, + ]); + $order->status = 'fehlgeschlagen'; + $order->save(); + + return $order; + }); + } + + public function refund(Order $order, string $reason): Order + { + $reason = trim($reason); + + if ($reason === '') { + throw new DomainRuleException('Eine Erstattung braucht eine Begründung.'); + } + + return DB::transaction(function () use ($order, $reason): Order { + $order = Order::query()->lockForUpdate()->findOrFail($order->id); + + if ($order->status !== 'bezahlt') { + throw new DomainRuleException('Nur eine bezahlte Bestellung kann erstattet werden.'); + } + + $line = $order->lines()->firstOrFail(); + $acquisition = Acquisition::query()->where([ + 'type' => AcquisitionType::Bestellposition, + 'reference_type' => 'order_line', + 'reference_id' => $line->id, + ])->first(); + + if ($acquisition !== null) { + foreach ($acquisition->grants as $grant) { + if ($grant->status === GrantStatus::Aktiv) { + $grant->status = GrantStatus::Widerrufen; + $grant->status_reason = $reason; + $grant->save(); + } + } + } + + $order->payments()->where('status', 'bestaetigt')->update(['status' => 'erstattet']); + $order->status = 'erstattet'; + $order->save(); + + return $order->refresh(); + }); + } + + private function assertTestDriver(): void + { + if (app()->isProduction() || config('services.payment.driver') !== 'test') { + throw new DomainRuleException('Der Testzahlungsweg ist nicht aktiv.'); + } + } +} diff --git a/app/Domain/Commerce/Order.php b/app/Domain/Commerce/Order.php new file mode 100644 index 0000000..50d8254 --- /dev/null +++ b/app/Domain/Commerce/Order.php @@ -0,0 +1,39 @@ +belongsTo(User::class); + } + + public function party(): BelongsTo + { + return $this->belongsTo(Party::class); + } + + public function lines(): HasMany + { + return $this->hasMany(OrderLine::class); + } + + public function payments(): HasMany + { + return $this->hasMany(Payment::class); + } +} diff --git a/app/Domain/Commerce/OrderLine.php b/app/Domain/Commerce/OrderLine.php new file mode 100644 index 0000000..6ce4cc9 --- /dev/null +++ b/app/Domain/Commerce/OrderLine.php @@ -0,0 +1,35 @@ +belongsTo(Order::class); + } + + public function offerVersion(): BelongsTo + { + return $this->belongsTo(OfferVersion::class); + } + + public function scopeItems(): HasMany + { + return $this->hasMany(OrderScopeItem::class); + } +} diff --git a/app/Domain/Commerce/OrderScopeItem.php b/app/Domain/Commerce/OrderScopeItem.php new file mode 100644 index 0000000..3456231 --- /dev/null +++ b/app/Domain/Commerce/OrderScopeItem.php @@ -0,0 +1,34 @@ + 'array', + ]; + } + + public function line(): BelongsTo + { + return $this->belongsTo(OrderLine::class, 'order_line_id'); + } + + public function article(): BelongsTo + { + return $this->belongsTo(LicenseArticle::class, 'license_article_id'); + } +} diff --git a/app/Domain/Commerce/Payment.php b/app/Domain/Commerce/Payment.php new file mode 100644 index 0000000..782f04a --- /dev/null +++ b/app/Domain/Commerce/Payment.php @@ -0,0 +1,21 @@ +belongsTo(Order::class); + } +} diff --git a/app/Domain/Entitlement/AccessResult.php b/app/Domain/Entitlement/AccessResult.php new file mode 100644 index 0000000..5ad26bf --- /dev/null +++ b/app/Domain/Entitlement/AccessResult.php @@ -0,0 +1,12 @@ +status !== AccountStatus::Aktiv) { + return new AccessResult(false, null, 'Das Konto ist nicht aktiv.'); + } + + if ($release->license_article_id !== $article->id) { + return new AccessResult(false, null, 'Der Stand gehört zu einem anderen Artikel.'); + } + + if (! in_array($release->status, [ReleaseStatus::Veroeffentlicht, ReleaseStatus::AbgeloestVerfuegbar], true)) { + return new AccessResult(false, null, 'Dieser Stand ist nicht freigegeben.'); + } + + $contained = $release->contents()->where('content_element_version_id', $version->id)->exists(); + + if (! $contained) { + return new AccessResult(false, null, 'Die Fassung gehört nicht zum fixierten Inhalt dieses Stands.'); + } + + if ($version->status === ContentVersionStatus::Gesperrt) { + return new AccessResult(false, null, 'Die Fassung ist gesperrt.'); + } + + $version->loadMissing('element'); + $outputClass = $version->element->output_class; + $now = now(); + $candidates = Grant::query() + ->where('license_article_id', $article->id) + ->where('status', GrantStatus::Aktiv) + ->whereHas('acquisition', fn ($query) => $query->where('party_id', $user->party_id)) + ->get() + ->filter(function (Grant $grant) use ($now): bool { + if ($grant->valid_from !== null && $grant->valid_from->greaterThan($now)) { + return false; + } + + return $grant->valid_until === null || $grant->valid_until->greaterThan($now); + }) + ->filter(function (Grant $grant) use ($outputClass, $action): bool { + $capabilities = $grant->rights_snapshot['capabilities'] ?? []; + $actions = $capabilities[$outputClass] ?? []; + + return in_array($action, $actions, true); + }) + ->sort(function (Grant $left, Grant $right): int { + $leftUntil = $left->valid_until?->getTimestamp() ?? PHP_INT_MAX; + $rightUntil = $right->valid_until?->getTimestamp() ?? PHP_INT_MAX; + + return $leftUntil === $rightUntil ? $right->id <=> $left->id : $leftUntil <=> $rightUntil; + }) + ->values(); + + $grant = $candidates->last(); + + if ($grant === null) { + return new AccessResult(false, null, 'Keine passende Berechtigung.'); + } + + return new AccessResult(true, $grant); + } +} diff --git a/app/Domain/Entitlement/GrantIssuer.php b/app/Domain/Entitlement/GrantIssuer.php new file mode 100644 index 0000000..da69f93 --- /dev/null +++ b/app/Domain/Entitlement/GrantIssuer.php @@ -0,0 +1,132 @@ +activeVersion($offer); + + if (! in_array($version->grant_kind, ['auf_abruf', 'bei_registrierung'], true)) { + throw new DomainRuleException('Dieses Angebot wird nicht frei vergeben.'); + } + + if ($version->holder_kind !== 'person') { + throw new DomainRuleException('Dieses Angebot richtet sich nicht an Personen.'); + } + + return $this->issue($user, $version, AcquisitionType::FreierAbruf, 'offer', $offer->id); + } + + public function grantRegistrationOffers(User $user): void + { + OfferVersion::query() + ->where('status', OfferStatus::Aktiv) + ->where('grant_kind', 'bei_registrierung') + ->where('holder_kind', 'person') + ->with('offer') + ->get() + ->each(function (OfferVersion $version) use ($user): void { + $this->issue($user, $version, AcquisitionType::FreierAbruf, 'offer', $version->offer_id); + }); + } + + public function grantManually(User $user, Offer $offer, User $actor, string $reason): Acquisition + { + $reason = trim($reason); + + if ($reason === '') { + throw new DomainRuleException('Eine manuelle Vergabe braucht eine Begründung.'); + } + + $version = $this->activeVersion($offer); + + if ($version->holder_kind !== 'person') { + throw new DomainRuleException('Dieses Angebot richtet sich nicht an Personen.'); + } + + return DB::transaction(function () use ($user, $offer, $actor, $reason, $version): Acquisition { + $operation = ManualGrant::query()->create([ + 'actor_id' => $actor->id, + 'party_id' => $user->party_id, + 'offer_id' => $offer->id, + 'reason' => $reason, + ]); + + return $this->issue($user, $version, AcquisitionType::ManuelleVergabe, 'manual_grant', $operation->id); + }); + } + + public function issue( + User $user, + OfferVersion $version, + AcquisitionType $type, + string $referenceType, + int $referenceId, + ): Acquisition { + return DB::transaction(function () use ($user, $version, $type, $referenceType, $referenceId): Acquisition { + $existing = Acquisition::query()->where([ + 'party_id' => $user->party_id, + 'type' => $type, + 'reference_type' => $referenceType, + 'reference_id' => $referenceId, + ])->first(); + + if ($existing !== null) { + return $existing->load('grants'); + } + + $acquisition = Acquisition::query()->create([ + 'party_id' => $user->party_id, + 'type' => $type, + 'reference_type' => $referenceType, + 'reference_id' => $referenceId, + 'conditions' => [ + 'term_rule' => $version->term_rule, + 'update_promise' => $version->update_promise, + 'holder_kind' => $version->holder_kind, + 'offer_version_id' => $version->id, + ], + ]); + + $version->load('resolvedScopes.rights', 'resolvedScopes.article'); + + foreach ($version->resolvedScopes as $scope) { + $rights = $scope->rights; + $acquisition->grants()->create([ + 'license_article_id' => $scope->license_article_id, + 'rights_profile_version_id' => $rights->id, + 'rights_snapshot' => [ + 'purpose' => $rights->purpose, + 'capabilities' => $rights->capabilities, + 'options' => $rights->options ?? [], + ], + 'release_at_grant_id' => $scope->article->current_release_id, + 'status' => GrantStatus::Aktiv, + 'valid_from' => now(), + ]); + } + + return $acquisition->load('grants'); + }); + } + + private function activeVersion(Offer $offer): OfferVersion + { + $version = $offer->versions()->where('status', OfferStatus::Aktiv)->orderByDesc('number')->first(); + + if ($version === null) { + throw new DomainRuleException('Das Angebot hat keine aktive Fassung.'); + } + + return $version; + } +} diff --git a/app/Domain/Entitlement/ManualGrant.php b/app/Domain/Entitlement/ManualGrant.php new file mode 100644 index 0000000..f3a412c --- /dev/null +++ b/app/Domain/Entitlement/ManualGrant.php @@ -0,0 +1,34 @@ +belongsTo(User::class, 'actor_id'); + } + + public function party(): BelongsTo + { + return $this->belongsTo(Party::class); + } + + public function offer(): BelongsTo + { + return $this->belongsTo(Offer::class); + } +} diff --git a/app/Filament/Resources/Bundles/BundleResource.php b/app/Filament/Resources/Bundles/BundleResource.php new file mode 100644 index 0000000..58bfba2 --- /dev/null +++ b/app/Filament/Resources/Bundles/BundleResource.php @@ -0,0 +1,51 @@ +columns([ + TextColumn::make('name')->label('Name')->searchable(), + TextColumn::make('versions_count')->counts('versions')->label('Fassungen'), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListBundles::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/Bundles/Pages/ListBundles.php b/app/Filament/Resources/Bundles/Pages/ListBundles.php new file mode 100644 index 0000000..573d480 --- /dev/null +++ b/app/Filament/Resources/Bundles/Pages/ListBundles.php @@ -0,0 +1,58 @@ +label('Paket anlegen')->schema([ + TextInput::make('name')->label('Name')->required(), + ])->action(function (array $data): void { + $this->report(function () use ($data): void { + app(BundleService::class)->create($data['name']); + }, 'Das Paket ist angelegt.'); + }), + Action::make('publish')->label('Fassung veröffentlichen')->schema([ + Select::make('bundle_id')->label('Paket')->options(fn (): array => CatalogOptions::bundles())->required(), + CheckboxList::make('articles')->label('Lizenzartikel')->options(fn (): array => CatalogOptions::articles()), + CheckboxList::make('bundles')->label('Enthaltene Pakete')->options(fn (): array => CatalogOptions::bundles()), + ])->action(function (array $data): void { + $this->report(function () use ($data): void { + $items = []; + + foreach ($data['articles'] ?? [] as $id) { + $items[] = LicenseArticle::query()->findOrFail($id); + } + + foreach ($data['bundles'] ?? [] as $id) { + if ((int) $id === (int) $data['bundle_id']) { + continue; + } + + $items[] = Bundle::query()->findOrFail($id); + } + + app(BundleService::class)->publish(Bundle::query()->findOrFail($data['bundle_id']), $items); + }, 'Die Paketfassung ist veröffentlicht.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/Compositions/CompositionResource.php b/app/Filament/Resources/Compositions/CompositionResource.php new file mode 100644 index 0000000..71fc92b --- /dev/null +++ b/app/Filament/Resources/Compositions/CompositionResource.php @@ -0,0 +1,51 @@ +columns([ + TextColumn::make('designation')->label('Bezeichnung')->searchable(), + TextColumn::make('versions_count')->counts('versions')->label('Fassungen'), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListCompositions::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/Compositions/Pages/ListCompositions.php b/app/Filament/Resources/Compositions/Pages/ListCompositions.php new file mode 100644 index 0000000..1bd265c --- /dev/null +++ b/app/Filament/Resources/Compositions/Pages/ListCompositions.php @@ -0,0 +1,72 @@ +label('Komposition anlegen') + ->visible(fn (): bool => ContentElementResource::editor()) + ->schema([ + TextInput::make('designation')->label('Bezeichnung')->required(), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + app(ContentService::class)->createComposition($data['designation']); + }, 'Die Komposition ist angelegt.'); + }), + Action::make('publish') + ->label('Fassung veröffentlichen') + ->visible(fn (): bool => ContentElementResource::editor()) + ->schema([ + Select::make('composition_id')->label('Komposition')->options(fn (): array => CatalogOptions::compositions())->required(), + Repeater::make('members')->label('Mitglieder')->schema([ + TextInput::make('role')->label('Rolle')->required(), + Select::make('target')->label('Fassung')->options(fn (): array => CatalogOptions::readyTargets())->required(), + ])->minItems(1), + TextInput::make('note')->label('Bestätigungsnotiz'), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + $members = []; + + foreach ($data['members'] as $member) { + [$type, $id] = explode(':', $member['target'], 2); + $target = $type === 'composition' + ? CompositionVersion::query()->findOrFail($id) + : ContentElementVersion::query()->findOrFail($id); + $members[] = ['role' => $member['role'], 'target' => $target]; + } + + app(ContentService::class)->publishComposition( + Composition::query()->findOrFail($data['composition_id']), + $members, + auth()->user(), + $data['note'] ?? null, + ); + }, 'Die Kompositionsfassung ist bestätigt und bereit.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/ContentElements/ContentElementResource.php b/app/Filament/Resources/ContentElements/ContentElementResource.php new file mode 100644 index 0000000..310827c --- /dev/null +++ b/app/Filament/Resources/ContentElements/ContentElementResource.php @@ -0,0 +1,62 @@ +user(); + + return $user instanceof User && $user->hasStaffRole(StaffRole::Redakteur); + } + + public static function form(Schema $schema): Schema + { + return $schema; + } + + public static function table(Table $table): Table + { + return $table->columns([ + TextColumn::make('working_title')->label('Arbeitstitel')->searchable(), + TextColumn::make('kind')->label('Art'), + TextColumn::make('output_class')->label('Ausgabeklasse'), + TextColumn::make('versions_count')->counts('versions')->label('Fassungen'), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListContentElements::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/ContentElements/Pages/ListContentElements.php b/app/Filament/Resources/ContentElements/Pages/ListContentElements.php new file mode 100644 index 0000000..1b38b98 --- /dev/null +++ b/app/Filament/Resources/ContentElements/Pages/ListContentElements.php @@ -0,0 +1,74 @@ +label('Element anlegen') + ->visible(fn (): bool => ContentElementResource::editor()) + ->schema([ + TextInput::make('working_title')->label('Arbeitstitel')->required(), + Select::make('kind')->label('Art')->options([ + 'film' => 'Film', + 'audio' => 'Audio', + 'bild' => 'Bild', + 'pdf' => 'PDF', + 'text' => 'Text', + 'aufgabe' => 'Aufgabe', + ])->required(), + Select::make('output_class')->label('Ausgabeklasse')->options([ + 'film' => 'Film', + 'audio' => 'Audio', + 'bild' => 'Bild', + 'pdf' => 'PDF', + 'text' => 'Text', + ])->required(), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + app(ContentService::class)->createElement($data['kind'], $data['output_class'], $data['working_title']); + }, 'Das Inhaltselement ist angelegt.'); + }), + Action::make('version') + ->label('Fassung veröffentlichen') + ->visible(fn (): bool => ContentElementResource::editor()) + ->schema([ + Select::make('element_id')->label('Element')->options(fn (): array => CatalogOptions::elements())->required(), + Textarea::make('body')->label('Text'), + FileUpload::make('incoming')->label('Datei')->disk('cms_incoming')->directory('inhalte'), + TextInput::make('change_note')->label('Änderungsnotiz'), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + $metadata = filled($data['incoming'] ?? null) ? ['incoming' => $data['incoming']] : []; + app(ContentService::class)->publishElementVersion( + ContentElement::query()->findOrFail($data['element_id']), + $data['body'] ?? null, + $metadata, + $data['change_note'] ?? null, + ); + }, 'Die Fassung ist gespeichert.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/LicenseArticles/LicenseArticleResource.php b/app/Filament/Resources/LicenseArticles/LicenseArticleResource.php new file mode 100644 index 0000000..afa0862 --- /dev/null +++ b/app/Filament/Resources/LicenseArticles/LicenseArticleResource.php @@ -0,0 +1,61 @@ +user(); + + return $user instanceof User && $user->hasStaffRole(StaffRole::Katalogverwalter); + } + + public static function form(Schema $schema): Schema + { + return $schema; + } + + public static function table(Table $table): Table + { + return $table->columns([ + TextColumn::make('code')->label('Kennung')->searchable(), + TextColumn::make('product_line')->label('Produktlinie'), + TextColumn::make('currentRelease.number')->label('Aktueller Stand'), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListLicenseArticles::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/LicenseArticles/Pages/ListLicenseArticles.php b/app/Filament/Resources/LicenseArticles/Pages/ListLicenseArticles.php new file mode 100644 index 0000000..695633d --- /dev/null +++ b/app/Filament/Resources/LicenseArticles/Pages/ListLicenseArticles.php @@ -0,0 +1,62 @@ +label('Artikel anlegen') + ->schema([ + TextInput::make('code')->label('Kennung')->required(), + TextInput::make('product_line')->label('Produktlinie'), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + app(ArticleService::class)->create($data['code'], $data['product_line'] ?? null); + }, 'Der Lizenzartikel ist angelegt.'); + }), + Action::make('release') + ->label('Stand veröffentlichen') + ->schema([ + Select::make('article_id')->label('Artikel')->options(fn (): array => CatalogOptions::articles())->required(), + Select::make('root')->label('Wurzel')->options(fn (): array => CatalogOptions::readyTargets())->required(), + Textarea::make('classification')->label('Einordnung')->required(), + TextInput::make('change_note')->label('Änderungshinweis'), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + [$type, $id] = explode(':', $data['root'], 2); + $root = $type === 'composition' + ? CompositionVersion::query()->findOrFail($id) + : ContentElementVersion::query()->findOrFail($id); + app(ArticleService::class)->publishRelease( + LicenseArticle::query()->findOrFail($data['article_id']), + $root, + $data['classification'], + $data['change_note'] ?? null, + ); + }, 'Der Artikel-Stand ist veröffentlicht.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/Offers/OfferResource.php b/app/Filament/Resources/Offers/OfferResource.php new file mode 100644 index 0000000..096c676 --- /dev/null +++ b/app/Filament/Resources/Offers/OfferResource.php @@ -0,0 +1,51 @@ +columns([ + TextColumn::make('name')->label('Name')->searchable(), + TextColumn::make('versions.status')->label('Fassungen')->badge(), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListOffers::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/Offers/Pages/ListOffers.php b/app/Filament/Resources/Offers/Pages/ListOffers.php new file mode 100644 index 0000000..2c9a129 --- /dev/null +++ b/app/Filament/Resources/Offers/Pages/ListOffers.php @@ -0,0 +1,78 @@ +label('Angebot anlegen')->schema([ + TextInput::make('name')->label('Name')->required(), + ])->action(function (array $data): void { + $this->report(function () use ($data): void { + app(OfferService::class)->create($data['name']); + }, 'Das Angebot ist angelegt.'); + }), + Action::make('activate')->label('Fassung aktivieren')->schema([ + Select::make('offer_id')->label('Angebot')->options(fn (): array => CatalogOptions::offers())->required(), + Select::make('grant_kind')->label('Vergabe')->options([ + 'kauf' => 'Kauf', + 'auf_abruf' => 'Auf Abruf', + 'bei_registrierung' => 'Bei Registrierung', + ])->required(), + TextInput::make('price_cents')->label('Preis in Cent')->numeric(), + Repeater::make('lines')->label('Positionen')->schema([ + Select::make('kind')->label('Ziel')->options([ + 'article' => 'Lizenzartikel', + 'bundle' => 'Paketfassung', + ])->required()->live(), + Select::make('article_id')->label('Artikel')->options(fn (): array => CatalogOptions::articles()) + ->visible(fn (Get $get): bool => $get('kind') === 'article'), + Select::make('bundle_version_id')->label('Paketfassung')->options(fn (): array => CatalogOptions::bundleVersions()) + ->visible(fn (Get $get): bool => $get('kind') === 'bundle'), + Select::make('rights_id')->label('Rechte')->options(fn (): array => CatalogOptions::rights())->required(), + ])->minItems(1), + ])->action(function (array $data): void { + $this->report(function () use ($data): void { + $lines = []; + + foreach ($data['lines'] as $line) { + $target = $line['kind'] === 'bundle' + ? BundleVersion::query()->findOrFail($line['bundle_version_id']) + : LicenseArticle::query()->findOrFail($line['article_id']); + $lines[] = [ + 'target' => $target, + 'rights' => RightsProfileVersion::query()->findOrFail($line['rights_id']), + ]; + } + + app(OfferService::class)->activate(Offer::query()->findOrFail($data['offer_id']), $lines, [ + 'grant_kind' => $data['grant_kind'], + 'price_cents' => $data['price_cents'] === null || $data['price_cents'] === '' ? null : (int) $data['price_cents'], + 'holder_kind' => 'person', + ]); + }, 'Die Angebotsfassung ist aktiv.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/RightsProfiles/Pages/ListRightsProfiles.php b/app/Filament/Resources/RightsProfiles/Pages/ListRightsProfiles.php new file mode 100644 index 0000000..ec17ef8 --- /dev/null +++ b/app/Filament/Resources/RightsProfiles/Pages/ListRightsProfiles.php @@ -0,0 +1,53 @@ +label('Rechteprofil anlegen')->schema([ + TextInput::make('name')->label('Name')->required(), + Select::make('purpose')->label('Zweck')->options([ + 'ehrenamtlich' => 'Ehrenamtlich', + 'kommerziell' => 'Kommerziell', + 'institutionell' => 'Institutionell', + ])->required(), + CheckboxList::make('capabilities')->label('Fähigkeiten')->options([ + 'film:streamen' => 'Film streamen', + 'film:ansehen' => 'Film ansehen', + 'audio:streamen' => 'Audio streamen', + 'pdf:ansehen' => 'PDF ansehen', + 'pdf:laden' => 'PDF laden', + 'text:ansehen' => 'Text ansehen', + 'bild:ansehen' => 'Bild ansehen', + ])->required(), + ])->action(function (array $data): void { + $this->report(function () use ($data): void { + $capabilities = []; + + foreach ($data['capabilities'] as $entry) { + [$class, $action] = explode(':', $entry, 2); + $capabilities[$class][] = $action; + } + + app(OfferService::class)->createRightsProfile($data['name'], $data['purpose'], $capabilities); + }, 'Das Rechteprofil ist angelegt.'); + }), + ]; + } +} diff --git a/app/Filament/Resources/RightsProfiles/RightsProfileResource.php b/app/Filament/Resources/RightsProfiles/RightsProfileResource.php new file mode 100644 index 0000000..1b9bdab --- /dev/null +++ b/app/Filament/Resources/RightsProfiles/RightsProfileResource.php @@ -0,0 +1,51 @@ +columns([ + TextColumn::make('name')->label('Name')->searchable(), + TextColumn::make('versions.purpose')->label('Zwecke')->badge(), + ])->recordUrl(null); + } + + public static function getPages(): array + { + return [ + 'index' => ListRightsProfiles::route('/'), + ]; + } +} diff --git a/app/Filament/Resources/Users/Pages/EditUser.php b/app/Filament/Resources/Users/Pages/EditUser.php index cb9dadc..873e28e 100644 --- a/app/Filament/Resources/Users/Pages/EditUser.php +++ b/app/Filament/Resources/Users/Pages/EditUser.php @@ -2,14 +2,53 @@ namespace App\Filament\Resources\Users\Pages; +use App\Domain\Catalog\Offer; +use App\Domain\Entitlement\GrantIssuer; +use App\Domain\Identity\StaffRole; use App\Filament\Resources\Users\UserResource; +use App\Filament\Support\CatalogOptions; +use App\Filament\Support\ReportsDomainRules; +use App\Models\User; +use Filament\Actions\Action; +use Filament\Facades\Filament; +use Filament\Forms\Components\Select; +use Filament\Forms\Components\Textarea; use Filament\Resources\Pages\EditRecord; use Illuminate\Database\Eloquent\Model; class EditUser extends EditRecord { + use ReportsDomainRules; + protected static string $resource = UserResource::class; + protected function getHeaderActions(): array + { + return [ + Action::make('grant') + ->label('Berechtigung vergeben') + ->visible(function (): bool { + $actor = Filament::auth()->user(); + + return $actor instanceof User && $actor->hasStaffRole(StaffRole::Kundenbetreuung); + }) + ->schema([ + Select::make('offer_id')->label('Angebot')->options(fn (): array => CatalogOptions::offers())->required(), + Textarea::make('reason')->label('Begründung')->required(), + ]) + ->action(function (array $data): void { + $this->report(function () use ($data): void { + app(GrantIssuer::class)->grantManually( + $this->record, + Offer::query()->findOrFail($data['offer_id']), + Filament::auth()->user(), + $data['reason'], + ); + }, 'Die Berechtigung ist vergeben.'); + }), + ]; + } + /** * @param array $data * @return array diff --git a/app/Filament/Support/CatalogOptions.php b/app/Filament/Support/CatalogOptions.php new file mode 100644 index 0000000..b750c29 --- /dev/null +++ b/app/Filament/Support/CatalogOptions.php @@ -0,0 +1,100 @@ + + */ + public static function elements(): array + { + return ContentElement::query()->orderBy('working_title')->pluck('working_title', 'id')->all(); + } + + /** + * @return array + */ + public static function readyTargets(): array + { + $options = []; + + foreach (ContentElementVersion::query()->where('status', ContentVersionStatus::Bereit)->with('element')->orderBy('id')->get() as $version) { + $options['element:'.$version->id] = $version->element->working_title.' · Fassung '.$version->number; + } + + foreach (CompositionVersion::query()->where('status', ContentVersionStatus::Bereit)->with('composition')->orderBy('id')->get() as $version) { + $options['composition:'.$version->id] = $version->composition->designation.' · Fassung '.$version->number; + } + + return $options; + } + + /** + * @return array + */ + public static function compositions(): array + { + return Composition::query()->orderBy('designation')->pluck('designation', 'id')->all(); + } + + /** + * @return array + */ + public static function articles(): array + { + return LicenseArticle::query()->orderBy('code')->pluck('code', 'id')->all(); + } + + /** + * @return array + */ + public static function bundles(): array + { + return Bundle::query()->orderBy('name')->pluck('name', 'id')->all(); + } + + /** + * @return array + */ + public static function bundleVersions(): array + { + return BundleVersion::query() + ->where('status', BundleStatus::Veroeffentlicht) + ->with('bundle') + ->orderBy('id') + ->get() + ->mapWithKeys(fn (BundleVersion $version): array => [$version->id => $version->bundle->name.' · Fassung '.$version->number]) + ->all(); + } + + /** + * @return array + */ + public static function rights(): array + { + return RightsProfileVersion::query()->with('profile')->orderBy('id')->get() + ->mapWithKeys(fn (RightsProfileVersion $version): array => [$version->id => $version->profile->name.' · '.$version->purpose]) + ->all(); + } + + /** + * @return array + */ + public static function offers(): array + { + return Offer::query()->orderBy('name')->pluck('name', 'id')->all(); + } +} diff --git a/app/Filament/Support/ReportsDomainRules.php b/app/Filament/Support/ReportsDomainRules.php new file mode 100644 index 0000000..6fcd340 --- /dev/null +++ b/app/Filament/Support/ReportsDomainRules.php @@ -0,0 +1,19 @@ +title($success)->success()->send(); + } catch (DomainRuleException $exception) { + Notification::make()->title($exception->getMessage())->danger()->send(); + } + } +} diff --git a/app/Http/Controllers/Auth/EmailVerificationController.php b/app/Http/Controllers/Auth/EmailVerificationController.php index 143444f..8e6e93e 100644 --- a/app/Http/Controllers/Auth/EmailVerificationController.php +++ b/app/Http/Controllers/Auth/EmailVerificationController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Auth; +use App\Domain\Entitlement\GrantIssuer; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\EmailVerificationRequest; use Illuminate\Http\RedirectResponse; @@ -22,6 +23,7 @@ public function notice(Request $request): View|RedirectResponse public function verify(EmailVerificationRequest $request): RedirectResponse { $request->fulfill(); + app(GrantIssuer::class)->grantRegistrationOffers($request->user()); return redirect()->route('member.dashboard'); } diff --git a/app/Http/Controllers/Member/CheckoutController.php b/app/Http/Controllers/Member/CheckoutController.php new file mode 100644 index 0000000..fa70926 --- /dev/null +++ b/app/Http/Controllers/Member/CheckoutController.php @@ -0,0 +1,100 @@ +whereHas('versions', fn ($query) => $query->where('status', OfferStatus::Aktiv)->where('holder_kind', 'person')) + ->with(['versions' => fn ($query) => $query->where('status', OfferStatus::Aktiv)]) + ->orderBy('name') + ->get(); + + return view('member.offers', ['offers' => $offers]); + } + + public function claim(Request $request, Offer $offer, GrantIssuer $issuer): RedirectResponse + { + try { + $issuer->claim($request->user(), $offer); + } catch (DomainRuleException $exception) { + return back()->withErrors(['offer' => $exception->getMessage()]); + } + + return redirect()->route('member.library')->with('status', 'Das Angebot liegt in Ihrer Bibliothek.'); + } + + public function place(Request $request, Offer $offer, Checkout $checkout): RedirectResponse + { + try { + $order = $checkout->place($request->user(), $offer); + } catch (DomainRuleException $exception) { + return back()->withErrors(['offer' => $exception->getMessage()]); + } + + return redirect()->route('member.order', $order); + } + + public function show(Request $request, Order $order): View + { + abort_unless($order->user_id === $request->user()->id, 403); + $order->load('lines.offerVersion.offer', 'payments'); + + return view('member.order', [ + 'order' => $order, + 'testPayment' => ! app()->isProduction() && config('services.payment.driver') === 'test', + ]); + } + + public function confirm(Request $request, Order $order, Checkout $checkout): RedirectResponse + { + abort_unless($order->user_id === $request->user()->id, 403); + + try { + $checkout->confirmTestPayment($order, 'test-'.$order->id); + } catch (DomainRuleException $exception) { + return back()->withErrors(['payment' => $exception->getMessage()]); + } + + return redirect()->route('member.library')->with('status', 'Die Testzahlung ist bestätigt. Die Inhalte sind in der Bibliothek.'); + } + + public function fail(Request $request, Order $order, Checkout $checkout): RedirectResponse + { + abort_unless($order->user_id === $request->user()->id, 403); + + try { + $checkout->failTestPayment($order, 'test-fail-'.$order->id); + } catch (DomainRuleException $exception) { + return back()->withErrors(['payment' => $exception->getMessage()]); + } + + return redirect()->route('member.order', $order)->with('status', 'Die Testzahlung wurde abgelehnt. Es wurde keine Berechtigung vergeben.'); + } + + public function refund(Request $request, Order $order, Checkout $checkout): RedirectResponse + { + abort_unless($order->user_id === $request->user()->id, 403); + + try { + $checkout->refund($order, 'Widerruf durch das Mitglied im Testmodus'); + } catch (DomainRuleException $exception) { + return back()->withErrors(['payment' => $exception->getMessage()]); + } + + return redirect()->route('member.order', $order)->with('status', 'Die Bestellung ist erstattet. Die Berechtigungen sind widerrufen.'); + } +} diff --git a/app/Http/Controllers/Member/LibraryController.php b/app/Http/Controllers/Member/LibraryController.php new file mode 100644 index 0000000..7bca234 --- /dev/null +++ b/app/Http/Controllers/Member/LibraryController.php @@ -0,0 +1,117 @@ + $this->grantQuery($request)->with('article.currentRelease')->get(), + ]); + } + + public function materials(Request $request): View + { + return view('member.materials', [ + 'grants' => $this->grantQuery($request)->with('article.currentRelease.contents.elementVersion.element')->get(), + ]); + } + + public function grants(Request $request): View + { + return view('member.grants', [ + 'grants' => $this->grantQuery($request)->get(), + ]); + } + + public function show(Request $request, LicenseArticle $article): View + { + $release = $article->currentRelease()->with('contents.elementVersion.element')->first(); + $entries = []; + + if ($release !== null) { + foreach ($release->contents as $content) { + $version = $content->elementVersion; + $class = $version->element->output_class; + $action = $class === 'film' || $class === 'audio' ? 'streamen' : 'ansehen'; + $decision = app(DecideAccess::class)($request->user(), $article, $release, $version, $action); + $entries[] = [ + 'content' => $content, + 'version' => $version, + 'action' => $action, + 'allowed' => $decision->allowed, + 'reason' => $decision->reason, + 'url' => $decision->allowed + ? URL::temporarySignedRoute('member.media', now()->addMinutes(10), [ + 'article' => $article->id, + 'release' => $release->id, + 'version' => $version->id, + 'action' => $action, + 'reader' => $request->user()->id, + ]) + : null, + ]; + } + } + + return view('member.article', [ + 'article' => $article, + 'release' => $release, + 'entries' => $entries, + ]); + } + + public function media( + Request $request, + LicenseArticle $article, + ArticleRelease $release, + ContentElementVersion $version, + string $action, + ): View|StreamedResponse { + abort_unless(in_array($action, ['ansehen', 'streamen', 'laden'], true), 404); + abort_unless((int) $request->query('reader') === $request->user()->id, 403); + + $decision = app(DecideAccess::class)($request->user(), $article, $release, $version, $action); + abort_unless($decision->allowed, 403, $decision->reason); + + $version->loadMissing('element'); + $file = $version->metadata['file'] ?? null; + + if (! is_string($file) || $file === '' || str_contains($file, '..')) { + return view('member.read', [ + 'article' => $article, + 'version' => $version, + ]); + } + + $disk = Storage::disk('media_derived'); + abort_unless($disk->exists($file), 404); + + return $disk->response($file, basename($file), [ + 'Content-Disposition' => $action === 'laden' ? 'attachment' : 'inline', + ]); + } + + private function grantQuery(Request $request) + { + return Grant::query() + ->where('status', GrantStatus::Aktiv) + ->whereHas('acquisition', fn ($query) => $query->where('party_id', $request->user()->party_id)) + ->with('article.currentRelease') + ->orderBy('id'); + } +} diff --git a/app/Http/Controllers/Member/MemberController.php b/app/Http/Controllers/Member/MemberController.php index d8e5433..b5812db 100644 --- a/app/Http/Controllers/Member/MemberController.php +++ b/app/Http/Controllers/Member/MemberController.php @@ -15,21 +15,6 @@ public function dashboard(): View return view('member.dashboard'); } - public function library(): View - { - return view('member.library'); - } - - public function materials(): View - { - return view('member.materials'); - } - - public function grants(): View - { - return view('member.grants'); - } - public function profile(): View { return view('member.profile'); diff --git a/app/Jobs/StoreContentFile.php b/app/Jobs/StoreContentFile.php new file mode 100644 index 0000000..3947390 --- /dev/null +++ b/app/Jobs/StoreContentFile.php @@ -0,0 +1,58 @@ +source, 'inhalte/') || str_contains($this->source, '..')) { + return; + } + + $version = ContentElementVersion::query()->find($this->versionId); + + if ($version === null || $version->status !== ContentVersionStatus::Entwurf) { + return; + } + + $name = basename($this->source); + + if (preg_match('/^[A-Za-z0-9._-]+$/', $name) !== 1) { + return; + } + + $target = 'inhalte/'.$version->id.'/'.$name; + $incoming = Storage::disk('cms_incoming'); + + if (! $incoming->exists($this->source)) { + return; + } + + Storage::disk('media_derived')->put($target, $incoming->get($this->source)); + + $metadata = $version->metadata ?? []; + unset($metadata['incoming']); + $metadata['file'] = $target; + $version->metadata = $metadata; + $version->content_hash = hash('sha256', json_encode([ + 'body' => $version->body, + 'metadata' => $metadata, + ], JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE)); + $version->status = ContentVersionStatus::Bereit; + $version->save(); + } +} diff --git a/app/Mail/OrderConfirmed.php b/app/Mail/OrderConfirmed.php new file mode 100644 index 0000000..500caf0 --- /dev/null +++ b/app/Mail/OrderConfirmed.php @@ -0,0 +1,27 @@ + env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'payment' => [ + 'driver' => env('PAYMENT_DRIVER', 'test'), + ], + 'slack' => [ 'notifications' => [ 'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'), diff --git a/database/migrations/2026_11_15_120000_create_commerce_tables.php b/database/migrations/2026_11_15_120000_create_commerce_tables.php new file mode 100644 index 0000000..d418c36 --- /dev/null +++ b/database/migrations/2026_11_15_120000_create_commerce_tables.php @@ -0,0 +1,71 @@ +id(); + $table->foreignId('actor_id')->constrained('users')->restrictOnDelete(); + $table->foreignId('party_id')->constrained()->restrictOnDelete(); + $table->foreignId('offer_id')->constrained()->restrictOnDelete(); + $table->text('reason'); + $table->timestamps(); + }); + + Schema::create('orders', function (Blueprint $table) { + $table->id(); + $table->foreignId('user_id')->constrained()->restrictOnDelete(); + $table->foreignId('party_id')->constrained()->restrictOnDelete(); + $table->string('status'); + $table->string('holder_kind'); + $table->timestamps(); + }); + + Schema::create('order_lines', function (Blueprint $table) { + $table->id(); + $table->foreignId('order_id')->constrained()->cascadeOnDelete(); + $table->foreignId('offer_version_id')->constrained()->restrictOnDelete(); + $table->unsignedInteger('price_cents'); + $table->string('term_rule'); + $table->string('update_promise'); + $table->string('holder_kind'); + $table->timestamps(); + + $table->unique(['order_id', 'offer_version_id']); + }); + + Schema::create('order_scope_items', function (Blueprint $table) { + $table->id(); + $table->foreignId('order_line_id')->constrained()->cascadeOnDelete(); + $table->foreignId('license_article_id')->constrained()->restrictOnDelete(); + $table->foreignId('rights_profile_version_id')->constrained()->restrictOnDelete(); + $table->json('rights_snapshot'); + $table->timestamps(); + + $table->unique(['order_line_id', 'license_article_id', 'rights_profile_version_id'], 'order_scope_unique'); + }); + + Schema::create('payments', function (Blueprint $table) { + $table->id(); + $table->foreignId('order_id')->constrained()->cascadeOnDelete(); + $table->string('provider'); + $table->string('status'); + $table->string('provider_reference')->unique(); + $table->timestamps(); + }); + } + + public function down(): void + { + Schema::dropIfExists('payments'); + Schema::dropIfExists('order_scope_items'); + Schema::dropIfExists('order_lines'); + Schema::dropIfExists('orders'); + Schema::dropIfExists('manual_grants'); + } +}; diff --git a/database/seeders/DemoCatalogSeeder.php b/database/seeders/DemoCatalogSeeder.php new file mode 100644 index 0000000..ace6263 --- /dev/null +++ b/database/seeders/DemoCatalogSeeder.php @@ -0,0 +1,69 @@ +where('code', 'demo-merkblatt')->exists()) { + return; + } + + $content = app(ContentService::class); + $articles = app(ArticleService::class); + $bundles = app(BundleService::class); + $offers = app(OfferService::class); + + $sheet = $content->publishElementVersion( + $content->createElement('pdf', 'pdf', 'Merkblatt Alltag'), + 'Kurzer Hinweis für die Erprobung. Kein echtes Kursmaterial.', + ); + $film = $content->publishElementVersion( + $content->createElement('film', 'film', 'Übungsfilm Alltag'), + 'Für die geschützte Wiedergabe in der Verwaltung eine Filmdatei als weitere Fassung hochladen.', + ); + $inner = $content->publishComposition( + $content->createComposition('Materialsatz Alltag'), + [['role' => 'Merkblatt', 'target' => $sheet]], + ); + $exercise = $content->publishComposition( + $content->createComposition('Übung Alltag'), + [ + ['role' => 'Film', 'target' => $film], + ['role' => 'Materialsatz', 'target' => $inner], + ], + ); + + $sheetArticle = $articles->create('demo-merkblatt', 'Erprobung'); + $articles->publishRelease($sheetArticle, $sheet, 'Eigenständiges Merkblatt für die Erprobung.'); + $exerciseArticle = $articles->create('demo-uebung', 'Erprobung'); + $articles->publishRelease($exerciseArticle, $exercise, 'Übung aus Film und Materialsatz, zur Erprobung.'); + + $basis = $bundles->create('Demo Basis'); + $bundles->publish($basis, [$sheetArticle->fresh()]); + $program = $bundles->create('Demo Programm'); + $programVersion = $bundles->publish($program, [$basis, $exerciseArticle->fresh()]); + + $rights = $offers->createRightsProfile('Erprobung lesen und ansehen', 'ehrenamtlich', [ + 'pdf' => ['ansehen', 'laden'], + 'film' => ['streamen', 'ansehen'], + 'text' => ['ansehen'], + ]); + $free = $offers->create('Kostenloses Merkblatt'); + $offers->activate($free, [ + ['target' => $sheetArticle->fresh(), 'rights' => $rights], + ], ['grant_kind' => 'auf_abruf']); + $paid = $offers->create('Testkauf Programm'); + $offers->activate($paid, [ + ['target' => $programVersion, 'rights' => $rights], + ], ['grant_kind' => 'kauf', 'price_cents' => 500]); + } +} diff --git a/deploy/luf.env.example b/deploy/luf.env.example index 8fe7760..673eac8 100644 --- a/deploy/luf.env.example +++ b/deploy/luf.env.example @@ -24,4 +24,7 @@ MAIL_MAILER=log MAIL_FROM_ADDRESS="noreply@example.invalid" MAIL_FROM_NAME="${APP_NAME}" +# test bleibt der lokale Testweg. Ein echter Zahlungsdienst ist noch nicht festgelegt. +PAYMENT_DRIVER=test + # Medienpfade setzt Compose auf den Host-Mount (/srv/luf//media/...). Hier nichts eintragen. diff --git a/docs/betrieb/MVP-Stand.md b/docs/betrieb/MVP-Stand.md new file mode 100644 index 0000000..1bd1b7f --- /dev/null +++ b/docs/betrieb/MVP-Stand.md @@ -0,0 +1,25 @@ +# MVP-Stand + +Fortschritt für die fachliche Erprobung auf `develop`. Kein Ersatz für die Spezifikation. + +## Bedienbar + +- Öffentliche Seiten unter `/verwaltung` als Redakteur: Entwurf, Veröffentlichung, Wiederherstellung. +- Inhaltselemente, Fassungen und Kompositionen als Redakteur. Eine Datei wird von der Queue nach `derived/` kopiert. +- Lizenzartikel, verschachtelte Pakete, Rechteprofile und Angebote als Katalogverwalter. +- Manuelle Vergabe als Kundenbetreuung, am Benutzer in der Verwaltung. +- Registrierung, Anmeldung, kostenloser Abruf, Testkauf, Ablehnung und Widerruf im Mitgliederbereich. +- Bibliothek entscheidet je Abruf erneut. Filme mit Datei werden im Player geladen, Texte und PDF über einen kurz signierten Abruf. + +Der Systemverwalter vergibt diese Rollen und kann sie dem eigenen Konto geben. Ein Konto darf mehrere Rollen tragen. + +## Testdaten + +`DemoCatalogSeeder` legt auf der Testumgebung Merkblatt, verschachtelte Übung, zwei Pakete, ein kostenloses Angebot und den Testkauf „Testkauf Programm“ für 5,00 € an. Der Betrag ist eine Erprobungsmarke, keine Preisentscheidung. Der Seeder läuft nur bei `LUF_ENV=test` und legt nichts ein zweites Mal an. + +## Noch nicht der Zielschnitt + +- Kein adaptives Streaming, keine persönliche PDF-Kennzeichnung, kein Ausgabenachweis. +- Zahlungsdienst ist der Testweg (`PAYMENT_DRIVER=test`). Ein Anbieter ist nicht festgelegt. In Produktion ist die Testbestätigung abgewiesen. +- Organisationen, Sitzplätze, Community, Rechnungen und Erstattungen über einen Zahlungsdienst fehlen. +- Echte NAS-Dateien werden nicht automatisch eingebunden. Eine Filmdatei wird in der Verwaltung als Fassung hochgeladen. diff --git a/resources/css/app.css b/resources/css/app.css index 991b47e..4562618 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -261,6 +261,26 @@ .member-nav a[aria-current='page'] { text-underline-offset: 0.3rem; } +.catalog { + list-style: none; + padding: 0; + display: grid; + gap: 1rem; +} + +.catalog li { + background: white; + border: 1px solid var(--color-line); + padding: 1rem 1.1rem; + display: grid; + gap: 0.4rem; +} + +.catalog video { + width: min(100%, 40rem); + background: #111; +} + .empty { background: white; border: 1px solid var(--color-line); diff --git a/resources/views/mail/order-confirmed.blade.php b/resources/views/mail/order-confirmed.blade.php new file mode 100644 index 0000000..802382e --- /dev/null +++ b/resources/views/mail/order-confirmed.blade.php @@ -0,0 +1 @@ +Ihre Bestellung {{ $order->id }} ist bezahlt. Die dazugehörigen Inhalte liegen in der Bibliothek. diff --git a/resources/views/member/article.blade.php b/resources/views/member/article.blade.php new file mode 100644 index 0000000..c1f6174 --- /dev/null +++ b/resources/views/member/article.blade.php @@ -0,0 +1,29 @@ +@extends('layouts.site') + +@section('title', $article->code) + +@section('content') + @include('member.partials.nav') +

{{ $article->code }}

+ @if ($release === null) +

Für diesen Artikel ist noch kein Stand veröffentlicht.

+ @else +

Stand {{ $release->number }}@if ($release->change_note) · {{ $release->change_note }}@endif

+
    + @foreach ($entries as $entry) +
  • + {{ $entry['content']->path }} + @if ($entry['allowed'] && $entry['url']) + @if ($entry['action'] === 'streamen' && filled($entry['version']->metadata['file'] ?? null)) + + @else + Öffnen + @endif + @else + {{ $entry['reason'] }} + @endif +
  • + @endforeach +
+ @endif +@endsection diff --git a/resources/views/member/dashboard.blade.php b/resources/views/member/dashboard.blade.php index cb2f7ea..11b9b1f 100644 --- a/resources/views/member/dashboard.blade.php +++ b/resources/views/member/dashboard.blade.php @@ -5,5 +5,5 @@ @section('content') @include('member.partials.nav')

Guten Tag, {{ auth()->user()->name }}

-

Hier liegen später die Materialien, die eine Berechtigung für Sie freigibt.

+

In der Bibliothek liegen die Inhalte Ihrer Berechtigungen. Angebote können Sie abrufen oder im Testmodus kaufen.

@endsection diff --git a/resources/views/member/grants.blade.php b/resources/views/member/grants.blade.php index ddd721d..fb6e133 100644 --- a/resources/views/member/grants.blade.php +++ b/resources/views/member/grants.blade.php @@ -5,7 +5,19 @@ @section('content') @include('member.partials.nav')

Berechtigungen

-
-

Ihnen ist noch keine Lizenz zugeordnet.

-
+ @if ($grants->isEmpty()) +
+

Ihnen ist noch keine Lizenz zugeordnet.

+
+ @else +
    + @foreach ($grants as $grant) +
  • + {{ $grant->article->code }} + {{ $grant->rights_snapshot['purpose'] ?? '' }} + seit {{ $grant->valid_from?->timezone(config('app.timezone'))->format('d.m.Y') }} +
  • + @endforeach +
+ @endif @endsection diff --git a/resources/views/member/library.blade.php b/resources/views/member/library.blade.php index 0b3646e..c6816a5 100644 --- a/resources/views/member/library.blade.php +++ b/resources/views/member/library.blade.php @@ -5,7 +5,19 @@ @section('content') @include('member.partials.nav')

Bibliothek

-
-

Ihnen ist noch kein Material zugeordnet. Sobald eine Berechtigung vorliegt, erscheinen die freigegebenen Inhalte hier. Eine Rolle allein öffnet nichts.

-
+ @if ($grants->isEmpty()) +
+

Ihnen ist noch kein Material zugeordnet. Sobald eine Berechtigung vorliegt, erscheinen die freigegebenen Inhalte hier. Eine Rolle allein öffnet nichts.

+

Angebote ansehen

+
+ @else +
    + @foreach ($grants as $grant) +
  • + {{ $grant->article->code }} + {{ $grant->article->currentRelease?->change_note ?: 'Aktueller Stand' }} +
  • + @endforeach +
+ @endif @endsection diff --git a/resources/views/member/materials.blade.php b/resources/views/member/materials.blade.php index fad8ef8..6b3cc3c 100644 --- a/resources/views/member/materials.blade.php +++ b/resources/views/member/materials.blade.php @@ -5,7 +5,22 @@ @section('content') @include('member.partials.nav')

Filme und Materialien

-
-

Es sind noch keine Filme oder Materialien für Ihr Konto freigegeben.

-
+ @php + $films = $grants->filter(function ($grant) { + return $grant->article->currentRelease?->contents->contains( + fn ($content) => in_array($content->elementVersion->element->output_class, ['film', 'audio'], true), + ); + }); + @endphp + @if ($films->isEmpty()) +
+

Unter Ihren Berechtigungen ist gerade kein Film oder Hörstück.

+
+ @else + + @endif @endsection diff --git a/resources/views/member/offers.blade.php b/resources/views/member/offers.blade.php new file mode 100644 index 0000000..0d86eac --- /dev/null +++ b/resources/views/member/offers.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.site') + +@section('title', 'Angebote') + +@section('content') + @include('member.partials.nav') +

Angebote

+ @if ($errors->any()) + + @endif + @if ($offers->isEmpty()) +

Gerade ist kein persönliches Angebot aktiv.

+ @else +
    + @foreach ($offers as $offer) + @php $version = $offer->versions->first(); @endphp +
  • + {{ $offer->name }} + @if ($version) + + @if ($version->grant_kind === 'kauf') + {{ number_format($version->price_cents / 100, 2, ',', '.') }} € · Testzahlung + @else + Kostenlos + @endif + +
    + @csrf + +
    + @endif +
  • + @endforeach +
+ @endif +@endsection diff --git a/resources/views/member/order.blade.php b/resources/views/member/order.blade.php new file mode 100644 index 0000000..168f6b3 --- /dev/null +++ b/resources/views/member/order.blade.php @@ -0,0 +1,31 @@ +@extends('layouts.site') + +@section('title', 'Bestellung') + +@section('content') + @include('member.partials.nav') +

Bestellung {{ $order->id }}

+ @if ($errors->any()) + + @endif +

Status: {{ $order->status }}

+ @foreach ($order->lines as $line) +

{{ $line->offerVersion->offer->name ?? 'Angebot' }} · {{ number_format($line->price_cents / 100, 2, ',', '.') }} €

+ @endforeach + @if ($testPayment && $order->status === 'offen') +
+ @csrf + +
+
+ @csrf + +
+ @endif + @if ($order->status === 'bezahlt') +
+ @csrf + +
+ @endif +@endsection diff --git a/resources/views/member/partials/nav.blade.php b/resources/views/member/partials/nav.blade.php index 4b64699..3cbc47e 100644 --- a/resources/views/member/partials/nav.blade.php +++ b/resources/views/member/partials/nav.blade.php @@ -3,6 +3,7 @@ routeIs('member.library')) aria-current="page" @endif>Bibliothek routeIs('member.materials')) aria-current="page" @endif>Filme und Materialien routeIs('member.grants')) aria-current="page" @endif>Berechtigungen + routeIs('member.offers')) aria-current="page" @endif>Angebote routeIs('member.profile')) aria-current="page" @endif>Profil
@csrf diff --git a/resources/views/member/read.blade.php b/resources/views/member/read.blade.php new file mode 100644 index 0000000..c9041dd --- /dev/null +++ b/resources/views/member/read.blade.php @@ -0,0 +1,11 @@ +@extends('layouts.site') + +@section('title', $article->code) + +@section('content') + @include('member.partials.nav') +

{{ $version->element->working_title }}

+
+ {!! nl2br(e($version->body)) !!} +
+@endsection diff --git a/routes/web.php b/routes/web.php index 54d57b2..3986a03 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,6 +4,8 @@ use App\Http\Controllers\Auth\PasswordResetController; use App\Http\Controllers\Auth\RegistrationController; use App\Http\Controllers\Auth\SessionController; +use App\Http\Controllers\Member\CheckoutController; +use App\Http\Controllers\Member\LibraryController; use App\Http\Controllers\Member\MemberController; use App\Http\Controllers\PageController; use App\Http\Controllers\PublicMediaController; @@ -39,9 +41,20 @@ Route::middleware(['auth', 'verified'])->prefix('bereich')->name('member.')->group(function () { Route::get('/', [MemberController::class, 'dashboard'])->name('dashboard'); - Route::get('/bibliothek', [MemberController::class, 'library'])->name('library'); - Route::get('/materialien', [MemberController::class, 'materials'])->name('materials'); - Route::get('/berechtigungen', [MemberController::class, 'grants'])->name('grants'); + Route::get('/bibliothek', [LibraryController::class, 'index'])->name('library'); + Route::get('/bibliothek/{article}', [LibraryController::class, 'show'])->name('article'); + Route::get('/ausgabe/{article}/{release}/{version}/{action}', [LibraryController::class, 'media']) + ->middleware('signed') + ->name('media'); + Route::get('/materialien', [LibraryController::class, 'materials'])->name('materials'); + Route::get('/berechtigungen', [LibraryController::class, 'grants'])->name('grants'); + Route::get('/angebote', [CheckoutController::class, 'offers'])->name('offers'); + Route::post('/angebote/{offer}/abrufen', [CheckoutController::class, 'claim'])->name('offers.claim'); + Route::post('/angebote/{offer}/kaufen', [CheckoutController::class, 'place'])->name('offers.buy'); + Route::get('/bestellung/{order}', [CheckoutController::class, 'show'])->name('order'); + Route::post('/bestellung/{order}/bestaetigen', [CheckoutController::class, 'confirm'])->name('order.confirm'); + Route::post('/bestellung/{order}/ablehnen', [CheckoutController::class, 'fail'])->name('order.fail'); + Route::post('/bestellung/{order}/widerrufen', [CheckoutController::class, 'refund'])->name('order.refund'); Route::get('/profil', [MemberController::class, 'profile'])->name('profile'); Route::post('/profil', [MemberController::class, 'updateProfile'])->name('profile.update'); }); diff --git a/scripts/deploy.sh b/scripts/deploy.sh index dc14d10..edaea5f 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -111,6 +111,10 @@ deploy() { wait_for_db || return 1 echo "=== Migrationen ===" dc run --rm --no-deps -T app php artisan migrate --force || return 1 + if [ "$LUF_ENV" = test ]; then + dc run --rm --no-deps -T app php artisan db:seed --class=Database\\Seeders\\DemoCatalogSeeder --force || return 1 + echo "✓ Testdaten geprüft" + fi echo "=== Start ===" dc up -d --remove-orphans || return 1 wait_for_web || return 1 diff --git a/tests/Feature/MembershipAccessTest.php b/tests/Feature/MembershipAccessTest.php new file mode 100644 index 0000000..877c65d --- /dev/null +++ b/tests/Feature/MembershipAccessTest.php @@ -0,0 +1,187 @@ +freeOffer(); + $member = User::factory()->create(); + $other = User::factory()->create(); + $issuer = app(GrantIssuer::class); + + $first = $issuer->claim($member, $offer); + $again = $issuer->claim($member, $offer); + $issuer->claim($other, $offer); + + $this->assertSame($first->id, $again->id); + $this->assertSame(2, Acquisition::query()->count()); + $this->assertSame(1, Grant::query()->where('acquisition_id', $first->id)->count()); + $this->assertTrue(app(DecideAccess::class)( + $member, + $article, + $article->currentRelease, + $article->currentRelease->contents->first()->elementVersion, + 'ansehen', + )->allowed); + } + + public function test_a_grant_does_not_open_a_foreign_release(): void + { + [$article, $offer] = $this->freeOffer(); + $foreign = app(ArticleService::class); + $content = app(ContentService::class); + $otherArticle = $foreign->create('fremd'); + $version = $content->publishElementVersion($content->createElement('text', 'text', 'Fremd'), 'Nicht enthalten'); + $release = $foreign->publishRelease($otherArticle, $version, 'Eigenständiger Artikel.'); + $member = User::factory()->create(); + app(GrantIssuer::class)->claim($member, $offer); + + $decision = app(DecideAccess::class)( + $member, + $article, + $release, + $version, + 'ansehen', + ); + + $this->assertFalse($decision->allowed); + } + + public function test_test_payment_grants_once_and_a_failure_grants_nothing(): void + { + Mail::fake(); + [$article, $offer] = $this->paidOffer(); + $member = User::factory()->create(); + $checkout = app(Checkout::class); + $order = $checkout->place($member, $offer); + $checkout->confirmTestPayment($order, 'test-1'); + $checkout->confirmTestPayment($order->fresh(), 'test-2'); + + $this->assertSame(1, Grant::query()->where('license_article_id', $article->id)->count()); + Mail::assertSent(OrderConfirmed::class, 1); + + $second = $checkout->place($member, $offer); + $checkout->failTestPayment($second, 'test-fail-1'); + + $this->assertSame('fehlgeschlagen', $second->fresh()->status); + $this->assertSame(1, Grant::query()->count()); + } + + public function test_a_member_can_read_an_entitled_text_and_a_stranger_cannot(): void + { + Storage::fake('media_derived'); + Storage::disk('media_derived')->put('inhalte/demo.txt', 'geschuetzter text'); + [$article, $offer] = $this->freeOffer(file: 'inhalte/demo.txt'); + $member = User::factory()->create(); + $stranger = User::factory()->create(); + app(GrantIssuer::class)->claim($member, $offer); + $release = $article->currentRelease; + $version = $release->contents->first()->elementVersion; + + $this->actingAs($member)->get(route('member.article', $article))->assertOk()->assertSee($article->code); + $url = URL::temporarySignedRoute('member.media', now()->addMinutes(5), [ + 'article' => $article->id, + 'release' => $release->id, + 'version' => $version->id, + 'action' => 'ansehen', + 'reader' => $member->id, + ]); + $response = $this->actingAs($member)->get($url); + $response->assertOk(); + $this->assertSame('geschuetzter text', $response->streamedContent()); + $this->actingAs($stranger)->get($url)->assertForbidden(); + } + + public function test_demo_catalog_can_be_seeded_twice(): void + { + $this->seed(DemoCatalogSeeder::class); + $this->seed(DemoCatalogSeeder::class); + + $this->assertSame(1, LicenseArticle::query()->where('code', 'demo-merkblatt')->count()); + $this->assertSame(1, Offer::query()->where('name', 'Testkauf Programm')->count()); + } + + public function test_refund_revokes_the_grant(): void + { + Mail::fake(); + [, $offer] = $this->paidOffer(); + $member = User::factory()->create(); + $checkout = app(Checkout::class); + $order = $checkout->place($member, $offer); + $checkout->confirmTestPayment($order, 'test-refund'); + $checkout->refund($order->fresh(), 'Testwiderruf'); + + $this->assertSame(GrantStatus::Widerrufen, Grant::query()->first()->status); + } + + /** + * @return array{0: LicenseArticle, 1: Offer} + */ + private function freeOffer(?string $file = null): array + { + return $this->offer('auf_abruf', null, $file); + } + + /** + * @return array{0: LicenseArticle, 1: Offer} + */ + private function paidOffer(): array + { + return $this->offer('kauf', 500); + } + + /** + * @return array{0: LicenseArticle, 1: Offer} + */ + private function offer(string $kind, ?int $price, ?string $file = null): array + { + $content = app(ContentService::class); + $articles = app(ArticleService::class); + $offers = app(OfferService::class); + $metadata = $file === null ? [] : ['file' => $file]; + $body = $file === null ? 'Lesetext' : null; + $version = $content->publishElementVersion( + $content->createElement('text', 'text', 'Blatt '.$kind), + $body, + $metadata, + ); + $article = $articles->create('artikel-'.$kind.'-'.($file === null ? 'text' : 'datei')); + $articles->publishRelease($article, $version, 'Testdaten, kein Produktpreis.'); + $rights = $offers->createRightsProfile('Lesen '.$kind, 'ehrenamtlich', [ + 'text' => ['ansehen', 'laden'], + ]); + $offer = $offers->create('Angebot '.$kind); + $offers->activate($offer, [ + ['target' => $article->fresh(), 'rights' => $rights], + ], [ + 'grant_kind' => $kind, + 'price_cents' => $price, + ]); + + return [$article->fresh(), $offer]; + } +}