Skip to content

Commit 3cf1d60

Browse files
omaxelomaxel
committed
Added support for child class patch.
1 parent fd6184a commit 3cf1d60

10 files changed

+95
-38
lines changed

‎Changelog.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
3.0.1 - Sep 01, 2018
2+
* Added support for child class patch.
3+
14
3.0.0 - July 18, 2018
25
* Break change: All entities types which is used in Delta<T> or DeltaCollection<T> must be declared in DeltaConfig.Init().
36
* Break change: excluded property and 'ignore null value' option must be declared in DeltaConfig.Init().

‎src/SimplePatch.Tests/ClassInheritTests.cs

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
namespace SimplePatch.Tests
4+
{
5+
[TestClass, TestCategory(TestCategories.ClassInheritance)]
6+
public class ClassInheritTests : TestBase
7+
{
8+
[ClassInitialize]
9+
public static void ClassInit(TestContext context)
10+
{
11+
DeltaConfig.Init(cfg => cfg.AddEntity<PersonExtended>());
12+
}
13+
14+
[ClassCleanup]
15+
public static void ClassCleanup()
16+
{
17+
DeltaConfig.Clean();
18+
}
19+
20+
private class PersonExtended : Person
21+
{
22+
public string Address { get; set; }
23+
}
24+
25+
[TestMethod]
26+
public void TestMethod()
27+
{
28+
const string name = "John";
29+
const string surname = "Doe";
30+
const string address = "Person address";
31+
32+
var johnExtended = new PersonExtended();
33+
34+
var delta = new Delta<PersonExtended>();
35+
delta.Add(x => x.Name, name);
36+
delta.Add(x => x.Surname, surname);
37+
delta.Add(x => x.Address, address);
38+
delta.Patch(johnExtended);
39+
40+
Assert.AreEqual(name, johnExtended.Name);
41+
Assert.AreEqual(surname, johnExtended.Surname);
42+
Assert.AreEqual(address, johnExtended.Address);
43+
}
44+
}
45+
}

‎src/SimplePatch.Tests/ConfigurationTests/Globals.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void IgnoreLetterCase()
2323
.AddEntity<Person>();
2424
});
2525

26-
GetDelta("AgE", 23).Patch(John);
26+
CreateDelta<Person>("AgE", 23).Patch(John);
2727
Assert.AreEqual(23, John.Age);
2828
}
2929

@@ -66,11 +66,11 @@ then the assigned value will be the length of the string + 0.5*/
6666
});
6767

6868
// First mapping function will be executed here, Age type is int
69-
GetDelta(x => x.Age, "abc").Patch(John);
69+
CreateDelta<Person, int>(x => x.Age, "abc").Patch(John);
7070
Assert.AreEqual("abc".Length, John.Age);
7171

7272
// Second mapping function will be executed here, Height type is double
73-
GetDelta(x => x.Height, "abcdef").Patch(John);
73+
CreateDelta<Person, double>(x => x.Height, "abcdef").Patch(John);
7474
Assert.AreEqual("abcdef".Length + 0.5, John.Height);
7575
}
7676
}

‎src/SimplePatch.Tests/ConfigurationTests/Properties.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void Exclude()
2727

2828
var initialAge = John.Age;
2929

30-
GetDelta(x => x.Age, 23).Patch(John);
30+
CreateDelta<Person, int>(x => x.Age, 23).Patch(John);
3131

3232
Assert.AreEqual(initialAge, John.Age);
3333
}
@@ -44,7 +44,7 @@ public void IgnoreNullValue()
4444

4545
var initialName = John.Name;
4646

47-
GetDelta<string, string>(x => x.Name, null).Patch(John);
47+
CreateDelta<Person, string>(x => x.Name, null).Patch(John);
4848

4949
Assert.AreEqual(initialName, John.Name);
5050
}
@@ -108,19 +108,19 @@ public void MappingFunction()
108108
});
109109

110110
// Global mapping function executed here
111-
GetDelta(x => x.Surname, "Rossi").Patch(John);
111+
CreateDelta<Person, string>(x => x.Surname, "Rossi").Patch(John);
112112
Assert.AreEqual("issoR", John.Surname);
113113

114114
// First property mapping function executed here
115-
GetDelta(x => x.Name, "Mario").Patch(John);
115+
CreateDelta<Person, string>(x => x.Name, "Mario").Patch(John);
116116
Assert.AreEqual("Mario", John.Name);
117117

118118
// Second property mapping function executed here
119-
GetDelta(x => x.Name, 15).Patch(John);
119+
CreateDelta<Person, string>(x => x.Name, 15).Patch(John);
120120
Assert.AreEqual("number:15", John.Name);
121121

