fix: init command should always add staging and production databases

carlalexander · carlalexander · commit 5f0c92e0c8ef · 2023-01-15T10:33:50.000-05:00
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -158,37 +158,33 @@ protected function perform(InputInterface $input, OutputInterface $output)
      */
     private function addEnvironmentDatabaseNodes(Collection $environments, OutputInterface $output, string $projectName, string $region): Collection
     {
-        $databasePrefix = '';
         $databaseServer = $this->determineDatabaseServer($output, $region);
 
         if (empty($databaseServer['name'])) {
             return $environments;
-        } elseif (!empty($databaseServer['publicly_accessible']) && $output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {
-            $databasePrefix = $output->askSlug('What database prefix would you like to use for this project?', $projectName);
         }
 
-        return $environments->map(function (array $options, string $environment) use ($databasePrefix, $databaseServer) {
-            if (empty($databasePrefix)) {
-                Arr::set($options, 'database', $databaseServer['name']);
-            } else {
-                Arr::set($options, 'database.server', $databaseServer['name']);
-                Arr::set($options, 'database.name', sprintf('%s_%s', rtrim($databasePrefix, '_'), $environment));
-            }
+        $databasePrefix = trim($output->askSlug('What database prefix would you like to use for this project?', $projectName));
+        $environments->map(function (array $options, string $environment) use ($databasePrefix, $databaseServer) {
+            Arr::set($options, 'database.server', $databaseServer['name']);
+            Arr::set($options, 'database.name', $databasePrefix ? sprintf('%s_%s', rtrim($databasePrefix, '_'), $environment) : $environment);
 
             return $options;
-        })->each(function (array $options) {
-            if (!Arr::has($options, ['database.server', 'database.name'])) {
-                return;
-            }
+        });
 
-            $this->invoke(new NullOutput(), CreateDatabaseCommand::NAME, ['name' => Arr::get($options, 'database.name'), '--server' => Arr::get($options, 'database.server')]);
-        })->map(function (array $options) {
-            if (empty($options)) {
-                $options = null;
-            }
+        if (!empty($databaseServer['publicly_accessible']) && $output->confirm(sprintf('Would you like to create the staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {
+            $environments->each(function (array $options) {
+                $this->invoke(new NullOutput(), CreateDatabaseCommand::NAME, ['name' => Arr::get($options, 'database.name'), '--server' => Arr::get($options, 'database.server')]);
+            });
+        }
 
-            return $options;
-        });
+        if (empty($databaseServer['publicly_accessible']) || !$output->confirm(sprintf('Would you like to create staging and production databases for your project on the "<comment>%s</comment>" database server?', $databaseServer['name']))) {
+            return $environments->map(function (array $options) use ($databaseServer) {
+                Arr::set($options, 'database', $databaseServer['name']);
+            });
+        }
+
+        return $environments;
     }
 
     /**
