Refactor code structure for improved readability and maintainability

Dto/AddEnvironmentDomainDto.cs

@@ -6,3 +6,4 @@
         public Guid DomainId { get; set; }
     }
 }
+

Dto/BaseDetailsDto.cs

@@ -27,3 +27,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto
         public string CreatedBy { get; set; } = "System";
     }
 }
+

Dto/BaseDto.cs

@@ -12,3 +12,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto
         public Guid Id { get; set; }
     }
 }
+

Dto/Deployment/Add/AddDeploymentDto.cs

@@ -3,10 +3,11 @@
     public class AddDeploymentDto
     {
         public Guid DeploymentGroupId { get; set; }
-        public Guid VirtualMachineId { get; set; }
+        public Guid TargetId { get; set; }
 
         public string Status { get; set; }
         public string JsonData { get; set; }
         
     }
 }
+

Dto/Deployment/Add/AddDeploymentRequestDto.cs

@@ -1,9 +1,10 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Add
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Add
 {
     public class AddDeploymentRequestDto
     {
         public Guid DeploymentGroupId { get; set; }
-        public ICollection<Guid> VirtualMachineIds { get; set; } = new List<Guid>();
+        public ICollection<Guid> TargetIds { get; set; } = new List<Guid>();
         public string JsonData { get; set; } = "{}";
     }
 }
+

Dto/Deployment/Add/QueueJobStepApprovalDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Add
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Add
 {
     public class QueueJobStepApprovalDto
     {
@@ -6,3 +6,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Add
         public string? ApprovedBy { get; set; }
     }
 }
+

Dto/Deployment/Edit/EditDeploymentDto.cs

@@ -11,9 +11,10 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Edit
         public string jsonData { get; set; }
 
         [Column(Order = 1)]
-        public Guid VirtualMachineId { get; set; }
+        public Guid TargetId { get; set; }
         [Column(Order = 1)]
         public Guid DeploymentGroupId { get; set; }
 
     }
 }
+

Dto/Deployment/Get/GetDeploymentDetailsDto.cs

@@ -1,13 +1,14 @@
-using Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get;
+using Microsoft.SelfService.Portal.Core.API.Dto.Target.Get;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
 {
     public class GetDeploymentDetailsDto : BaseDetailsDto
     {
-        public Guid VirtualMachineId { get; set; }
+        public Guid TargetId { get; set; }
         public string Status { get; set; }
         public string JSONData { get; set; }
 
-        public GetVirtualMachineDetailsDto VirtualMachine { get; set; }
+        public GetTargetDetailsDto Target { get; set; }
     }
 }
+

Dto/Deployment/Get/GetDeploymentDto.cs

@@ -5,8 +5,9 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
     public class GetDeploymentDto : BaseDto
     {
         public Guid DeploymentGroupId { get; set; }
-        public Guid VirtualMachineId { get; set; }
+        public Guid TargetId { get; set; }
         public string Status { get; set; }
         public string JSONData { get; set; }
     }
 }
+

Dto/Deployment/Get/GetQueueJobDetailsDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
 {
     public class GetQueueJobDetailsDto : BaseDetailsDto
     {
@@ -16,3 +16,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
         public ICollection<GetQueueJobStepDto> Steps { get; set; } = new List<GetQueueJobStepDto>();
     }
 }
+

Dto/Deployment/Get/GetQueueJobDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
 {
     public class GetQueueJobDto : BaseDto
     {
@@ -14,3 +14,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
         public int FailedTargetCount { get; set; }
     }
 }
+

Dto/Deployment/Get/GetQueueJobStepDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
 {
     public class GetQueueJobStepDto : BaseDto
     {
@@ -13,3 +13,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
         public string? ApprovalComment { get; set; }
     }
 }
+

Dto/Deployment/Get/GetQueueJobTargetDto.cs

@@ -1,8 +1,8 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
 {
     public class GetQueueJobTargetDto : BaseDto
     {
-        public Guid VirtualMachineId { get; set; }
+        public Guid TargetId { get; set; }
         public Guid DeploymentGroupId { get; set; }
         public Guid TemplateId { get; set; }
         public string Status { get; set; } = string.Empty;
@@ -10,3 +10,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get
         public string? ErrorMessage { get; set; }
     }
 }
