Merge pull request #1 from mahdighorbanpour/feature/upgradePackages

Feature/upgrade packages
PTW-Freiburg · Dec 1, 2021 · 5f9aaf9 · 5f9aaf9
2 parents 05dd393 + 28737ed
commit 5f9aaf9
Show file tree

Hide file tree

Showing 10 changed files with 202 additions and 121 deletions.
diff --git a/Telstra.Twins.Common/Telstra.Twins.Common.csproj b/Telstra.Twins.Common/Telstra.Twins.Common.csproj
@@ -1,16 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.1</Version>
-    <Authors>Telstra ADT Team</Authors>
-    <Company>Telstra</Company>
-    <Description>Digital Twins Common</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <Version>1.0.2</Version>
+        <Authors>Telstra ADT Team</Authors>
+        <Company>Telstra</Company>
+        <Description>Digital Twins Common</Description>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    </ItemGroup>
+
+</Project>
diff --git a/Telstra.Twins/Helpers/ReflectionHelpers.cs b/Telstra.Twins/Helpers/ReflectionHelpers.cs
@@ -72,6 +72,14 @@ public static List<PropertyInfo> GetModelProperties(this Type t) =>
             .Where(p => Attribute.IsDefined(p, typeof(TwinPropertyAttribute)))
             .ToList();
 
+        public static List<PropertyInfo> GetModelPropertiesFromAbstractParent(this Type t) =>
+            t.BaseType.IsAbstract && t.BaseType.Name != typeof(TwinBase).Name && !Attribute.IsDefined(t.BaseType.GetModelPropertyType(), typeof(DigitalTwinAttribute))
+                ? t.BaseType.GetProperties()
+                    .Where(p => p.DeclaringType == t.BaseType)
+                    .Where(p => Attribute.IsDefined(p, typeof(TwinPropertyAttribute)))
+                    .ToList()
+                : new();
+
         public static List<PropertyInfo> GetModelOnlyProperties(this Type t) =>
             t.GetProperties()
                 .Where(p => p.DeclaringType == t)
@@ -90,6 +98,14 @@ public static List<PropertyInfo> GetModelRelationships(this Type t) =>
             .Where(p => Attribute.IsDefined(p, typeof(TwinRelationshipAttribute)))
             .ToList();
 
+        public static List<PropertyInfo> GetModelRelationshipsFromAbstractParent(this Type t) =>
+           t.BaseType.IsAbstract && t.BaseType.Name != typeof(TwinBase).Name && !Attribute.IsDefined(t.BaseType.GetModelPropertyType(), typeof(DigitalTwinAttribute))
+               ? t.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)
+                    .Where(p => p.DeclaringType == t.BaseType)
+                    .Where(p => Attribute.IsDefined(p, typeof(TwinRelationshipAttribute)))
+                    .ToList()
+               : new();
+
         public static List<PropertyInfo> GetTwinRelationships(this Type t) =>
             t.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)
             .Where(p => Attribute.IsDefined(p, typeof(TwinRelationshipAttribute)))
@@ -154,7 +170,7 @@ public static string GetTwinPropertyName(this PropertyInfo p)
             }
             else if (Attribute.IsDefined(p, typeof(JsonPropertyAttribute)))
             {
-                var customAttribute = p.GetCustomAttribute<JsonPropertyAttribute>(); 
+                var customAttribute = p.GetCustomAttribute<JsonPropertyAttribute>();
                 twinPropertyName = customAttribute?.PropertyName;
             }
 
@@ -172,7 +188,7 @@ public static string GetModelPropertyName(this PropertyInfo p)
             }
             else if (Attribute.IsDefined(p, typeof(TwinPropertyAttribute)))
             {
-                var modelOnlyPropertyAttribute = p.GetCustomAttribute<JsonPropertyAttribute>(); 
+                var modelOnlyPropertyAttribute = p.GetCustomAttribute<JsonPropertyAttribute>();
                 modelPropertyName = modelOnlyPropertyAttribute?.PropertyName;
             }
 
