new helper class for creating partition keys and row keys

Author: giometrix

src/TableStorage.Abstractions.POCO.Tests/PocoTableStoreTests.cs

@@ -1246,6 +1246,106 @@ public void get_record_with_calculated_partition_key_from_multiple_properties()
 
 		}
 
+		[TestMethod]
+		public void update_record_with_calculated_partition_key_from_multiple_properties()
+		{
+			tableStore = new PocoTableStore<Employee, int, int>("TestEmployee", "UseDevelopmentStorage=true",
+				partitionProperty: null, rowProperty: e => e.Id, calculatedPartitionKey: e => e.CompanyId + "." + e.Department.Id, calculatedRowKey: e => e.Id.ToString(),
+				calculatedPartitionKeyFromParameter: x => null,
+				calculatedRowKeyFromParameter: x => x.ToString(),
+				convertPartitionKey: null, convertRowKey: int.Parse);
+
+			var employee = new Employee
+			{
+				CompanyId = 1,
+				Id = 1,
+				Name = "Mr. Jim CEO",
+				Department = new Department { Id = 22, Name = "Executive" }
+			};
+			tableStore.Insert(employee);
+
+			employee.Name = "Ted";
+
+			tableStore.Update(employee);
+
+			var record = tableStore.GetRecord("1.22", "1");
+
+			Assert.AreEqual(1, record.Id);
+			Assert.AreEqual(22, record.Department.Id);
+			Assert.AreEqual("Ted", record.Name);
+
+		}
+
+		[TestMethod]
+		public void get_record_with_calculated_partition_key_from_multiple_properties_using_extension_method()
+		{
+			KeyGenerator.DefineParitionKey(typeof(Employee), e=>$"{e.CompanyId}.{e.DepartmentId}");
+			KeyGenerator.DefineRowKey(typeof(Employee), e => $"{e.Id}");
+
+			tableStore = new PocoTableStore<Employee, int, int>("TestEmployee", "UseDevelopmentStorage=true",
+				partitionProperty: null, rowProperty: e => e.Id, calculatedPartitionKey: e => e.CompanyId + "." + e.Department.Id, calculatedRowKey: e => e.Id.ToString(),
+				calculatedPartitionKeyFromParameter: x => null,
+				calculatedRowKeyFromParameter: x => x.ToString(),
+				convertPartitionKey: null, convertRowKey: int.Parse);
+
+			
+
+			var employee = new Employee
+			{
+				CompanyId = 1,
+				Id = 1,
+				Name = "Mr. Jim CEO",
+				Department = new Department { Id = 22, Name = "Executive" }
+			};
+			tableStore.Insert(employee);
+
+			var record = tableStore.GetRecord(KeyGenerator.PartitionKey<Employee>(new {CompanyId=1, DepartmentId=22}), 
+				KeyGenerator.RowKey<Employee>(new { Id = 1 }));
+
+			Assert.AreEqual(1, record.Id);
+			Assert.AreEqual(22, record.Department.Id);
+			Assert.AreEqual("Mr. Jim CEO", record.Name);
+
+		}
+
+
+		[TestMethod]
+		public void update_record_with_calculated_partition_key_from_multiple_properties_using_extension_method()
+		{
+			KeyGenerator.DefineParitionKey(typeof(Employee), e => $"{e.CompanyId}.{e.DepartmentId}");
+			KeyGenerator.DefineRowKey(typeof(Employee), e => $"{e.Id}");
+
+			tableStore = new PocoTableStore<Employee, int, int>("TestEmployee", "UseDevelopmentStorage=true",
+				partitionProperty: null, rowProperty: e => e.Id, calculatedPartitionKey: e => e.CompanyId + "." + e.Department.Id, calculatedRowKey: e => e.Id.ToString(),
+				calculatedPartitionKeyFromParameter: x => null,
+				calculatedRowKeyFromParameter: x => x.ToString(),
+				convertPartitionKey: null, convertRowKey: int.Parse);
+
+
+
+			var employee = new Employee
+			{
+				CompanyId = 1,
+				Id = 1,
+				Name = "Mr. Jim CEO",
+				Department = new Department { Id = 22, Name = "Executive" }
+			};
+			tableStore.Insert(employee);
+
+			employee.Name = "Ted";
+
+			tableStore.Update(employee);
+
+			var record = tableStore.GetRecord(
+				KeyGenerator.PartitionKey<Employee>(new { CompanyId = 1, DepartmentId = 22 }),
+				KeyGenerator.RowKey<Employee>(new { Id = 1 }));
+
+			Assert.AreEqual(1, record.Id);
+			Assert.AreEqual(22, record.Department.Id);
+			Assert.AreEqual("Ted", record.Name);
+
+		}
+
 		[TestCleanup]
 		public void Cleanup()
 		{

src/TableStorage.Abstractions.POCO.Tests/TableStorage.Abstractions.POCO.Tests.csproj

@@ -42,6 +42,7 @@
     <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
     </Reference>

src/TableStorage.Abstractions.POCO/KeyGenerator.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TableStorage.Abstractions.POCO
+{
+	public static class KeyGenerator
+	{
+		private static readonly ConcurrentDictionary<Type, Func<dynamic, string>> _partitionKeyExpressions = 
+			new ConcurrentDictionary<Type, Func<dynamic, string>>();
+
+		private static readonly ConcurrentDictionary<Type, Func<dynamic, string>> _rowKeyExpressions =
+			new ConcurrentDictionary<Type, Func<dynamic, string>>();
+
+		public static void DefineParitionKey(Type type, Func<dynamic, string> partitionKeyExpression)
+		{
+			_partitionKeyExpressions.TryGetValue(type, out Func<dynamic, string> expr);
+			if (expr == null)
+			{
+				_partitionKeyExpressions[type] = partitionKeyExpression;
+			}
+
+		}
+
+		public static void DefineRowKey(Type type, Func<dynamic, string> rowKeyExpression)
+		{
+			_rowKeyExpressions.TryGetValue(type, out Func<dynamic, string> expr);
+			if (expr == null)
+			{
+				_rowKeyExpressions[type] = rowKeyExpression;
+			}
+
+		}
+
+		
+		public static string PartitionKey<T>(object obj)
+		{
+			try
+			{
+				return _partitionKeyExpressions[typeof(T)](obj);
+			}
+			catch (NullReferenceException e)
+			{
+				throw new Exception("Partition definition was not provided", e);
+			}
+			
+		}
+
+		public static string RowKey<T>(object obj)
+		{
+			try
+			{
+				return _rowKeyExpressions[typeof(T)](obj);
+			}
+			catch (NullReferenceException e)
+			{
+				throw new Exception("Row key definition was not provided", e);
+			}
+
+		}
+	}
+}

src/TableStorage.Abstractions.POCO/TableStorage.Abstractions.POCO.csproj

@@ -88,6 +88,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="KeyGenerator.cs" />
     <Compile Include="PocoTableStore.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>