fixed several issues

- search indexes should be different for testing
- added ability to flush the search index between tests
- fixed missing attributes in model factories

app/Http/Concerns/MakesHttpRequestsEx.php

@@ -1,4 +1,5 @@
 <?php
+namespace App\Http\Concerns;
 
 trait MakesHttpRequestsEx
 {
@@ -6,9 +7,9 @@ trait MakesHttpRequestsEx
      * Visit the given URI with a JSON GET request.
      * @param string $uri
      * @param array $headers
-     * @return TestCase
+     * @return self
      */
-    public function getJson(string $uri, array $headers = []): TestCase
+    public function getJson(string $uri, array $headers = []): self
     {
         return $this->json('GET', $uri, [], $headers);
     }

app/JikanApiSearchableModel.php

@@ -39,7 +39,7 @@ abstract class JikanApiSearchableModel extends JikanApiModel implements Typesens
      */
     public function searchableAs(): string
     {
-        return strtolower($this->table) . '_index';
+        return strtolower($this->table) . '_index' . (env("APP_ENV") === "testing" ? "_testing" : "");
     }
 
     /**

app/Testing/JikanDataGenerator.php

@@ -1,5 +1,5 @@
 <?php
-namespace Database\Factories;
+namespace App\Testing;
 use Faker\Generator;
 use Illuminate\Support\Carbon;
 
@@ -126,4 +126,9 @@ trait JikanDataGenerator
     {
         return $this->faker->randomElements($this->dummyGenres, $count);
     }
+
+    public function stuff()
+    {
+        return "";
+    }
 }

app/Testing/ScoutFlush.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Testing;
+
+trait ScoutFlush
+{
+    public function runScoutFlush(): void
+    {
+        $this->artisan("scout:flush App\\Anime");
+        $this->artisan("scout:flush App\\Manga");
+        $this->artisan("scout:flush App\\Character");
+        $this->artisan("scout:flush App\\GenreAnime");
+        $this->artisan("scout:flush App\\GenreManga");
+        $this->artisan("scout:flush App\\Person");
+    }
+}

database/factories/AnimeFactory.php

@@ -2,6 +2,8 @@
 namespace Database\Factories;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Anime;
+use App\Testing\JikanDataGenerator;
+use MongoDB\BSON\UTCDateTime;
 
 
 class AnimeFactory extends Factory
@@ -55,7 +57,7 @@ class AnimeFactory extends Factory
             "favorites" => $this->faker->randomDigitNotNull(),
             "synopsis" => "test",
             "background" => "test",
-            "season" => $this->faker->randomElement(["winter", "spring", "fall", "summer"]),
+            "premiered" => $this->faker->randomElement(["Winter", "Spring", "Fall", "Summer"]),
             "broadcast" => [
                 "day" => "",
                 "time" => "",
@@ -96,7 +98,10 @@ class AnimeFactory extends Factory
                     "name" => "Shounen",
                     "url" => "https://myanimelist.net/anime/genre/27/Shounen"
                 ]
-            ]
+            ],
+            "createdAt" => new UTCDateTime(),
+            "modifiedAt" => new UTCDateTime(),
+            "request_hash" => sprintf("request:%s:%s", "v4", sha1("http://localhost-test/v4/anime/" . $mal_id))
         ];
     }
 }

database/factories/CharacterFactory.php

@@ -2,8 +2,10 @@
 
 namespace Database\Factories;
 
+use App\Testing\JikanDataGenerator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Character;
+use MongoDB\BSON\UTCDateTime;
 
 
 class CharacterFactory extends Factory
@@ -25,7 +27,10 @@ class CharacterFactory extends Factory
             "name_kanji" => "岡",
             "nicknames" => [],
             "favorites" => $this->faker->randomDigitNotNull(),
-            "about" => "test"
+            "about" => "test",
+            "createdAt" => new UTCDateTime(),
+            "modifiedAt" => new UTCDateTime(),
+            "request_hash" => sprintf("request:%s:%s", "v4", sha1("http://localhost-test/v4/character/" . $mal_id))
         ];
     }
 }

database/factories/GenreFactory.php

@@ -1,6 +1,8 @@
 <?php
 namespace Database\Factories;
+use App\Testing\JikanDataGenerator;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use MongoDB\BSON\UTCDateTime;
 
 abstract class GenreFactory extends Factory
 {
@@ -18,7 +20,10 @@ abstract class GenreFactory extends Factory
             "mal_id" => $mal_id,
             "name" => $name,
             "url" => $url,
-            "count" => $this->faker->randomDigit()
+            "count" => $this->faker->randomDigit(),
+            "createdAt" => new UTCDateTime(),
+            "modifiedAt" => new UTCDateTime(),
+            "request_hash" => sprintf("request:%s:%s", "v4", sha1("http://localhost-test/v4/genres/". $this->mediaType ."/" . $mal_id))
         ];
     }
 }

database/factories/MangaFactory.php

@@ -1,7 +1,9 @@
 <?php
 namespace Database\Factories;
+use App\Testing\JikanDataGenerator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Manga;
+use MongoDB\BSON\UTCDateTime;
 
 class MangaFactory extends Factory
 {
@@ -79,7 +81,10 @@ class MangaFactory extends Factory
                     "name" => "Shounen",
                     "url" => "https://myanimelist.net/manga/genre/27/Shounen"
                 ]
-            ]
+            ],
+            "createdAt" => new UTCDateTime(),
+            "modifiedAt" => new UTCDateTime(),
+            "request_hash" => sprintf("request:%s:%s", "v4", sha1("http://localhost-test/v4/manga/" . $mal_id))
         ];
     }
 }

database/factories/PersonFactory.php

@@ -1,7 +1,9 @@
 <?php
 namespace Database\Factories;
+use App\Testing\JikanDataGenerator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Person;
+use MongoDB\BSON\UTCDateTime;
 
 
 class PersonFactory extends Factory
@@ -33,7 +35,10 @@ class PersonFactory extends Factory
             "alternate_names" => [],
             "birthday" => $this->createRandomDateTime("-80 years")->toAtomString(),
             "favorites" => $this->faker->randomDigitNotNull(),
-            "about" => "test"
+            "about" => "test",
+            "createdAt" => new UTCDateTime(),
+            "modifiedAt" => new UTCDateTime(),
+            "request_hash" => sprintf("request:%s:%s", "v4", sha1("http://localhost-test/v4/people/" . $mal_id))
         ];
     }
 }

tests/AnimeSearchEndpointTest.php

@@ -1,10 +1,12 @@
 <?php
+
+use App\Testing\ScoutFlush;
 use Laravel\Lumen\Testing\DatabaseMigrations;
 use App\Anime;
 
 class AnimeSearchEndpointTest extends TestCase
 {
-    use DatabaseMigrations;
+    use DatabaseMigrations, ScoutFlush;
 
     public function limitParameterCombinationsProvider(): array
     {
@@ -36,9 +38,29 @@ class AnimeSearchEndpointTest extends TestCase
         $overrides = [];
         // let's make all database items the same type
         if (array_key_exists("type", $additionalParams)) {
-            $overrides["type"] = $additionalParams["type"];
+            $overrides["type"] = match ($additionalParams["type"]) {
+                "ova" => "OVA",
+                "movie" => "Movie",
+                default => "TV"
+            };
         }
-        $f->make($overrides);
+        if (array_key_exists("min_score", $additionalParams) && !array_key_exists("max_score", $additionalParams)) {
+            $overrides["score"] = $this->faker->randomFloat(2, floatval($additionalParams["min_score"]), 9.99);
+        }
+        if (!array_key_exists("min_score", $additionalParams) && array_key_exists("max_score", $additionalParams)) {
+            $overrides["score"] = $this->faker->randomFloat(2, 1.00, floatval($additionalParams["max_score"]));
+        }
+        if (array_key_exists("min_score", $additionalParams) && array_key_exists("max_score", $additionalParams)) {
+            $overrides["score"] = $this->faker->randomFloat(2, floatval($additionalParams["min_score"]), floatval($additionalParams["max_score"]));
+        }
+        if (array_key_exists("status", $additionalParams)) {
+            $overrides["score"] = match ($additionalParams["status"]) {
+                "complete" => "Completed",
+                "airing" => "Currently Airing",
+                "upcoming" => "Upcoming"
+            };
+        }
+        $f->create($overrides);
         $parameters = http_build_query([
             "limit" => $limitCount,
             ...$additionalParams

tests/TestCase.php

@@ -1,17 +1,41 @@
 <?php
+use App\Http\Concerns\MakesHttpRequestsEx;
+use App\Testing\ScoutFlush;
 
 abstract class TestCase extends Laravel\Lumen\Testing\TestCase
 {
     use MakesHttpRequestsEx;
+    protected Faker\Generator $faker;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->faker = Faker\Factory::create();
+    }
 
     /**
      * Creates the application.
      *
      * @return \Laravel\Lumen\Application
      */
-
     public function createApplication()
     {
-        return require __DIR__.'/../bootstrap/app.php';
+        $app = require __DIR__.'/../bootstrap/app.php';
+        $database = env('DB_DATABASE', 'jikan_tests');
+        $app['config']->set('database.connections.mongodb.database', $database === 'jikan' ? 'jikan_test' : $database);
+
+        return $app;
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $uses = array_flip(class_uses_recursive(get_class($this)));
+
+        // we want to empty the search index
+        if (isset($uses[ScoutFlush::class])) {
+            /** @noinspection PhpUndefinedMethodInspection */
+            $this->runScoutFlush();
+        }
     }
 }