From 9a81666557e07162043b6854b3195e1557d51672 Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <alper.ebicoglu@volosoft.com>
Date: Tue, 23 Feb 2021 10:10:50 +0300
Subject: [PATCH] refactor CreateMigrationAndRunMigratorCommand.cs

---
 .../CreateMigrationAndRunMigratorCommand.cs   | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
index 3946ca35bb..68fae779ce 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
@@ -23,60 +23,66 @@ namespace Volo.Abp.Cli.Commands
         {
             if (commandLineArgs.Target.IsNullOrEmpty())
             {
-                throw new CliUsageException(
-                    "DbMigrations folder path is missing!"
-                );
+                throw new CliUsageException("DbMigrations folder path is missing!");
             }
 
             var dbMigratorProjectPath = GetDbMigratorProjectPath(commandLineArgs.Target);
-
             if (dbMigratorProjectPath == null)
             {
                 throw new Exception("DbMigrator is not found!");
             }
 
-            await CheckAndInstallDotnetEfIfNeededAsync();
+            if (!IsDotNetEfToolInstalled())
+            {
+                InstallDotnetEfTool();
+            }
 
-            var output = CmdHelper.RunCmdAndGetOutput($"cd \"{commandLineArgs.Target}\" && dotnet ef migrations add Initial -s \"{dbMigratorProjectPath}\"");
+            var addMigrationCmd = $"cd \"{commandLineArgs.Target}\" && " +
+                                  $"dotnet ef migrations add Initial -s \"{dbMigratorProjectPath}\"";
 
-            if (output.Contains("Done.") && output.Contains("To undo this action") && output.Contains("ef migrations remove")) // Migration added successfully
+            var output = CmdHelper.RunCmdAndGetOutput(addMigrationCmd);
+            if (output.Contains("Done.") &&
+                output.Contains("To undo this action") &&
+                output.Contains("ef migrations remove"))
             {
+                // Migration added successfully
                 CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(dbMigratorProjectPath) + "\" && dotnet run");
+                await Task.CompletedTask;
             }
             else
             {
-                throw new Exception("Migrations failed: " + output);
+                var exceptionMsg = "Migrations failed! The following command didn't run successfully:" +
+                                   Environment.NewLine +
+                                   addMigrationCmd +
+                                   Environment.NewLine + output;
+
+                Logger.LogError(exceptionMsg);
+                throw new Exception(exceptionMsg);
             }
         }
 
-        private async Task CheckAndInstallDotnetEfIfNeededAsync()
+        private static bool IsDotNetEfToolInstalled()
         {
             var output = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g");
+            return output.Contains("dotnet-ef");
+        }
 
-            if (output.Contains("dotnet-ef"))
-            {
-                return;
-            }
-
+        private void InstallDotnetEfTool()
+        {
             Logger.LogInformation("Installing dotnet-ef tool...");
-
             CmdHelper.RunCmd("dotnet tool install --global dotnet-ef");
-
             Logger.LogInformation("dotnet-ef tool is installed.");
         }
 
-        private string GetDbMigratorProjectPath(string dbMigrationsFolderPath)
+        private static string GetDbMigratorProjectPath(string dbMigrationsFolderPath)
         {
             var srcFolder = Directory.GetParent(dbMigrationsFolderPath);
+            var dbMigratorDirectory = Directory.GetDirectories(srcFolder.FullName)
+                .FirstOrDefault(d => d.EndsWith(".DbMigrator"));
 
-            var dbMigratorFolderPath = Directory.GetDirectories(srcFolder.FullName).FirstOrDefault(d => d.EndsWith(".DbMigrator"));
-
-            if (dbMigratorFolderPath == null)
-            {
-                return null;
-            }
-
-            return Directory.GetFiles(dbMigratorFolderPath).FirstOrDefault(f => f.EndsWith(".csproj"));
+            return dbMigratorDirectory == null
+                ? null
+                : Directory.GetFiles(dbMigratorDirectory).FirstOrDefault(f => f.EndsWith(".csproj"));
         }
 
         public string GetUsageInfo()
@@ -89,4 +95,4 @@ namespace Volo.Abp.Cli.Commands
             return string.Empty;
         }
     }
-}
+}
\ No newline at end of file