@@ -187,10 +203,10 @@ public static string GetJsonPropertyName(this PropertyInfo p)
             {
                 var jsonNameAttribute = p.GetCustomAttribute<JsonPropertyNameAttribute>();
                 jsonPropertyName = jsonNameAttribute?.Name;
-            } 
+            }
             else if (Attribute.IsDefined(p, typeof(JsonPropertyAttribute)))
             {
-                var jsonNameAttribute = p.GetCustomAttribute<JsonPropertyAttribute>(); 
+                var jsonNameAttribute = p.GetCustomAttribute<JsonPropertyAttribute>();
                 jsonPropertyName = jsonNameAttribute?.PropertyName;
             }
 

diff --git a/Telstra.Twins/Models/ModelComponent.Factory.cs b/Telstra.Twins/Models/ModelComponent.Factory.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using Telstra.Twins.Helpers;
 using Telstra.Twins.Common;
+using Telstra.Twins.Attributes;
 
 namespace Telstra.Twins.Models
 {
@@ -9,9 +10,11 @@ public partial class ModelComponent : Content
         public static ModelComponent Create(PropertyInfo info)
         {
             var t = info.PropertyType;
+            var attr = info.GetCustomAttribute<TwinComponentAttribute>();
+
             return new ModelComponent()
             {
-                Name = t.Name.ToCamelCase(),
+                Name = attr.Name?.ToCamelCase() ?? t.Name.ToCamelCase(),
                 Schema = t.GetDigitalTwinModelId()
             };
         }

diff --git a/Telstra.Twins/Models/ModelProperty.Factory.cs b/Telstra.Twins/Models/ModelProperty.Factory.cs
@@ -56,12 +56,14 @@ public static ModelProperty Create(PropertyInfo info)
         private static object SchemaFromType(PropertyInfo info)
         {
             var propertyType = info.PropertyType;
+            var nullableType = Nullable.GetUnderlyingType(propertyType);
             if (SchemaMap.ContainsKey(propertyType))
-            {
                 return SchemaMap[propertyType];
+            else if (nullableType != null && SchemaMap.ContainsKey(nullableType))
+            {
+                return SchemaMap[nullableType];
             }
-
-            if (propertyType.IsArray)
+            else if (propertyType.IsArray)
             {
                 var schema = new Dictionary<string, string>();
                 schema.Add("@type", "Array");

diff --git a/Telstra.Twins/Models/ModelRelationship.Factory.cs b/Telstra.Twins/Models/ModelRelationship.Factory.cs
@@ -13,6 +13,7 @@ public static ModelRelationship Create(PropertyInfo info)
 
             return new ModelRelationship(info.Name.ToCamelCase())
             {
+                Name = attr.Name?.ToCamelCase() ?? info.Name.ToCamelCase(),
                 DisplayName = attr.DisplayName,
                 Comment = attr.Comment,
                 Description = attr.Description,

diff --git a/Telstra.Twins/Serialization/ClassToTwinModelConverter.cs b/Telstra.Twins/Serialization/ClassToTwinModelConverter.cs
@@ -178,6 +178,11 @@ protected static void AddPropertiesContent(List<Content> contents)
             var modelProperties = typeToAnalyze.GetModelProperties()
                 .ToList()
                 .Select(ModelProperty.Create);
+            var parentProperties = typeToAnalyze.GetModelPropertiesFromAbstractParent()
+                .ToList()
+                .Select(ModelProperty.Create);
+
+            contents.AddRange(parentProperties);
             contents.AddRange(modelProperties);
         }
 
@@ -187,6 +192,12 @@ protected static void AddModelRelationshipsContent(List<Content> contents)
             var modelProperties = typeToAnalyze.GetModelRelationships()
                 .ToList()
                 .Select(ModelRelationship.Create);
+
+            var parentProperties = typeToAnalyze.GetModelRelationshipsFromAbstractParent()
+                .ToList()
+                .Select(ModelRelationship.Create);
+
+            contents.AddRange(parentProperties);
             contents.AddRange(modelProperties);
         }
 

diff --git a/Telstra.Twins/Telstra.Twins.csproj b/Telstra.Twins/Telstra.Twins.csproj
@@ -1,46 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>Telstra.Twins</RootNamespace>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.3</Version>
-    <Authors>Telstra ADT Team</Authors>
-    <Company>Telstra</Company>
-    <Description>Telstra Digital Twins Core</Description>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <RootNamespace>Telstra.Twins</RootNamespace>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <Version>1.0.4</Version>
+        <Authors>Telstra ADT Team</Authors>
+        <Company>Telstra</Company>
+        <Description>Telstra Digital Twins Core</Description>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Utils\TwinClassGenerator\SampleTwin.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="Utils\TwinClassGenerator\SampleTwin.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Utils\TwinClassGenerator\SampleTwin.cs">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Utils\TwinClassGenerator\SampleTwin.cs">
+            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        </EmbeddedResource>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Azure.DigitalTwins.Core" Version="1.2.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.3.0-beta.4" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.3.0-beta.4" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.7.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Azure.DigitalTwins.Parser" Version="3.12.5" />
-    <PackageReference Include="Microsoft.Azure.EventGrid" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="16.8.33" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Azure.DigitalTwins.Core" Version="1.2.2" />
+        <PackageReference Include="Azure.Messaging.EventHubs" Version="5.6.2" />
+        <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.6.2" />
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Azure.DigitalTwins.Parser" Version="3.12.7" />
+        <PackageReference Include="Microsoft.Azure.EventGrid" Version="3.2.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.0.34" />
+        <PackageReference Include="Polly" Version="7.2.2" />
+        <PackageReference Include="System.Reactive" Version="5.0.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Telstra.Twins.Common\Telstra.Twins.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Telstra.Twins.Common\Telstra.Twins.Common.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Tests/Telstra.Twins.Test/SerializationTests.cs b/Tests/Telstra.Twins.Test/SerializationTests.cs
@@ -1,17 +1,13 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Azure.DigitalTwins.Core;
-using Telstra.Twins.Attributes;
 using Telstra.Twins.Core;
 using Telstra.Twins.Models;
 using Telstra.Twins.Services;
 using Xunit;
 using Xunit.Abstractions;
-using FluentAssertions;
+using System.IO;
+using Telstra.Twins.Helpers;
 
 namespace Telstra.Twins.Test
 {
@@ -36,6 +32,29 @@ public void ShouldSerialiseModelToDTDL(string expectedModel, Type twinType)
 
         }
 
+        [Theory]
+        [InlineData(typeof(Building))]
+        [InlineData(typeof(Floor))]
+        public void ShouldSerialiseModelToDTDLCustomized(Type type)
+        {
+            var model = Serializer.SerializeModel(type);
+            if (!Directory.Exists("DTDL Models"))
+            {
+                Directory.CreateDirectory("DTDL Models");
+            }
+            File.WriteAllText(Path.Combine("DTDL Models", $"{type.Name}.json"), model);
+        }
+
+        [Fact]
+        public void Building_RelationName_Should_MatchWithAttribute()
+        {
+            var model = typeof(Building).GetModelRelationships();
+            var moelRel = ModelRelationship.Create(model[0]);
+            Assert.Equal("contains", moelRel.Name);
+
+            var modelLibrary = new ModelLibrary();
+        }
+
         [Theory]
         [MemberData(nameof(TwinTestData))]
         public void ShouldSerialiseTwinToDTDL(string twinDTDL, object twinObject)

diff --git a/Tests/Telstra.Twins.Test/Telstra.Twins.Test.csproj b/Tests/Telstra.Twins.Test/Telstra.Twins.Test.csproj
@@ -1,31 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
 
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.1.0" />
-    <PackageReference Include="FluentAssertions.Json" Version="6.0.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="FluentAssertions" Version="6.2.0" />
+        <PackageReference Include="FluentAssertions.Json" Version="6.0.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Telstra.Twins\Telstra.Twins.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\Telstra.Twins\Telstra.Twins.csproj" />
+    </ItemGroup>
 
 </Project>