Merge pull request #59 from cesmii/cesmii/mhdev

NodeSet Model 2.0: methods, symbolicname, event notifier, allow subtypes
cesmii · Nov 28, 2023 · b22ec84 · b22ec84
2 parents 6ba95c2 + 0e69662
commit b22ec84
Show file tree

Hide file tree

Showing 21 changed files with 10,550 additions and 38 deletions.
diff --git a/CloudLibSync/CloudLibSync.csproj b/CloudLibSync/CloudLibSync.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Opc.Ua.CloudLib.Client\Opc.Ua.Cloud.Library.Client.csproj" />
-	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.371.96" />
+	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.4.372.76" />
 	  <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
 	  <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta3.22114.1" />
   </ItemGroup>

diff --git a/UACloudLibraryServer/Authentication/ApiKeyTokenProvider.cs b/UACloudLibraryServer/Authentication/ApiKeyTokenProvider.cs
@@ -122,11 +122,10 @@ public async Task<bool> ValidateAsync(string purpose, string token, UserManager<
                 }
             }
             throw new ArgumentException($"Key not found");
-
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="userManager">UserManager to use to generate and set the key.</param>
         /// <param name="user">User for who to generate the key for.</param>
@@ -165,26 +164,17 @@ internal class ApiKeyGenerationException : Exception
     {
         public IEnumerable<string> Errors { get; private set; }
 
-        public ApiKeyGenerationException()
-        {
-        }
+        public ApiKeyGenerationException() { }
 
         public ApiKeyGenerationException(string message, IEnumerable<string> enumerable) : base(message)
         {
             Errors = enumerable;
         }
 
-        public ApiKeyGenerationException(string message) : base(message)
-        {
-        }
+        public ApiKeyGenerationException(string message) : base(message) { }
 
-        public ApiKeyGenerationException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+        public ApiKeyGenerationException(string message, Exception innerException) : base(message, innerException) { }
 
-        protected ApiKeyGenerationException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
+        protected ApiKeyGenerationException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
-
 }
diff --git a/UACloudLibraryServer/CloudLibDataProvider.cs b/UACloudLibraryServer/CloudLibDataProvider.cs
@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using CESMII.OpcUa.NodeSetModel;
+using CESMII.OpcUa.NodeSetModel.Opc.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Logging;
@@ -107,6 +108,10 @@ public IQueryable<ObjectModel> GetObjects(string modelUri = null, DateTime? publ
         {
             return GetNodeModels<ObjectModel>(nsm => nsm.Objects, modelUri, publicationDate, nodeId);
         }
+        public IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null)
+        {
+            return GetNodeModels<MethodModel>(nsm => nsm.Methods, modelUri, publicationDate, nodeId);
+        }
 
 
         public IQueryable<NodeModel> GetAllNodes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null)
@@ -526,7 +531,15 @@ private void MapToEntity(ref NamespaceMetaDataModel entity, UANameSpace uaNamesp
         {
             var identifier = nodeSetModel != null ? nodeSetModel.Identifier : uaNamespace.Nodeset.Identifier.ToString(CultureInfo.InvariantCulture);
             entity.NodesetId = identifier;
-            entity.CreationTime = uaNamespace.CreationTime ?? DateTime.Now;
+            if (uaNamespace.CreationTime != null)
+            {
+                entity.CreationTime = uaNamespace.CreationTime.GetNormalizedPublicationDate();
+            }
+            else
+            {
+                entity.CreationTime = DateTime.Now;
+            }
+
             entity.NodeSet = nodeSetModel;
             entity.Title = uaNamespace.Title;
             entity.ContributorId = contributor?.Id ?? 0;

diff --git a/UACloudLibraryServer/GraphQL/AppDbContext.cs b/UACloudLibraryServer/GraphQL/AppDbContext.cs
@@ -154,6 +154,7 @@ protected override void OnModelCreating(ModelBuilder builder)
                 .Property(nsm => nsm.ValidationStatus)
                     .HasConversion<string>();
             builder.Entity<NodeSetModel>()
+                .Ignore(nsm => nsm.HeaderComments)
                 .HasAlternateKey(nm => nm.Identifier)
                 ;
 

diff --git a/UACloudLibraryServer/GraphQL/QueryModel.cs b/UACloudLibraryServer/GraphQL/QueryModel.cs
@@ -107,6 +107,11 @@ public IQueryable<ObjectModel> GetObjects([Service(ServiceKind.Synchronized)] ID
         {
             return dp.GetObjects(modelUri ?? nodeSetUrl, publicationDate, nodeId);
         }
+        [UsePaging, UseFiltering, UseSorting]
+        public IQueryable<MethodModel> GetMethods([Service(ServiceKind.Synchronized)] IDatabase dp, string modelUri = null, string nodeSetUrl = null, DateTime? publicationDate = null, string nodeId = null)
+        {
+            return dp.GetMethods(modelUri ?? nodeSetUrl, publicationDate, nodeId);
+        }
 
         [UsePaging, UseFiltering, UseSorting]
         public IQueryable<NodeModel> GetAllNodes([Service(ServiceKind.Synchronized)] IDatabase dp, string modelUri = null, string nodeSetUrl = null, DateTime? publicationDate = null, string nodeId = null)
@@ -221,6 +226,7 @@ protected override void Configure(IObjectTypeDescriptor<CloudLibNodeSetModel> de
             ConfigureField(descriptor.Field(f => f.DataTypes));
             ConfigureField(descriptor.Field(f => f.Interfaces));
             ConfigureField(descriptor.Field(f => f.Objects));
+            ConfigureField(descriptor.Field(f => f.Methods));
             ConfigureField(descriptor.Field(f => f.Properties));
             ConfigureField(descriptor.Field(f => f.DataVariables));
             ConfigureField(descriptor.Field(f => f.ReferenceTypes));

diff --git a/UACloudLibraryServer/Interfaces/IDatabase.cs b/UACloudLibraryServer/Interfaces/IDatabase.cs
@@ -64,6 +64,7 @@ public interface IDatabase
         IQueryable<ReferenceTypeModel> GetReferenceTypes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<InterfaceModel> GetInterfaces(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<ObjectModel> GetObjects(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
+        IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<NodeModel> GetAllNodes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
 
         IQueryable<CategoryModel> GetCategories();