+

Dto/DeploymentBatch/Add/AddDeploymentBatchDto.cs

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentBatch.Add
+{
+    public class AddDeploymentBatchDto
+    {
+        [Column(Order = 1)]
+        public Guid TemplateId { get; set; }
+
+        [Column(Order = 2)]
+        public Guid? DeploymentRuleId { get; set; }
+
+        [Column(Order = 3)]
+        public string Status { get; set; } = string.Empty;
+
+        [Column(Order = 4)]
+        public ICollection<Guid>? TargetIds { get; set; }
+    }
+}
+

Dto/DeploymentBatch/Edit/EditDeploymentBatchDto.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentBatch.Edit
+{
+    public class EditDeploymentBatchDto
+    {
+        [Column(Order = 1)]
+        public Guid TemplateId { get; set; }
+
+        [Column(Order = 2)]
+        public Guid? DeploymentRuleId { get; set; }
+
+        [Column(Order = 3)]
+        public string Status { get; set; } = string.Empty;
+    }
+}
+

Dto/DeploymentBatch/Get/GetDeploymentBatchDetailsDto.cs

@@ -0,0 +1,21 @@
+using Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get;
+using Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Get;
+using Microsoft.SelfService.Portal.Core.API.Dto.Template.Get;
+
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentBatch.Get
+{
+    public class GetDeploymentBatchDetailsDto : BaseDto
+    {
+        public Guid? DeploymentRuleId { get; set; }
+
+        public string Status { get; set; } = string.Empty;
+
+        public GetTemplateDetailsDto Template { get; set; } = null!;
+
+        public ICollection<GetDeploymentDetailsDto> Deployments { get; set; } = new List<GetDeploymentDetailsDto>();
+        public ICollection<GetDeploymentTemplateSelectionDto> TemplateSelections { get; set; } = new List<GetDeploymentTemplateSelectionDto>();
+        public ICollection<GetDeploymentParameterValueDto> ParameterValues { get; set; } = new List<GetDeploymentParameterValueDto>();
+        public ICollection<GetDeploymentTargetAssignmentDto> TargetAssignments { get; set; } = new List<GetDeploymentTargetAssignmentDto>();
+    }
+}
+

Dto/DeploymentBatch/Get/GetDeploymentBatchDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentBatch.Get
+{
+    public class GetDeploymentBatchDto : BaseDetailsDto
+    {
+        public Guid TemplateId { get; set; }
+
+        public Guid? DeploymentRuleId { get; set; }
+
+        public string Status { get; set; } = string.Empty;
+    }
+}
+

