make route /katalog to use NewCatalogController + add new route /kata…

…log-old
SlovakNationalGallery · Nov 21, 2024 · 5a858bc · 5a858bc
1 parent add48ff
commit 5a858bc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 31 deletions.
diff --git a/app/Http/Middleware/RedirectLegacyCatalogRequest.php b/app/Http/Middleware/RedirectLegacyCatalogRequest.php
@@ -42,9 +42,6 @@ class RedirectLegacyCatalogRequest
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (!Experiment::is('new-catalog')) {
-            return $next($request);
-        }
 
         if ($request->getQueryString() === null || !$this->isLegacyCatalogRequest($request)) {
             return $next($request);

diff --git a/app/Http/Middleware/SetExperiments.php b/app/Http/Middleware/SetExperiments.php
@@ -19,9 +19,9 @@ class SetExperiments
     public function handle(Request $request, Closure $next): Response
     {
         $request->whenFilled('experiment', function ($experiment) {
-            if ($experiment === 'new-catalog' || $experiment === 'new-katalog') {
-                return Experiment::set('new-catalog');
-            }
+            // if ($experiment === 'new-catalog' || $experiment === 'new-katalog') {
+            //     return Experiment::set('new-catalog');
+            // }
         });
 
         return $next($request);

diff --git a/resources/views/components/searchbar.blade.php b/resources/views/components/searchbar.blade.php
@@ -4,10 +4,7 @@
     'class' => 'navbar-form right-inner-addon ukraine',
 ]) !!}
 <i class="fa fa-search"></i>
-@php
-$search_value = Experiment::is('new-catalog') ? request()->get('q') : request()->get('search') 
-@endphp
-{!! Form::text('search', $search_value, [
+{!! Form::text('search', request()->get('q'), [
     'class' => 'form-control',
     'placeholder' => utrans('master.search_placeholder'),
     'id' => 'search',

diff --git a/routes/web.php b/routes/web.php
@@ -292,17 +292,14 @@ function()
 
     Route::get('patternlib', [PatternlibController::class, 'getIndex'])->name('frontend.patternlib.index');
 
-    Route::get('katalog', function (HttpRequest $request) {
-        if (Experiment::is('new-catalog')) {
-            return app(NewCatalogController::class)->index($request);
-        }
-
-        return app(CatalogController::class)->getIndex();
-    })
+    Route::get('katalog', [NewCatalogController::class, 'index'])
         ->middleware(RedirectLegacyCatalogRequest::class)
         ->name('frontend.catalog.index');
 
-    Route::resource('katalog-new', NewCatalogController::class)->names('frontend.catalog-new'); // TODO remove after release
+    Route::get('katalog-old', [CatalogController::class, 'getIndex'])
+        ->name('frontend.catalog.old');
+
+    // Route::resource('katalog-new', NewCatalogController::class)->names('frontend.catalog-new'); // TODO remove after release
 
     Route::get('katalog/suggestions', [CatalogController::class, 'getSuggestions'])->name('frontend.catalog.suggestions');
     Route::get('katalog/random', [CatalogController::class, 'getRandom'])->name('frontend.catalog.random');

diff --git a/tests/Feature/RedirectLegacyCatalogRequestTest.php b/tests/Feature/RedirectLegacyCatalogRequestTest.php
@@ -7,12 +7,6 @@
 
 class RedirectLegacyCatalogRequestTest extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        Experiment::set('new-catalog');
-    }
 
     public function test_redirects_to_new_catalog_url(): void
     {

diff --git a/tests/NewCatalogTest.php b/tests/NewCatalogTest.php
@@ -2,17 +2,10 @@
 
 namespace Tests\Views\Frontend;
 
-use App\Facades\Experiment;
 use Tests\TestCase;
 
 class NewCatalogTest extends TestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        Experiment::set('new-catalog');
-    }
 
     public function test_title_is_based_on_filters()
     {

diff --git a/tests/Views/Frontend/CatalogViewTest.php b/tests/Views/Frontend/CatalogViewTest.php
@@ -52,4 +52,10 @@ public function testGetRandom()
         $response = $this->get('/katalog/random');
         $response->assertStatus(200);
     }
+
+    // test the legacy catalog - should be removed after no longer needed/supported
+    public function testOldCatalog() {
+        $response = $this->get('/katalog-old');
+        $response->assertStatus(200);
+    }
 }