Add GetConnectionIdFromUri Method to ConnectionIdHelper

src/SLCore.UnitTests/Common/Helpers/ConnectionIdHelperTests.cs

@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+using System;
 using SonarLint.VisualStudio.SLCore.Common.Helpers;
 
 namespace SonarLint.VisualStudio.SLCore.UnitTests.Common.Helpers;
@@ -38,12 +39,39 @@ public class ConnectionIdHelperTests
     [DataRow("sc|", null)]
     [DataRow("sc|myorganization", "https://sonarcloud.io")]
     [DataRow("sc|https://someuri.abcdef/123", "https://sonarcloud.io")] // should not happen, but we ignore any value after "sc|"
-    public void ReturnsAsExpected(string connectionId, string expectedUri)
+    public void GetUriFromConnectionId_ReturnsAsExpected(string connectionId, string expectedUri)
     {
         var uri = new ConnectionIdHelper().GetUriFromConnectionId(connectionId);
 
         var stringUri = uri?.ToString().Trim('/'); //trim is because uri.ToString sometimes adds / at the end. This won't be a problem in real code since we use Uri-s and not strings, but for simplicity this tests asserts string equality
 
         stringUri.Should().BeEquivalentTo(expectedUri);
     }
+
+    [TestMethod]
+    [DataRow("http://someuri.com", null, "sq|http://someuri.com/")]
+    [DataRow("http://someuri.com", "something", "sq|http://someuri.com/")]
+    [DataRow("https://sonarcloud.io", "something", "sc|something")]
+    [DataRow("https://sonarcloud.io", "", null)]
+    [DataRow("https://sonarcloud.io", null, null)]
+    public void GetConnectionIdFromUri_PassUri_ReturnsAsExpected(string uriString, string organisation, string expectedConnectionId)
+    {
+        var uri = new Uri(uriString);
+
+        var testSubject = new ConnectionIdHelper();
+
+        var actualConnectionId = testSubject.GetConnectionIdFromUri(uri, organisation);
+
+        actualConnectionId.Should().Be(expectedConnectionId);
+    }
+
+    [TestMethod]
+    public void GetConnectionIdFromUri_UriIsNull_ReturnsNull()
+    {
+        var testSubject = new ConnectionIdHelper();
+
+        var actualConnectionId = testSubject.GetConnectionIdFromUri(null, "something");
+
+        actualConnectionId.Should().BeNull();
+    }
 }

src/SLCore/Common/Helpers/ConnectionIdHelper.cs

@@ -25,6 +25,8 @@ namespace SonarLint.VisualStudio.SLCore.Common.Helpers
     internal interface IConnectionIdHelper
     {
         Uri GetUriFromConnectionId(string connectionId);
+
+        string GetConnectionIdFromUri(Uri uri, string organisation);
     }
 
     internal class ConnectionIdHelper : IConnectionIdHelper
@@ -33,6 +35,22 @@ internal class ConnectionIdHelper : IConnectionIdHelper
         private const string SonarQubePrefix = "sq|";
         private static readonly Uri SonarCloudUri = new Uri("https://sonarcloud.io");
 
+        public string GetConnectionIdFromUri(Uri uri, string organisation)
+        {
+            if (uri is not null)
+            {
+                if (uri == SonarCloudUri)
+                {
+                    if (!string.IsNullOrWhiteSpace(organisation)) { return SonarCloudPrefix + organisation; }
+                }
+                else
+                {
+                    return SonarQubePrefix + uri.ToString();
+                }
+            }
+            return null;
+        }
+
         public Uri GetUriFromConnectionId(string connectionId)
         {
             if (connectionId == null)
@@ -43,8 +61,8 @@ public Uri GetUriFromConnectionId(string connectionId)
             if (connectionId.StartsWith(SonarCloudPrefix))
             {
                 var uriString = connectionId.Substring(SonarCloudPrefix.Length);
-                
-                return !string.IsNullOrWhiteSpace(uriString) ?  SonarCloudUri : null;
+
+                return !string.IsNullOrWhiteSpace(uriString) ? SonarCloudUri : null;
             }
 
             if (connectionId.StartsWith(SonarQubePrefix))