Dto/DeploymentComposition/Add/AddDeploymentParameterValueDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Add
+{
+    public class AddDeploymentParameterValueDto
+    {
+        public Guid? DeploymentTemplateSelectionId { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string ValueJson { get; set; } = "{}";
+        public bool IsSecretReference { get; set; }
+        public bool IsOverride { get; set; } = true;
+    }
+}
+

Dto/DeploymentComposition/Add/AddDeploymentTargetAssignmentDto.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Add
+{
+    public class AddDeploymentTargetAssignmentDto
+    {
+        public Guid TargetId { get; set; }
+        public string RoleKey { get; set; } = "Node";
+        public int SortOrder { get; set; }
+        public string NodeDataJson { get; set; } = "{}";
+    }
+}
+

Dto/DeploymentComposition/Add/AddDeploymentTemplateSelectionDto.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Add
+{
+    public class AddDeploymentTemplateSelectionDto
+    {
+        public Guid TemplateVersionId { get; set; }
+        public string TemplateRole { get; set; } = "Service";
+        public int SortOrder { get; set; }
+        public string? Alias { get; set; }
+    }
+}
+

Dto/DeploymentComposition/Get/GetDeploymentCompositionDto.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Get
+{
+    public class GetDeploymentCompositionDto
+    {
+        public Guid DeploymentBatchId { get; set; }
+        public ICollection<GetDeploymentTemplateSelectionDto> TemplateSelections { get; set; } = new List<GetDeploymentTemplateSelectionDto>();
+        public ICollection<GetDeploymentParameterValueDto> ParameterValues { get; set; } = new List<GetDeploymentParameterValueDto>();
+        public ICollection<GetDeploymentTargetAssignmentDto> TargetAssignments { get; set; } = new List<GetDeploymentTargetAssignmentDto>();
+    }
+}
+

Dto/DeploymentComposition/Get/GetDeploymentParameterValueDto.cs

@@ -0,0 +1,13 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Get
+{
+    public class GetDeploymentParameterValueDto : BaseDto
+    {
+        public Guid DeploymentGroupId { get; set; }
+        public Guid? DeploymentTemplateSelectionId { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string ValueJson { get; set; } = "{}";
+        public bool IsSecretReference { get; set; }
+        public bool IsOverride { get; set; }
+    }
+}
+

Dto/DeploymentComposition/Get/GetDeploymentTargetAssignmentDto.cs

@@ -0,0 +1,15 @@
+using Microsoft.SelfService.Portal.Core.API.Dto.Target.Get;
+
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Get
+{
+    public class GetDeploymentTargetAssignmentDto : BaseDto
+    {
+        public Guid DeploymentGroupId { get; set; }
+        public Guid TargetId { get; set; }
+        public string RoleKey { get; set; } = string.Empty;
+        public int SortOrder { get; set; }
+        public string NodeDataJson { get; set; } = "{}";
+        public GetTargetDto? Target { get; set; }
+    }
+}
+

Dto/DeploymentComposition/Get/GetDeploymentTemplateSelectionDto.cs

@@ -0,0 +1,15 @@
+using Microsoft.SelfService.Portal.Core.API.Dto.TemplateVersion.Get;
+
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentComposition.Get
+{
+    public class GetDeploymentTemplateSelectionDto : BaseDto
+    {
+        public Guid DeploymentGroupId { get; set; }
+        public Guid TemplateVersionId { get; set; }
+        public string TemplateRole { get; set; } = string.Empty;
+        public int SortOrder { get; set; }
+        public string? Alias { get; set; }
+        public GetTemplateVersionDto? TemplateVersion { get; set; }
+    }
+}
+

Dto/DeploymentGroup/Add/AddDeploymentGroupDto.cs

@@ -1,15 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentGroup.Add
-{
-    public class AddDeploymentGroupDto
-    {
-        [Column(Order = 1)]
-        public Guid TemplateId { get; set; }
-        [Column(Order = 2)]
-        public string Status { get; set; }
-        [Column(Order = 3)]
-        public ICollection<Guid>? VirtualMachineIds { get; set; }
-
-    }
-}

Dto/DeploymentGroup/Edit/EditDeploymentGroupDto.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentGroup.Edit
-{
-    public class EditDeploymentGroupDto
-    {
-        [Column(Order = 1)]
-        public Guid TemplateId { get; set; }
-        [Column(Order = 2)]
-        public string Status { get; set; }
-    }
-}

Dto/DeploymentGroup/Get/GetDeploymentGroupDetailsDto.cs

@@ -1,14 +0,0 @@
-using Microsoft.SelfService.Portal.Core.API.Dto.Deployment.Get;
-using Microsoft.SelfService.Portal.Core.API.Dto.Template.Get;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentGroup.Get
-{
-    public class GetDeploymentGroupDetailsDto : BaseDto
-    {
-        public string Status { get; set; }
-
-        public GetTemplateDetailsDto Template { get; set; }
-
-        public ICollection <GetDeploymentDetailsDto> Deployments { get; set; }
-    }
-}

Dto/DeploymentGroup/Get/GetDeploymentGroupDto.cs

@@ -1,8 +0,0 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentGroup.Get
-{
-    public class GetDeploymentGroupDto
-    {
-        public Guid Id { get; set; }
-        public string Status { get; set; }
-    }
-}

Dto/DeploymentRule/Add/AddDeploymentRuleDto.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentRule.Add
+{
+    public class AddDeploymentRuleDto
+    {
+        public string Name { get; set; }
+        public string? Description { get; set; }
+        public bool IsActive { get; set; } = true;
+        public ICollection<AddDeploymentRuleStepDto> Steps { get; set; } = new List<AddDeploymentRuleStepDto>();
+    }
+}
+

Dto/DeploymentRule/Add/AddDeploymentRuleStepDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentRule.Add
+{
+    public class AddDeploymentRuleStepDto
+    {
+        public int SortOrder { get; set; }
+        public string Name { get; set; }
+        public string StepType { get; set; }
+        public bool RequiresApproval { get; set; }
+        public string? MetadataJson { get; set; }
+    }
+}
+

Dto/DeploymentRule/Get/GetDeploymentRuleDto.cs

@@ -0,0 +1,11 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentRule.Get
+{
+    public class GetDeploymentRuleDto : BaseDetailsDto
+    {
+        public string Name { get; set; }
+        public string? Description { get; set; }
+        public bool IsActive { get; set; }
+        public ICollection<GetDeploymentRuleStepDto> Steps { get; set; } = new List<GetDeploymentRuleStepDto>();
+    }
+}
+

Dto/DeploymentRule/Get/GetDeploymentRuleStepDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.DeploymentRule.Get
+{
+    public class GetDeploymentRuleStepDto : BaseDetailsDto
+    {
+        public int SortOrder { get; set; }
+        public string Name { get; set; }
+        public string StepType { get; set; }
+        public bool RequiresApproval { get; set; }
+        public string? MetadataJson { get; set; }
+    }
+}
+

Dto/Domain/Add/AddDomainDto.cs

@@ -12,3 +12,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Add
         public string NetBIOS { get; set; }
     }
 }
