Fixed possibility for multiple commands with the same name exists

Author: Muchaszewski

Slack-GPT-Socket.sln.DotSettings.user

@@ -20,5 +20,7 @@
     <TestId>NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.WhatsNewCommand_Ok</TestId>
     <TestId>NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.WhatsNewCommand_Error</TestId>
     <TestId>NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.TestLiteDB.TestNullConnectionString_Ok</TestId>
+    <TestId>NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.CommandsCommand_AddOverwrite_Ok</TestId>
+    <TestId>NUnit3x::8513CAC6-F4FB-4821-B229-7B2E31E1DA66::net7.0::Slack_GPT_Tests.Handlers.CommandHandlerTests.CommandsCommand_RemoveSingle_Ok</TestId>
   </TestAncestor>
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

Slack-GPT-Socket/SlackHandlers/Command/CommandsCommandStrategy.cs

@@ -127,7 +127,12 @@ private SlashCommandResponse AddCommand(SlashCommand command, string restOfComma
                 ? null
                 : command.UserId
         };
-        _userCommandDb.AddCommand(newCommand);
+        if (!_userCommandDb.AddCommand(newCommand))
+        {
+            return CommandStrategyUtils.SlashCommandResponse(
+                $"Command {newCommand.Command} already exists. " +
+                $"Use /commands remove {newCommand.Command} to remove it first.");
+        }
         return CommandStrategyUtils.SlashCommandResponse(
             $"Added command {newCommand.Command} described as {newCommand.Description}\n" +
             $"\tPrompt:{newCommand.Prompt}.\n" +

Slack-GPT-Socket/SlackHandlers/Command/WhatsNewCommandStrategy.cs

@@ -3,6 +3,9 @@
 
 namespace Slack_GPT_Socket.Command;
 
+/// <summary>
+///     Handles the whatsnew command. Basically just a wrapper for the GitHub API, to get the latest release notes.
+/// </summary>
 public class WhatsNewCommandStrategy : ICommandStrategy
 {
     private readonly GitHubClient _github;
@@ -18,6 +21,11 @@ public WhatsNewCommandStrategy()
 
     public string Command => "whatsnew";
 
+    /// <summary>
+    ///     Returns the latest release notes.
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
     public async Task<SlashCommandResponse> Execute(SlashCommand command)
     {
         var versionString = command.Text.Substring(8).Trim();
@@ -31,7 +39,11 @@ public async Task<SlashCommandResponse> Execute(SlashCommand command)
 
         if (latestRelease == null)
             return CommandStrategyUtils.SlashCommandResponse($"No release found for current version. {currentVersion}");
-
-        return CommandStrategyUtils.SlashCommandResponse(latestRelease.Body);
+        
+        return CommandStrategyUtils.SlashCommandResponse(
+            $"*{latestRelease.TagName}*\n" +
+            $"{latestRelease.Body}\n" +
+            $"\n" +
+            $"\t{latestRelease.HtmlUrl}");
     }
 }

Slack-GPT-Socket/Utilities/LiteDB/IUserCommandDb.cs

@@ -19,7 +19,7 @@ public interface IUserCommandDb
     ///     Adds a command to the database.
     /// </summary>
     /// <param name="command"></param>
-    void AddCommand(GptUserCommand command);
+    bool AddCommand(GptUserCommand command);
 
     /// <summary>
     ///     Removes a command from the database.

Slack-GPT-Socket/Utilities/LiteDB/UserCommandDB.cs

@@ -25,15 +25,23 @@ public UserCommandDb(ILiteDatabase database)
     }
 
     /// <inheritdoc />
-    public void AddCommand(GptUserCommand command)
+    public bool AddCommand(GptUserCommand command)
     {
+        var dbCommand = FindCommand(command.Command, command.UserId);
+        if (dbCommand != null) return false;
         _commands.Insert(command);
+        return true;
     }
 
     /// <inheritdoc />
     public void RemoveCommand(GptUserCommand command)
     {
-        _commands.DeleteMany(x => x.Command == command.Command && x.UserId == command.UserId);
+        // Find the command in the database to ensure that the ID is correct.
+        var dbCommand = FindCommand(command.Command, command.UserId);
+        
+        // If we do that, first remove command will remove local commands, then global commands.
+        // Instead all global and user at once.
+        _commands.DeleteMany(x => x.Command == dbCommand.Command && x.UserId == dbCommand.UserId);
     }
 
     /// <inheritdoc />

Slack-GPT-Tests/Handlers/CommandHandlerTests.cs

@@ -317,4 +317,85 @@ public async Task WhatsNewCommand_Error()
         // Assert
         AssertCommandResult(response, "No release found");
     }
+    
+    [Test]
+    [TestCase(true)]
+    [TestCase(false)]
+    public async Task CommandsCommand_AddOverwrite_Ok(bool isGlobal)
+    {
+        // Arrange
+        var addCommand1 = new SlashCommand
+        {
+            Text = $"commands add -command prompt1 {(isGlobal ? "-global" : "")}",
+            UserId = "U0123ID"
+        };
+        var addCommand2 = new SlashCommand
+        {
+            Text = $"commands add -command prompt2 {(isGlobal ? "-global" : "")}",
+            UserId = "U0123ID"
+        };
+        var listCommand = new SlashCommand
+        {
+            Text = "commands",
+            UserId = "U0123ID"
+        };
+        var listCommandDetails = new SlashCommand
+        {
+            Text = "commands help -command",
+            UserId = "U0123ID"
+        };
+
+
+        // Act
+        var add1 = await _commandManager.Execute(addCommand1);
+        var add2 = await _commandManager.Execute(addCommand2);
+        var list = await _commandManager.Execute(listCommand);
+        var listDetails = await _commandManager.Execute(listCommandDetails);
+
+        // Assert
+        AssertCommandResult(add1, "Added command");
+        AssertCommandResult(add2, "already exists");
+        AssertCommandResult(list, "-command");
+        AssertCommandResult(listDetails, "prompt1");
+    }
+    
+    [Test]
+    public async Task CommandsCommand_RemoveSingle_Ok()
+    {
+        // Arrange
+        var addCommand1 = new SlashCommand
+        {
+            Text = $"commands add -command prompt1 -global",
+            UserId = "U0123ID"
+        };
+        var addCommand2 = new SlashCommand
+        {
+            Text = $"commands add -command prompt2",
+            UserId = "U0123ID"
+        };
+        var listCommand = new SlashCommand
+        {
+            Text = "commands",
+            UserId = "U0123ID"
+        };
+        var removeCommand = new SlashCommand
+        {
+            Text = "commands remove -command",
+            UserId = "U0123ID"
+        };
+
+        // Act
+        var add1 = await _commandManager.Execute(addCommand1);
+        var add2 = await _commandManager.Execute(addCommand2);
+        var list1 = await _commandManager.Execute(listCommand);
+        var remove1 = await _commandManager.Execute(removeCommand);
+        var list2 = await _commandManager.Execute(listCommand);
+
+        // Assert
+        AssertCommandResult(add1, "Added command");
+        AssertCommandResult(add2, "already exists");
+        AssertCommandResult(list1, "-command [Global]");
+        AssertCommandResult(remove1, "Removed command -command.");
+        AssertCommandResult(list2, "No commands found.");
+    }
 }