fix: fix setup and dummy in case meilisearch not activated

monicahq · Aug 3, 2022 · ff8c819 · ff8c819
1 parent 73848ee
commit ff8c819
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/app/Console/Commands/SetupApplication.php b/app/Console/Commands/SetupApplication.php
@@ -47,24 +47,26 @@ public function handle(): void
 
         $this->line('-> Creating indexes on Meilisearch. Make sure Meilisearch is running.');
 
-        $client = new Client(config('scout.meilisearch.host'), config('scout.meilisearch.key'));
-        $index = $client->index('contacts');
-        $index->updateFilterableAttributes([
-            'id',
-            'vault_id',
-        ]);
-        $index = $client->index('notes');
-        $index->updateFilterableAttributes([
-            'id',
-            'vault_id',
-            'contact_id',
-        ]);
-        $index = $client->index('groups');
-        $index->updateFilterableAttributes([
-            'id',
-            'vault_id',
-        ]);
+        if (($host = config('scout.meilisearch.host')) !== '') {
+            $client = new Client($host, config('scout.meilisearch.key'));
+            $index = $client->index('contacts');
+            $index->updateFilterableAttributes([
+                'id',
+                'vault_id',
+            ]);
+            $index = $client->index('notes');
+            $index->updateFilterableAttributes([
+                'id',
+                'vault_id',
+                'contact_id',
+            ]);
+            $index = $client->index('groups');
+            $index->updateFilterableAttributes([
+                'id',
+                'vault_id',
+            ]);
 
-        $this->line('✓ Indexes created');
+            $this->line('✓ Indexes created');
+        }
     }
 }
diff --git a/app/Console/Commands/SetupDummyAccount.php b/app/Console/Commands/SetupDummyAccount.php
@@ -18,6 +18,7 @@
 use Carbon\Carbon;
 use Faker\Factory as Faker;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 
 class SetupDummyAccount extends Command
 {
@@ -81,9 +82,11 @@ private function start(): void
 
     private function wipeAndMigrateDB(): void
     {
-        shell_exec('curl -X DELETE "'.config('scout.meilisearch.host').'/indexes/notes"');
-        shell_exec('curl -X DELETE "'.config('scout.meilisearch.host').'/indexes/contacts"');
-        shell_exec('curl -X DELETE "'.config('scout.meilisearch.host').'/indexes/groups"');
+        if (($host = config('scout.meilisearch.host')) !== '') {
+            Http::delete("$host/indexes/notes");
+            Http::delete("$host/indexes/contacts");
+            Http::delete("$host/indexes/groups");
+        }
         $this->artisan('☐ Reset search engine', 'monica:setup');
         $this->artisan('☐ Migration of the database', 'migrate:fresh');
         $this->artisan('☐ Symlink the storage folder', 'storage:link');
@@ -124,7 +127,7 @@ private function createFirstUsers(): void
         ]);
         $this->firstUser->email_verified_at = Carbon::now();
         $this->firstUser->save();
-        sleep(5);
+        // sleep(5);
     }
 
     private function createVaults(): void

diff --git a/lang/php_en.json b/lang/php_en.json
diff --git a/lang/php_fr.json b/lang/php_fr.json