Merge pull request #4 from romanett/clean_architecture

Switch to Clean architecture

GDSwithREST/Data/Models/ApiModels/ApplicationApiModel.cs → GDSwithREST.Domain/ApiModels/ApplicationApiModel.cs

@@ -1,13 +1,14 @@
-using System.Runtime.Serialization;
+using GDSwithREST.Domain.Entities;
+using System.Runtime.Serialization;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.Json.Serialization;
 
-namespace GDSwithREST.Data.Models.ApiModels
+namespace GDSwithREST.Domain.ApiModels
 {
     /// <summary>
     /// A GDS registered Application
     /// </summary>
-    public class ApplicationApiModel
+    public sealed class ApplicationApiModel
     {
         /// <summary>
         /// The Guid identifying the Application
@@ -26,17 +27,17 @@ public class ApplicationApiModel
         /// <summary>
         /// The gds signed certificate of the Application
         /// </summary>
-        public X509CertificateApiModel? Certificate { get;set; }
+        public X509CertificateApiModel? Certificate { get; set; }
 
-        
-        public ApplicationApiModel(Applications application)
+
+        public ApplicationApiModel(Application application)
         {
             ApplicationId = application.ApplicationId;
             ApplicationUri = application.ApplicationUri;
             ApplicationName = application.ApplicationName;
             ProductUri = application.ProductUri;
             ApplicationType = (ApplicationType)application.ApplicationType;
-            if(application.Certificate.Length > 0)
+            if (application.Certificate.Length > 0)
                 Certificate = new X509CertificateApiModel(new X509Certificate2(application.Certificate));
         }
         [JsonConstructor]

GDSwithREST/Data/Models/ApiModels/CertificateGroupApiModel.cs → GDSwithREST.Domain/ApiModels/CertificateGroupApiModel.cs

@@ -1,18 +1,15 @@
-using Opc.Ua.Gds.Server;
-using Opc.Ua;
-using System.Security.Cryptography.X509Certificates;
-using System.Configuration;
-using GDSwithREST.Services.GdsBackgroundService.Databases;
+using System.Security.Cryptography.X509Certificates;
 using System.Runtime.Serialization;
+using Opc.Ua.Gds.Server;
 
-namespace GDSwithREST.Data.Models.ApiModels
+namespace GDSwithREST.Domain.ApiModels
 {
     /// <summary>
     /// Certificate Group of the GDS
     /// </summary>
-    public class CertificateGroupApiModel
+    public sealed class CertificateGroupApiModel
     {
-        public CertificateGroupApiModel(CertificateGroup certificateGroup)
+        public CertificateGroupApiModel(ICertificateGroup certificateGroup)
         {
             try
             {
@@ -39,9 +36,9 @@ public CertificateGroupApiModel(uint id, X509Certificate2 certificate, bool upda
 
         public CertificateGroupType Id { get; set; }
         public bool UpdateRequired { get; set; }
-        public X509CertificateApiModel? Ceritificate { get; set; }        
+        public X509CertificateApiModel? Ceritificate { get; set; }
     }
-    
+
     /// <summary>
     /// Type of the Certificate Group
     /// </summary>

GDSwithREST/Data/Models/ApiModels/X509CertificateApiModel.cs → GDSwithREST.Domain/ApiModels/X509CertificateApiModel.cs

@@ -1,12 +1,11 @@
-using Newtonsoft.Json;
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 
-namespace GDSwithREST.Data.Models.ApiModels
+namespace GDSwithREST.Domain.ApiModels
 {
     /// <summary>
     /// A X509 Certificate
     /// </summary>
-    public class X509CertificateApiModel
+    public sealed class X509CertificateApiModel
     {
         public string Subject { get; set; }
         public string Thumbprint { get; set; }

GDSwithREST/Data/Models/Applications.cs → GDSwithREST.Domain/Entities/Application.cs

@@ -1,12 +1,12 @@
-namespace GDSwithREST.Data.Models
+namespace GDSwithREST.Domain.Entities
 {
-    public partial class Applications
+    public sealed class Application
     {
-        public Applications()
+        public Application()
         {
-            ApplicationNames = new HashSet<ApplicationNames>();
-            CertificateRequests = new HashSet<CertificateRequests>();
-            ServerEndpoints = new HashSet<ServerEndpoints>();
+            ApplicationNames = new HashSet<ApplicationName>();
+            CertificateRequests = new HashSet<CertificateRequest>();
+            ServerEndpoints = new HashSet<ServerEndpoint>();
         }
 
         public int Id { get; set; }
@@ -21,10 +21,10 @@ public Applications()
         public int? TrustListId { get; set; }
         public int? HttpsTrustListId { get; set; }
 
-        public CertificateStores HttpsTrustList { get; set; } = null!;
-        public CertificateStores TrustList { get; set; } = null!;
-        public ICollection<ApplicationNames> ApplicationNames { get; set; }
-        public ICollection<CertificateRequests> CertificateRequests { get; set; }
-        public ICollection<ServerEndpoints> ServerEndpoints { get; set; }
+        public CertificateStore HttpsTrustList { get; set; } = null!;
+        public CertificateStore TrustList { get; set; } = null!;
+        public ICollection<ApplicationName> ApplicationNames { get; set; }
+        public ICollection<CertificateRequest> CertificateRequests { get; set; }
+        public ICollection<ServerEndpoint> ServerEndpoints { get; set; }
     }
 }

GDSwithREST/Data/Models/ApplicationNames.cs → GDSwithREST.Domain/Entities/ApplicationName.cs

@@ -1,12 +1,12 @@
-namespace GDSwithREST.Data.Models
+namespace GDSwithREST.Domain.Entities
 {
-    public partial class ApplicationNames
+    public sealed class ApplicationName
     {
         public int Id { get; set; }
         public int ApplicationId { get; set; }
         public string Locale { get; set; } = null!;
         public string? Text { get; set; }
 
-        public Applications Application { get; set; } = null!;
+        public Application Application { get; set; } = null!;
     }
 }

GDSwithREST/Data/Models/CertificateRequests.cs → GDSwithREST.Domain/Entities/CertificateRequest.cs

@@ -1,6 +1,6 @@
-namespace GDSwithREST.Data.Models
+namespace GDSwithREST.Domain.Entities
 {
-    public partial class CertificateRequests
+    public sealed class CertificateRequest
     {
         public int Id { get; set; }
         public Guid RequestId { get; set; }
@@ -15,6 +15,6 @@ public partial class CertificateRequests
         public string? PrivateKeyPassword { get; set; } = null!;
         public string AuthorityId { get; set; } = null!;
 
-        public Applications Application { get; set; } = null!;
+        public Application Application { get; set; } = null!;
     }
 }

GDSwithREST.Domain/Entities/CertificateStore.cs

@@ -0,0 +1,18 @@
+namespace GDSwithREST.Domain.Entities
+{
+    public sealed class CertificateStore
+    {
+        public CertificateStore()
+        {
+            ApplicationsHttpsTrustList = new HashSet<Application>();
+            ApplicationsTrustList = new HashSet<Application>();
+        }
+
+        public int Id { get; set; }
+        public string Path { get; set; } = null!;
+        public string AuthorityId { get; set; } = null!;
+
+        public ICollection<Application> ApplicationsHttpsTrustList { get; set; }
+        public ICollection<Application> ApplicationsTrustList { get; set; }
+    }
+}

GDSwithREST/Data/Models/ServerEndpoints.cs → GDSwithREST.Domain/Entities/ServerEndpoint.cs

@@ -1,11 +1,11 @@
-namespace GDSwithREST.Data.Models
+namespace GDSwithREST.Domain.Entities
 {
-    public partial class ServerEndpoints
+    public sealed class ServerEndpoint
     {
         public int Id { get; set; }
         public int ApplicationId { get; set; }
         public string DiscoveryUrl { get; set; } = null!;
 
-        public Applications Application { get; set; } = null!;
+        public Application Application { get; set; } = null!;
     }
 }

GDSwithREST.Domain/GDSwithREST.Domain.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.4.372.76" />
+  </ItemGroup>
+
+</Project>

GDSwithREST.Domain/Repositories/IApplicationNameRepository.cs

@@ -0,0 +1,18 @@
+using GDSwithREST.Domain.Entities;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface IApplicationNameRepository
+    {
+        public Task<IEnumerable<ApplicationName>> GetAllApplicationNames();
+        public Task<IEnumerable<ApplicationName>> GetApplicationNamesByApplicationId(int id);
+        public void RemoveApplicationNames(ApplicationName[] applicationNames);
+        public ApplicationName AddApplicationName(ApplicationName applicationName);
+    }
+}

GDSwithREST.Domain/Repositories/IApplicationRepository.cs

@@ -0,0 +1,18 @@
+using GDSwithREST.Domain.Entities;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface IApplicationRepository
+    {
+        public Task<IEnumerable<Application>> GetAllApplications();
+        public Task<Application?> GetApplicationById(Guid id);
+        public IQueryable<Application> GetApplicationsByUri(string ApplicationUri);
+        public void RemoveApplication(Application application);
+        public Application AddApplication(Application application);
+
+        /// <summary>
+        /// persists the changes made to an Application instance
+        /// </summary>
+        public void SaveChanges();
+    }
+}

GDSwithREST.Domain/Repositories/ICertificateRequestRepository.cs

@@ -0,0 +1,16 @@
+using GDSwithREST.Domain.Entities;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface ICertificateRequestRepository
+    {
+        public void RemoveCertificateRequests(CertificateRequest[] certificateRequests);
+
+        public Task<CertificateRequest?> GetCertificateRequestById(Guid id);
+
+        /// <summary>
+        /// persists the changes made to an CeritificateRequest instance
+        /// </summary>
+        public void SaveChanges();
+    }
+}

GDSwithREST.Domain/Repositories/ICertificateStoreRepository.cs

@@ -0,0 +1,14 @@
+using GDSwithREST.Domain.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface ICertificateStoreRepository
+    {
+        public Task<CertificateStore?> GetCertificateStoreByPath(string path);
+    }
+}

GDSwithREST.Domain/Repositories/IPersistencyRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface IPersistencyRepository
+    {
+        public Task MigrateDatabaseAsync();
+    }
+}

GDSwithREST.Domain/Repositories/IServerEndpointRepository.cs

@@ -0,0 +1,18 @@
+using GDSwithREST.Domain.Entities;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GDSwithREST.Domain.Repositories
+{
+    public interface IServerEndpointRepository
+    {
+        public Task<IEnumerable<ServerEndpoint>> GetAllServerEndpoints();
+        public Task<IEnumerable<ServerEndpoint>> GetServerEndpointsByApplicationId(int id);
+        public void RemoveServerEndpoints(ServerEndpoint[] serverEndpoints);
+        public ServerEndpoint AddServerEndpoint(ServerEndpoint serverEndpoint);
+    }
+}