+

Dto/Domain/Edit/EditDomainDto.cs

@@ -12,3 +12,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Edit
         public string NetBIOS { get; set; }
     }
 }
+

Dto/Domain/Get/GetDomainDetailsDto.cs

@@ -13,3 +13,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
         
     }
 }
+

Dto/Domain/Get/GetDomainDto.cs

@@ -12,3 +12,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
         public string Name { get; set; }
     }
 }
+

Dto/Domain/Get/GetDomainEnvironmentDetailsDto.cs

@@ -9,3 +9,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
         
     }
 }
+

Dto/Domain/Get/GetDomainEnvironmentDto.cs

@@ -16,3 +16,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
         public ICollection<GetDomainEnvironmentDetailsDto> EnvironmentDomains { get; set; }
     }
 }
+

Dto/Domain/Get/GetDomainTargetDetailsDto.cs

@@ -1,10 +1,10 @@
-using Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get;
+using Microsoft.SelfService.Portal.Core.API.Dto.Target.Get;
 using Microsoft.SelfService.Portal.Core.API.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
 {
-    public class GetDomainVirtualMachineDetailsDto : BaseDetailsDto
+    public class GetDomainTargetDetailsDto : BaseDetailsDto
     {
 
         [Column(Order = 1)]
@@ -15,6 +15,7 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get
         public string NetBIOS { get; set; }
         
         [Column(Order = 4)]
-        public ICollection<GetVirtualMachineDto> VirtualMachines { get; set; }
+        public ICollection<GetTargetDto> Targets { get; set; }
     }
 }
+

Dto/Environment/Add/AddEnvironmentDto.cs

@@ -8,18 +8,22 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Add
         public string Name { get; set; }
 
         [Column(Order = 2)]
-        public string EnvironmentType { get; set; } = "OnPrem";
+        public string EnvironmentType { get; set; } = "Test";
 
         [Column(Order = 3)]
-        public string? ProviderType { get; set; }
+        public string HostingType { get; set; } = "OnPrem";
 
         [Column(Order = 4)]
-        public string? TenantId { get; set; }
+        public string? ProviderType { get; set; }
 
         [Column(Order = 5)]
-        public string? SubscriptionId { get; set; }
+        public string? TenantId { get; set; }
 
         [Column(Order = 6)]