122122
// Third property mapping function executed here
123-
GetDelta(x => x.Name, John.BirthDate).Patch(John);
123+
CreateDelta<Person, string>(x => x.Name, John.BirthDate).Patch(John);
124124
Assert.AreEqual("datetime:1990-02-01T20:15:10", John.Name);
125125
}
126126
}

‎src/SimplePatch.Tests/DeltaUtils.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@ namespace SimplePatch.Tests
55
{
66
internal class DeltaUtils
77
{
8-
internal static Delta<Person> GetDelta<TProp, T>(Expression<Func<Person, TProp>> property, T propValue)
8+
internal static Delta<TEntity> CreateDelta<TEntity, TProp>(Expression<Func<TEntity, TProp>> property, object propValue)
9+
where TEntity : class, new()
910
{
10-
var delta = new Delta<Person>();
11+
var delta = new Delta<TEntity>();
1112
delta.Add(property, propValue);
1213
return delta;
1314
}
1415

15-
internal static Delta<Person> GetDelta<T>(string propertyName, T propValue)
16+
internal static Delta<TEntity> CreateDelta<TEntity>(string property, object propValue)
17+
where TEntity : class, new()
1618
{
17-
var delta = new Delta<Person>();
18-
delta.Add(propertyName, propValue);
19+
var delta = new Delta<TEntity>();
20+
delta.Add(property, propValue);
1921
return delta;
2022
}
21-
2223
}
2324
}

‎src/SimplePatch.Tests/PropertiesTypesTests.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,37 @@ public static void ClassCleanup()
2222
[TestMethod]
2323
public void IntProp()
2424
{
25-
GetDelta(x => x.Age, 23).Patch(John);
25+
CreateDelta<Person, int>(x => x.Age, 23).Patch(John);
2626
Assert.AreEqual(23, John.Age);
2727
}
2828

2929
[TestMethod]
3030
public void StringProp()
3131
{
32-
GetDelta(x => x.Name, "John Marco").Patch(John);
32+
CreateDelta<Person, string>(x => x.Name, "John Marco").Patch(John);
3333
Assert.AreEqual("John Marco", John.Name);
3434
}
3535

3636
[TestMethod]
3737
public void DoubleProp()
3838
{
39-
GetDelta(x => x.Height, 1.65).Patch(John);
39+
CreateDelta<Person, double>(x => x.Height, 1.65).Patch(John);
4040
Assert.AreEqual(1.65, John.Height);
4141
}
4242

4343
[TestMethod]
4444
public void DateTimeProp()
4545
{
4646
var date = DateTime.UtcNow;
47-
GetDelta(x => x.BirthDate, date).Patch(John);
47+
CreateDelta<Person, DateTime>(x => x.BirthDate, date).Patch(John);
4848
Assert.AreEqual(date, John.BirthDate);
4949
}
5050

5151
[TestMethod]
5252
public void GuidProp()
5353
{
5454
var guid = Guid.NewGuid();
55-
GetDelta(x => x.Guid, guid).Patch(John);
55+
CreateDelta<Person, Guid>(x => x.Guid, guid).Patch(John);
5656
Assert.AreEqual(guid, John.Guid);
5757
}
5858

@@ -63,30 +63,30 @@ public void GuidProp()
6363
[TestMethod]
6464
public void IntPropFromString()
6565
{
66-
GetDelta(x => x.Age, "28").Patch(John);
66+
CreateDelta<Person, int>(x => x.Age, "28").Patch(John);
6767
Assert.AreEqual(28, John.Age);
6868
}
6969

7070
[TestMethod]
7171
public void DoublePropFromString()
7272
{
73-
GetDelta(x => x.Height, "28,5").Patch(John);
73+
CreateDelta<Person, double>(x => x.Height, "28,5").Patch(John);
7474
Assert.AreEqual(28.5, John.Height);
7575
}
7676

7777
[TestMethod]
7878
public void DateTimePropFromString()
7979
{
8080
var date = DateTime.UtcNow;
81-
GetDelta(x => x.BirthDate, date.ToString("s")).Patch(John);
81+
CreateDelta<Person, DateTime>(x => x.BirthDate, date.ToString("s")).Patch(John);
8282
Assert.AreEqual(date.ToString("s"), John.BirthDate.ToString("s"));
8383
}
8484

8585
[TestMethod]
8686
public void GuidPropFromString()
8787
{
8888
var guid = Guid.NewGuid();
89-
GetDelta(x => x.Guid, guid.ToString()).Patch(John);
89+
CreateDelta<Person, Guid>(x => x.Guid, guid.ToString()).Patch(John);
9090
Assert.AreEqual(guid, John.Guid);
9191
}
9292

