Move types around

Author: deansheather

Diff for: App/Services/MutagenController.cs

@@ -23,50 +23,50 @@
 
 namespace Coder.Desktop.App.Services;
 
-public enum CreateSyncSessionRequestEndpointProtocol
-{
-    Local,
-    Ssh,
-}
-
-public class CreateSyncSessionRequestEndpoint
+public class CreateSyncSessionRequest
 {
-    public required CreateSyncSessionRequestEndpointProtocol Protocol { get; init; }
-    public string User { get; init; } = "";
-    public string Host { get; init; } = "";
-    public uint Port { get; init; } = 0;
-    public string Path { get; init; } = "";
+    public required Endpoint Alpha { get; init; }
+    public required Endpoint Beta { get; init; }
 
-    public URL MutagenUrl
+    public class Endpoint
     {
-        get
+        public enum ProtocolKind
         {
-            var protocol = Protocol switch
-            {
-                CreateSyncSessionRequestEndpointProtocol.Local => MutagenProtocol.Local,
-                CreateSyncSessionRequestEndpointProtocol.Ssh => MutagenProtocol.Ssh,
-                _ => throw new ArgumentException($"Invalid protocol '{Protocol}'", nameof(Protocol)),
-            };
+            Local,
+            Ssh,
+        }
 
-            return new URL
+        public required ProtocolKind Protocol { get; init; }
+        public string User { get; init; } = "";
+        public string Host { get; init; } = "";
+        public uint Port { get; init; } = 0;
+        public string Path { get; init; } = "";
+
+        public URL MutagenUrl
+        {
+            get
             {
-                Kind = Kind.Synchronization,
-                Protocol = protocol,
-                User = User,
-                Host = Host,
-                Port = Port,
-                Path = Path,
-            };
+                var protocol = Protocol switch
+                {
+                    ProtocolKind.Local => MutagenProtocol.Local,
+                    ProtocolKind.Ssh => MutagenProtocol.Ssh,
+                    _ => throw new ArgumentException($"Invalid protocol '{Protocol}'", nameof(Protocol)),
+                };
+
+                return new URL
+                {
+                    Kind = Kind.Synchronization,
+                    Protocol = protocol,
+                    User = User,
+                    Host = Host,
+                    Port = Port,
+                    Path = Path,
+                };
+            }
         }
     }
 }
 
-public class CreateSyncSessionRequest
-{
-    public required CreateSyncSessionRequestEndpoint Alpha { get; init; }
-    public required CreateSyncSessionRequestEndpoint Beta { get; init; }
-}
-
 public interface ISyncSessionController : IAsyncDisposable
 {
     Task<IEnumerable<SyncSessionModel>> ListSyncSessions(CancellationToken ct = default);

Diff for: App/ViewModels/FileSyncListViewModel.cs

@@ -250,14 +250,14 @@ private async Task ConfirmNewSession()
         {
             await _syncSessionController.CreateSyncSession(new CreateSyncSessionRequest
             {
-                Alpha = new CreateSyncSessionRequestEndpoint
+                Alpha = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                     Path = NewSessionLocalPath,
                 },
-                Beta = new CreateSyncSessionRequestEndpoint
+                Beta = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Ssh,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Ssh,
                     Host = NewSessionRemoteHost,
                     Path = NewSessionRemotePath,
                 },

Diff for: Tests.App/Services/MutagenControllerTest.cs

@@ -101,14 +101,14 @@ public async Task Ok(CancellationToken ct)
 
         var session1 = await controller.CreateSyncSession(new CreateSyncSessionRequest
         {
-            Alpha = new CreateSyncSessionRequestEndpoint
+            Alpha = new CreateSyncSessionRequest.Endpoint
             {
-                Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                 Path = alphaDirectory.FullName,
             },
-            Beta = new CreateSyncSessionRequestEndpoint
+            Beta = new CreateSyncSessionRequest.Endpoint
             {
-                Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                 Path = betaDirectory.FullName,
             },
         }, ct);
@@ -119,14 +119,14 @@ public async Task Ok(CancellationToken ct)
 
         var session2 = await controller.CreateSyncSession(new CreateSyncSessionRequest
         {
-            Alpha = new CreateSyncSessionRequestEndpoint
+            Alpha = new CreateSyncSessionRequest.Endpoint
             {
-                Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                 Path = alphaDirectory.FullName,
             },
-            Beta = new CreateSyncSessionRequestEndpoint
+            Beta = new CreateSyncSessionRequest.Endpoint
             {
-                Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                 Path = betaDirectory.FullName,
             },
         }, ct);
@@ -199,14 +199,14 @@ public async Task CreateRestartsDaemon(CancellationToken ct)
             await controller.Initialize(ct);
             await controller.CreateSyncSession(new CreateSyncSessionRequest
             {
-                Alpha = new CreateSyncSessionRequestEndpoint
+                Alpha = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                     Path = alphaDirectory.FullName,
                 },
-                Beta = new CreateSyncSessionRequestEndpoint
+                Beta = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                     Path = betaDirectory.FullName,
                 },
             }, ct);
@@ -239,14 +239,14 @@ public async Task Orphaned(CancellationToken ct)
             await controller1.Initialize(ct);
             await controller1.CreateSyncSession(new CreateSyncSessionRequest
             {
-                Alpha = new CreateSyncSessionRequestEndpoint
+                Alpha = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                     Path = alphaDirectory.FullName,
                 },
-                Beta = new CreateSyncSessionRequestEndpoint
+                Beta = new CreateSyncSessionRequest.Endpoint
                 {
-                    Protocol = CreateSyncSessionRequestEndpointProtocol.Local,
+                    Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Local,
                     Path = betaDirectory.FullName,
                 },
             }, ct);