+        public string? SubscriptionId { get; set; }
+
+        [Column(Order = 7)]
         public string? MetadataJson { get; set; }
     }
 }
+

Dto/Environment/Edit/EditEnvironmentDto.cs

@@ -8,18 +8,22 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Edit
         public string Name { get; set; }
 
         [Column(Order = 2)]
-        public string EnvironmentType { get; set; } = "OnPrem";
+        public string EnvironmentType { get; set; } = "Test";
 
         [Column(Order = 3)]
-        public string? ProviderType { get; set; }
+        public string HostingType { get; set; } = "OnPrem";
 
         [Column(Order = 4)]
-        public string? TenantId { get; set; }
+        public string? ProviderType { get; set; }
 
         [Column(Order = 5)]
-        public string? SubscriptionId { get; set; }
+        public string? TenantId { get; set; }
 
         [Column(Order = 6)]
+        public string? SubscriptionId { get; set; }
+
+        [Column(Order = 7)]
         public string? MetadataJson { get; set; }
     }
 }
+

Dto/Environment/Get/GetEnvironmentDetailsDto.cs

@@ -11,15 +11,19 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
         public string EnvironmentType { get; set; }
 
         [Column(Order = 3)]
-        public string? ProviderType { get; set; }
+        public string HostingType { get; set; }
 
         [Column(Order = 4)]
-        public string? TenantId { get; set; }
+        public string? ProviderType { get; set; }
 
         [Column(Order = 5)]
-        public string? SubscriptionId { get; set; }
+        public string? TenantId { get; set; }
 
         [Column(Order = 6)]
+        public string? SubscriptionId { get; set; }
+
+        [Column(Order = 7)]
         public string? MetadataJson { get; set; }
     }
 }
+

Dto/Environment/Get/GetEnvironmentDomainDetailsDto.cs

@@ -1,4 +1,4 @@
-using Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get;
+using Microsoft.SelfService.Portal.Core.API.Dto.Domain.Get;
 using Microsoft.SelfService.Portal.Core.API.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -32,3 +32,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
         }
     }
 }
+

Dto/Environment/Get/GetEnvironmentDomainDto.cs

@@ -1,4 +1,4 @@
-using Microsoft.SelfService.Portal.Core.API.Models;
+using Microsoft.SelfService.Portal.Core.API.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
@@ -9,6 +9,24 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
         public string Name { get; set; }
 
         [Column(Order = 2)]
+        public string EnvironmentType { get; set; }
+
+        [Column(Order = 3)]
+        public string HostingType { get; set; }
+
+        [Column(Order = 4)]
+        public string? ProviderType { get; set; }
+
+        [Column(Order = 5)]
+        public string? TenantId { get; set; }
+
+        [Column(Order = 6)]
+        public string? SubscriptionId { get; set; }
+
+        [Column(Order = 7)]
+        public string? MetadataJson { get; set; }
+
+        [Column(Order = 8)]
         public ICollection<GetEnvironmentDomainDetailsDto> EnvironmentDomains { get; set; }
 
         public static GetEnvironmentDomainDto FromModel(EnvironmentModel environment)
@@ -17,6 +35,12 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
             {
                 Id = environment.Id,
                 Name = environment.Name,
+                EnvironmentType = environment.EnvironmentType,
+                HostingType = environment.HostingType,
+                ProviderType = environment.ProviderType,
+                TenantId = environment.TenantId,
+                SubscriptionId = environment.SubscriptionId,
+                MetadataJson = environment.MetadataJson,
                 Created = environment.Created,
                 CreatedBy = environment.CreatedBy,
                 Modified = environment.Modified,
@@ -29,3 +53,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
         }
     }
 }
+

Dto/Environment/Get/GetEnvironmentDto.cs

@@ -11,12 +11,16 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Environment.Get
         public string EnvironmentType { get; set; }
 
         [Column(Order = 3)]
-        public string? ProviderType { get; set; }
+        public string HostingType { get; set; }
 
         [Column(Order = 4)]
-        public string? TenantId { get; set; }
+        public string? ProviderType { get; set; }
 
         [Column(Order = 5)]