‎src/SimplePatch.Tests/SimplePatch.Tests.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<Reference Include="System.Core" />
4949
</ItemGroup>
5050
<ItemGroup>
51+
<Compile Include="ClassInheritTests.cs" />
5152
<Compile Include="ConfigurationTests\Properties.cs" />
5253
<Compile Include="TestBase.cs" />
5354
<Compile Include="ConfigurationTests\Globals.cs" />
@@ -57,15 +58,15 @@
5758
<Compile Include="Properties\AssemblyInfo.cs" />
5859
<Compile Include="TestCategories.cs" />
5960
</ItemGroup>
60-
<ItemGroup>
61-
<None Include="packages.config" />
62-
</ItemGroup>
6361
<ItemGroup>
6462
<ProjectReference Include="..\SimplePatch\SimplePatch.csproj">
6563
<Project>{71d49858-8706-4e19-ab53-022320b263cd}</Project>
6664
<Name>SimplePatch</Name>
6765
</ProjectReference>
6866
</ItemGroup>
67+
<ItemGroup>
68+
<None Include="packages.config" />
69+
</ItemGroup>
6970
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
7071
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7172
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎src/SimplePatch.Tests/TestCategories.cs

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ internal class TestCategories
44
{
55
public const string PropertiesTypes = "Properties Types";
66
public const string Configuration = "Configuration";
7+
public const string ClassInheritance = "Class Inheritance";
78
}
89
}

‎src/SimplePatch/Helpers/TypeHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal class TypeHelper
1414
/// <returns>List of properties belonging to the specified identity as <see cref="IEnumerable{DeltaInfo}"/></returns>
1515
internal static IEnumerable<DeltaPropInfo> GetEntityProperties<TEntity>()
1616
{
17-
return typeof(TEntity).GetTypeInfo().DeclaredProperties.Where(x => x.GetMethod.IsPublic && x.SetMethod.IsPublic && x.CanRead && x.CanWrite).Select(x => new DeltaPropInfo(x));
17+
return typeof(TEntity).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.GetMethod != null && x.GetMethod.IsPublic && x.SetMethod != null && x.SetMethod.IsPublic && x.CanRead && x.CanWrite).Select(x => new DeltaPropInfo(x));
1818
}
1919

2020

‎src/SimplePatch/SimplePatch.csproj

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net451;netstandard1.4</TargetFrameworks>
5-
<Version>3.0.0</Version>
4+
<TargetFrameworks>net461;netstandard1.4</TargetFrameworks>
5+
<Version>3.0.1</Version>
66
<Authors>Omar Muscatello</Authors>
77
<Company>Omar Muscatello</Company>
88
<Description>A simple library for partial entity changes in ASP.NET and ASP.NET Core.</Description>
99
<Copyright>Copyright (c) Omar Muscatello 2018</Copyright>
1010
<PackageLicenseUrl>https://github.com/OmarMuscatello/SimplePatch/blob/master/LICENSE</PackageLicenseUrl>
11-
<PackageReleaseNotes>* Break change: All entities types which is used in Delta&lt;T&gt; or DeltaCollection&lt;T&gt; must be declared in DeltaConfig.Init().
12-
* Break change: excluded property and 'ignore null value' option must be declared in DeltaConfig.Init().
13-
* Added global and properties mapping functions.
14-
* Added support to add property using expressions in Delta&lt;T&gt;.Add method.
15-
* Added unit tests.</PackageReleaseNotes>
11+
<PackageReleaseNotes>* Added support for child class patch.</PackageReleaseNotes>
1612
<PackageProjectUrl>https://github.com/OmarMuscatello/SimplePatch</PackageProjectUrl>
1713
<RepositoryUrl>https://github.com/OmarMuscatello/SimplePatch</RepositoryUrl>
1814
<PackageIconUrl>http://raw.github.com/OmarMuscatello/SimplePatch/master/simplepatch-icon.png</PackageIconUrl>
1915
<RepositoryType></RepositoryType>
2016
<PackageTags>patch http-patch partial-entity-changes web-api asp-net-web-api entity-framework entity-framework-core asp-net asp-net-core</PackageTags>
2117
<ApplicationIcon></ApplicationIcon>
2218
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
23-
<AssemblyVersion>3.0.0.0</AssemblyVersion>
24-
<FileVersion>3.0.0.0</FileVersion>
19+
<AssemblyVersion>3.0.1.0</AssemblyVersion>
20+
<FileVersion>3.0.1.0</FileVersion>
2521
</PropertyGroup>
2622

23+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
24+
<PackageReference Include="System.Reflection.TypeExtensions">
25+
<Version>4.5.1</Version>
26+
</PackageReference>
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
31+
</ItemGroup>
32+
2733
</Project>

0 commit comments

Comments
 (0)