merge master and fix conflict

Author: Sandip124

Constants/ActionTypeConstants.cs

@@ -1,8 +1,8 @@
 namespace postgres_database_restore_tool.Constants
 {
-    internal class ActionTypeConstants
+    internal static class ActionTypeConstants
     {
-        public const string DropAndRestore = "Drop_and_Restore";
-        public const string CreateAndRestore = "Create_and_Restore";
+        public const string DropAndRestore = "Drop and Restore";
+        public const string CreateAndRestore = "Create and Restore";
     }
 }

Constants/CommandTypeConstants.cs

@@ -1,9 +1,8 @@
 namespace postgres_database_restore_tool.Constants
 {
-    internal class CommandTypeConstants
+    internal static class CommandTypeConstants
     {
-        public const string PgRestore = "pg_restore";
-        public const string PgDump = "pg_dump";
-
+        public static (string key, string value) PgRestore = ("PG Restore", "pg_restore");
+        public static (string key, string value) PgDump = ("PG Dump", "pg_dump");
     }
-}
+}

Helper/CommandExecutor.cs

@@ -39,17 +39,18 @@ public static void ExecuteRestore(UserConnectionVo connection)
                     break;
             }
 
+
             string fileName;
             string arguments;
 
-            if (connection.DatabaseBackupType == CommandTypeConstants.PgDump)
+            if (connection.IsForPgDump)
             {
                 fileName = "psql";
                 arguments = $@"-U {connection.UserName} ""{connection.DatabaseName}"" < ""{connection.RestoreFileLocation}""";
             }
             else
             {
-                fileName = connection.DatabaseBackupType;
+                fileName = "pg_dump";
                 arguments = $@"-U {connection.UserName} -d ""{connection.DatabaseName}"" ""{connection.RestoreFileLocation}""";
             }
 

MainWindow.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.ComponentModel;
@@ -51,8 +51,8 @@ private void OnFormLoad(object sender, EventArgs e)
 
             var commandType = new List<string>()
             {
-                CommandTypeConstants.PgRestore,
-                CommandTypeConstants.PgDump
+                CommandTypeConstants.PgRestore.key,
+                CommandTypeConstants.PgDump.key
             };
             var actionTypes = new List<string>()
             {
@@ -129,7 +129,7 @@ private void OnRestore(object sender, EventArgs e)
                     Password = PasswordElm.Text.Trim(),
                     DatabaseName = DatabaseElem.Text.Trim(),
                     ActionTypeValue = ActionSelectorElem.SelectedValue.ToString(),
-                    DatabaseBackupType = TypeSelectorElem.SelectedValue.ToString(),
+                    IsForPgDump = (TypeSelectorElem.SelectedValue.ToString() == CommandTypeConstants.PgDump.key),
                     RestoreFileLocation = TargetLocation.FileName.Trim(),
                 }
                 .Validate();
@@ -194,4 +194,4 @@ private void RememberPassword_CheckedChanged(object sender, EventArgs e)
             }
         }
     }
-}
+}

README.md

@@ -1,4 +1,4 @@
 # postgres-database-restore-service
 ## Overview
-![image](https://user-images.githubusercontent.com/71131016/151153077-7ed11a50-2060-4aed-ace0-d776a9b83951.png)
+![image](https://user-images.githubusercontent.com/71131016/183951344-49cda8d3-2549-45d6-a645-d0a87f2ee820.png)
 

Validator/UserConnectionValidator.cs

@@ -26,12 +26,7 @@ public static UserConnectionVo Validate(this UserConnectionVo connectionVo)
             {
                 throw new Exception("Restore file is not selected");
             }
-
-            if (string.IsNullOrEmpty(connectionVo.DatabaseBackupType))
-            {
-                throw new Exception("Please select database backup type");
-            }
-
+            
             if (string.IsNullOrEmpty(connectionVo.ActionTypeValue))
             {
                 throw new Exception("Please select action type");

ValueObject/UserConnectionVo.cs

@@ -6,7 +6,7 @@ public class UserConnectionVo
         public string Password { get; set; }
         public string DatabaseName { get; set; }
         public string RestoreFileLocation { get; set; }
-        public string DatabaseBackupType { get; set; }
+        public bool IsForPgDump { get; set; }
         public string ActionTypeValue { get; set; }
 
     }