+        public string? TenantId { get; set; }
+
+        [Column(Order = 6)]
         public string? SubscriptionId { get; set; }
     }
 }
+

Dto/Runbook/Add/AddRunbookDto.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Runbook.Add
-{
-    public class AddRunbookDto
-    {
-        [Column(Order = 1)]
-        public string Name { get; set; }
-
-        [Column(Order = 2)]
-        public string Description { get; set; }
-    }
-}

Dto/Runbook/Get/GetRunbookDetailsDto.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Runbook.Get
-{
-    public class GetRunbookDetailsDto : BaseDetailsDto
-    {
-        [Column(Order = 1)]
-        public string Name { get; set; }
-
-        [Column(Order = 2)]
-        public string Decription { get; set; }
-    }
-}

Dto/Runbook/Get/GetRunbookDto.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Runbook.Get
-{
-    public class GetRunbookDto : BaseDto
-    {
-        [Column(Order = 1)]
-        public string Name { get; set; }
-
-        [Column(Order = 2)]
-        public string Decription { get; set; }
-    }
-}

Dto/Service/Add/AddServiceDto.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Add
 {
@@ -17,3 +17,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Add
         public string? IconKey { get; set; }
     }
 }
+

Dto/Service/Edit/EditServiceDto.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Edit
 {
@@ -17,3 +17,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Edit
         public string? IconKey { get; set; }
     }
 }
+

Dto/Service/Get/GetServiceDetailsDto.cs

@@ -14,3 +14,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Get
         public string? IconKey { get; set; }
     }
 }
+

Dto/Service/Get/GetServiceDto.cs

@@ -17,3 +17,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.Get
         public string? IconKey { get; set; }
     }
 }
+

Dto/Service/RoleDefinition/AddServiceRoleDefinitionDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
 {
     public class AddServiceRoleDefinitionDto
     {
@@ -7,3 +7,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
         public string? Description { get; set; }
     }
 }
+

Dto/Service/RoleDefinition/EditServiceRoleDefinitionDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
 {
     public class EditServiceRoleDefinitionDto
     {
@@ -7,3 +7,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Service.RoleDefinition
         public string? Description { get; set; }
     }
 }
+

Dto/Target/Add/AddTargetDto.cs

@@ -0,0 +1,13 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Target.Add
+{
+    public class AddTargetDto
+    {
+        public Guid? DomainID { get; set; }
+        public string Name { get; set; }
+        public string TargetType { get; set; } = "VirtualMachine";
+        public string ProviderType { get; set; } = "OnPrem";
+        public string? ExternalId { get; set; }
+        public string? MetadataJson { get; set; }
+    }
+}
+

Dto/Target/Edit/EditTargetDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Target.Edit
+{
+    public class EditTargetDto
+    {
+        public string Name { get; set; }
+        public string TargetType { get; set; } = "VirtualMachine";
+        public string ProviderType { get; set; } = "OnPrem";
+        public string? ExternalId { get; set; }
+        public string? MetadataJson { get; set; }
+    }
+}
+

Dto/Target/Get/GetTargetDetailsDto.cs

@@ -2,9 +2,9 @@
 using Microsoft.SelfService.Portal.Core.API.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Target.Get
 {
-    public class GetVirtualMachineDetailsDto : BaseDetailsDto
+    public class GetTargetDetailsDto : BaseDetailsDto
     {
 
         [Column(Order = 1)]
@@ -14,11 +14,18 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get
         public string Name { get; set; }
 
         [Column(Order = 3)]
-        public string? ExternalId { get; set; }
+        public string TargetType { get; set; }
 
         [Column(Order = 4)]
+        public string ProviderType { get; set; }
+
+        [Column(Order = 5)]
+        public string? ExternalId { get; set; }
+
+        [Column(Order = 6)]
         public string? MetadataJson { get; set; }
 
         public GetDomainDto? Domain { get; set; }
     }
 }
+

