wip

Author: Sebastian BURGIN-FIX (ext)

app/Http/Controllers/Network/NetworkShowController.php

@@ -14,6 +14,7 @@ public function __invoke(string $slug): View
         $network = Network::query()
             ->where('locale', app()->getLocale())
             ->published()
+            ->active()
             ->where('page_slug', $slug)
             ->first();
 

resources/views/app/network/index.blade.php

@@ -38,6 +38,10 @@ class="flex size-7 shrink-0 items-center justify-center text-muted hover:text-gr
                                 @endif
                             </div>
 
+                            @if($network->tier_label)
+                                <x-ui.badge :label="$network->tier_label" class="w-fit"/>
+                            @endif
+
                             @if($network->excerpt)
                                 <span class="text-sm text-muted">{{ $network->excerpt }}</span>
                             @endif

tests/Feature/Controllers/Network/NetworkIndexControllerTest.php

@@ -38,6 +38,20 @@
         ->assertSee(NetworkCategoryEnum::SOFTWARE->getLabel());
 })->group('network');
 
+it('shows the drawing illustration when no logo is set but a drawing exists', function () {
+    Network::factory()->create([
+        'key' => 'docuware',
+        'locale' => LocaleEnum::DE->value,
+        'name' => 'DocuWare',
+        'logo' => null,
+    ]);
+
+    get(route('de-ch.network.index'))
+        ->assertOk()
+        ->assertSee('images/network/docuware.svg', escape: false)
+        ->assertDontSee('images/placeholders/network-company.svg', escape: false);
+})->group('network');
+
 it('shows the placeholder illustration instead of the name when no logo is set', function () {
     Network::factory()->create([
         'locale' => LocaleEnum::DE->value,

tests/Feature/Controllers/Network/NetworkShowControllerTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Enums\LocaleEnum;
+use App\Enums\NetworkStatusEnum;
 use App\Enums\SessionKeyEnum;
 use App\Models\Network;
 use App\Models\NetworkUser;
@@ -73,6 +74,20 @@
         ->assertNotFound();
 })->group('network');
 
+it('returns 404 when the network has ended, even when accessed directly', function () {
+    Network::factory()->create([
+        'key' => 'baselhack',
+        'locale' => LocaleEnum::DE->value,
+        'name' => 'BaselHack',
+        'page_slug' => 'baselhack',
+        'published' => true,
+        'status' => NetworkStatusEnum::ENDED->value,
+    ]);
+
+    get(route('de-ch.network.show', ['slug' => 'baselhack']))
+        ->assertNotFound();
+})->group('network');
+
 it('returns 404 when no blade view exists for the page slug', function () {
     Network::factory()->create([
         'key' => 'no-view',

tests/Feature/Controllers/ServicesIndexControllerTest.php

@@ -0,0 +1,53 @@
+<?php
+
+use App\Enums\LocaleEnum;
+use App\Enums\SessionKeyEnum;
+use App\Models\Service;
+use Illuminate\Support\Str;
+
+use function Pest\Laravel\get;
+use function Pest\Laravel\withSession;
+
+it('returns 200 for both locales', function (string $locale) {
+    withSession([SessionKeyEnum::LANGUAGE->value => $locale])
+        ->get(route(Str::slug($locale).'.services.index'))
+        ->assertOk();
+})->with([LocaleEnum::DE->value, LocaleEnum::EN->value])->group('services');
+
+it('shows a published service with name and teaser', function () {
+    Service::factory()->create([
+        'locale' => LocaleEnum::DE->value,
+        'name' => 'Konzeption Visible',
+        'teaser' => 'Sichtbarer Teaser Text',
+        'published' => true,
+    ]);
+
+    get(route('de-ch.services.index'))
+        ->assertOk()
+        ->assertSee('Konzeption Visible')
+        ->assertSee('Sichtbarer Teaser Text');
+})->group('services');
+
+it('does not show unpublished services', function () {
+    Service::factory()->create([
+        'locale' => LocaleEnum::DE->value,
+        'name' => 'Hidden Service XYZ',
+        'published' => false,
+    ]);
+
+    get(route('de-ch.services.index'))
+        ->assertOk()
+        ->assertDontSee('Hidden Service XYZ');
+})->group('services');
+
+it('does not show services of another locale', function () {
+    Service::factory()->create([
+        'locale' => LocaleEnum::EN->value,
+        'name' => 'English Only Service',
+        'published' => true,
+    ]);
+
+    get(route('de-ch.services.index'))
+        ->assertOk()
+        ->assertDontSee('English Only Service');
+})->group('services');