Dto/Target/Get/GetTargetDto.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.Target.Get
 {
-    public class GetVirtualMachineDto : BaseDto
+    public class GetTargetDto : BaseDto
     {
         [Column(Order = 1)]
         public Guid? DomainID { get; set; }
@@ -11,7 +11,14 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Get
         public string Name { get; set; }
 
         [Column(Order = 3)]
+        public string TargetType { get; set; }
+
+        [Column(Order = 4)]
+        public string ProviderType { get; set; }
+
+        [Column(Order = 5)]
         public string? ExternalId { get; set; }
     }
 
 }
+

Dto/Template/Add/AddTemplateDto.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Template.Add
 {
@@ -20,3 +20,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Template.Add
         public string JSONData { get; set; }
     }
 }
+

Dto/Template/Edit/EditTemplateDto.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.SelfService.Portal.Core.API.Dto.Template.Edit
 {
@@ -20,3 +20,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.Template.Edit
         public string JSONData { get; set; }
     }
 }
+

Dto/Template/Get/GetTemplateDetailsDto.cs

@@ -10,3 +10,4 @@
 
     }
 }
+

Dto/Template/Get/GetTemplateDto.cs

@@ -9,3 +9,4 @@
         public string JSONData { get; set; }
     }
 }
+

Dto/TemplateCategory/Add/AddTemplateCategoryDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Add
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Add
 {
     public class AddTemplateCategoryDto
     {
@@ -9,3 +9,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Add
         public string? Color { get; set; }
     }
 }
+

Dto/TemplateCategory/Edit/EditTemplateCategoryDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Edit
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Edit
 {
     public class EditTemplateCategoryDto
     {
@@ -9,3 +9,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Edit
         public string? Color { get; set; }
     }
 }
+

Dto/TemplateCategory/Get/GetTemplateCategoryDetailsDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
 {
     public class GetTemplateCategoryDetailsDto : BaseDetailsDto
     {
@@ -9,3 +9,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
         public string? Color { get; set; }
     }
 }
+

Dto/TemplateCategory/Get/GetTemplateCategoryDto.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
 {
     public class GetTemplateCategoryDto : BaseDto
     {
@@ -9,3 +9,4 @@ namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateCategory.Get
         public string? Color { get; set; }
     }
 }
+

Dto/TemplateVersion/Add/AddTemplateVersionDto.cs

@@ -0,0 +1,12 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateVersion.Add
+{
+    public class AddTemplateVersionDto
+    {
+        public string Version { get; set; } = "1.0.0";
+        public string JsonData { get; set; } = "{}";
+        public string SchemaVersion { get; set; } = "1.0";
+        public bool Publish { get; set; }
+        public string? PublishedBy { get; set; }
+    }
+}
+

Dto/TemplateVersion/Get/GetTemplateVersionDto.cs

@@ -0,0 +1,15 @@
+namespace Microsoft.SelfService.Portal.Core.API.Dto.TemplateVersion.Get
+{
+    public class GetTemplateVersionDto : BaseDetailsDto
+    {
+        public Guid TemplateId { get; set; }
+        public string Version { get; set; } = string.Empty;
+        public string JsonData { get; set; } = "{}";
+        public string JsonHash { get; set; } = string.Empty;
+        public string SchemaVersion { get; set; } = "1.0";
+        public bool IsPublished { get; set; }
+        public DateTime? PublishedAt { get; set; }
+        public string? PublishedBy { get; set; }
+    }
+}
+

Dto/VirtualMachine/Add/AddVirtualMachineDto.cs

@@ -1,10 +0,0 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Add
-{
-    public class AddVirtualMachineDto
-    {
-        public Guid? DomainID { get; set; }
-        public string Name { get; set; }
-        public string? ExternalId { get; set; }
-        public string? MetadataJson { get; set; }
-    }
-}

Dto/VirtualMachine/Edit/EditVirtualMachineDto.cs

@@ -1,9 +0,0 @@
-namespace Microsoft.SelfService.Portal.Core.API.Dto.VirtualMachine.Edit
-{
-    public class EditVirtualMachineDto
-    {
-        public string Name { get; set; }
-        public string? ExternalId { get; set; }
-        public string? MetadataJson { get; set; }
-    }
-}