Added retrieve operation to batch operation

CloudStub.Tests/Core/StubTableTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using CloudStub.Core;
-using CloudStub.Core.Operations;
+using CloudStub.Core.OperationResults;
 using CloudStub.Core.StorageHandlers;
 using Xunit;
 
@@ -1598,5 +1598,104 @@ public void BatchOperation_WhenDeletingExistingEntity_TheBatchOperationSucceeds(
             Assert.NotNull(deleteOperationResult.Entity.ETag);
             Assert.NotNull(deleteOperationResult.Entity.Timestamp);
         }
+
+        [Fact]
+        public void BatchOperation_WhenRetrievingEntityThatDoesNotExists_TheBatchOperationFails()
+        {
+            var stubTable = new StubTable("table-name", new InMemoryTableStorageHandler());
+            stubTable.Create();
+
+            var batchOperationResult = stubTable
+                .BatchOperation()
+                .Retrieve("partition-key", "row-key")
+                .Execute();
+
+            Assert.Equal(StubTableBatchOperationResult.Failed, batchOperationResult.OperationResult);
+            Assert.False(batchOperationResult.IsSuccessful);
+            Assert.Empty(stubTable.Query(new StubTableQuery(), default).Entities);
+
+            var retrieveOperationResult = Assert.IsType<StubTableRetrieveOperationDataResult>(Assert.Single(batchOperationResult.IndividualOperationResults));
+            Assert.Equal(StubTableOperationType.Retrieve, retrieveOperationResult.OperationType);
+            Assert.Equal(StubTableRetrieveOperationResult.EntityDoesNotExists, retrieveOperationResult.OperationResult);
+            Assert.False(retrieveOperationResult.IsSuccessful);
+            Assert.Null(retrieveOperationResult.Entity);
+        }
+
+        [Fact]
+        public void BatchOperation_WhenRetrievingExistingEntity_TheBatchOperationSucceeds()
+        {
+            var stubTable = new StubTable("table-name", new InMemoryTableStorageHandler());
+            stubTable.Create();
+            stubTable.Insert(new StubEntity("partition-key", "row-key")
+            {
+                Properties =
+                {
+                    { "property1", new StubEntityProperty("property-1") },
+                    { "property2", new StubEntityProperty("property-2") }
+                }
+            });
+
+            var batchOperationResult = stubTable
+                .BatchOperation()
+                .Retrieve("partition-key", "row-key")
+                .Execute();
+
+            Assert.Equal(StubTableBatchOperationResult.Success, batchOperationResult.OperationResult);
+            Assert.True(batchOperationResult.IsSuccessful);
+            var entity = Assert.Single(stubTable.Query(new StubTableQuery(), default).Entities);
+
+            var retrieveOperationResult = Assert.IsType<StubTableRetrieveOperationDataResult>(Assert.Single(batchOperationResult.IndividualOperationResults));
+            Assert.Equal(StubTableOperationType.Retrieve, retrieveOperationResult.OperationType);
+            Assert.Equal(StubTableRetrieveOperationResult.Success, retrieveOperationResult.OperationResult);
+            Assert.True(retrieveOperationResult.IsSuccessful);
+            Assert.NotNull(retrieveOperationResult.Entity);
+
+            Assert.Equal(entity.PartitionKey, retrieveOperationResult.Entity.PartitionKey);
+            Assert.Equal(entity.RowKey, retrieveOperationResult.Entity.RowKey);
+            Assert.Equal(entity.ETag, retrieveOperationResult.Entity.ETag);
+            Assert.Equal(entity.Timestamp, retrieveOperationResult.Entity.Timestamp);
+
+            Assert.Equal(entity.Properties.Count, retrieveOperationResult.Entity.Properties.Count);
+            Assert.Equal(entity.Properties["property1"].Value, retrieveOperationResult.Entity.Properties["property1"].Value);
+            Assert.Equal(entity.Properties["property2"].Value, retrieveOperationResult.Entity.Properties["property2"].Value);
+        }
+
+        [Fact]
+        public void BatchOperation_WhenRetrievingExistingEntityWithSelectedProperties_TheBatchOperationSucceeds()
+        {
+            var stubTable = new StubTable("table-name", new InMemoryTableStorageHandler());
+            stubTable.Create();
+            stubTable.Insert(new StubEntity("partition-key", "row-key")
+            {
+                Properties =
+                {
+                    { "property1", new StubEntityProperty("property-1") },
+                    { "property2", new StubEntityProperty("property-2") }
+                }
+            });
+
+            var batchOperationResult = stubTable
+                .BatchOperation()
+                .Retrieve("partition-key", "row-key", new[] { "property2", "property3" })
+                .Execute();
+
+            Assert.Equal(StubTableBatchOperationResult.Success, batchOperationResult.OperationResult);
+            Assert.True(batchOperationResult.IsSuccessful);
+            var entity = Assert.Single(stubTable.Query(new StubTableQuery(), default).Entities);
+
+            var retrieveOperationResult = Assert.IsType<StubTableRetrieveOperationDataResult>(Assert.Single(batchOperationResult.IndividualOperationResults));
+            Assert.Equal(StubTableOperationType.Retrieve, retrieveOperationResult.OperationType);
+            Assert.Equal(StubTableRetrieveOperationResult.Success, retrieveOperationResult.OperationResult);
+            Assert.True(retrieveOperationResult.IsSuccessful);
+            Assert.NotNull(retrieveOperationResult.Entity);
+
+            Assert.Equal(entity.PartitionKey, retrieveOperationResult.Entity.PartitionKey);
+            Assert.Equal(entity.RowKey, retrieveOperationResult.Entity.RowKey);
+            Assert.Equal(entity.ETag, retrieveOperationResult.Entity.ETag);
+            Assert.Equal(entity.Timestamp, retrieveOperationResult.Entity.Timestamp);
+
+            Assert.Equal(1, retrieveOperationResult.Entity.Properties.Count);
+            Assert.Equal("property-2", retrieveOperationResult.Entity.Properties["property2"].Value);
+        }
     }
 }

CloudStub/Core/Operations/IStubTableOperationDataResult.cs → CloudStub/Core/OperationResults/IStubTableOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public interface IStubTableOperationDataResult
     {

CloudStub/Core/Operations/StubTableBatchOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableBatchOperationDataResult.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableBatchOperationDataResult
     {

CloudStub/Core/Operations/StubTableBatchOperationResult.cs → CloudStub/Core/OperationResults/StubTableBatchOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableBatchOperationResult
     {

CloudStub/Core/StubTableCreateResult.cs → CloudStub/Core/OperationResults/StubTableCreateResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableCreateResult
     {

CloudStub/Core/Operations/StubTableDeleteOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableDeleteOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableDeleteOperationDataResult : IStubTableOperationDataResult<StubTableDeleteOperationResult>
     {

CloudStub/Core/Operations/StubTableDeleteOperationResult.cs → CloudStub/Core/OperationResults/StubTableDeleteOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableDeleteOperationResult
     {

CloudStub/Core/StubTableDeleteResult.cs → CloudStub/Core/OperationResults/StubTableDeleteResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableDeleteResult
     {

CloudStub/Core/Operations/StubTableInsertOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableInsertOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableInsertOperationDataResult : IStubTableOperationDataResult<StubTableInsertOperationResult>
     {

CloudStub/Core/Operations/StubTableInsertOperationResult.cs → CloudStub/Core/OperationResults/StubTableInsertOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableInsertOperationResult
     {

CloudStub/Core/Operations/StubTableInsertOrMergeOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableInsertOrMergeOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableInsertOrMergeOperationDataResult : IStubTableOperationDataResult<StubTableInsertOrMergeOperationResult>
     {

CloudStub/Core/Operations/StubTableInsertOrMergeOperationResult.cs → CloudStub/Core/OperationResults/StubTableInsertOrMergeOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableInsertOrMergeOperationResult
     {

CloudStub/Core/Operations/StubTableInsertOrReplaceOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableInsertOrReplaceOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableInsertOrReplaceOperationDataResult : IStubTableOperationDataResult<StubTableInsertOrReplaceOperationResult>
     {

CloudStub/Core/Operations/StubTableInsertOrReplaceOperationResult.cs → CloudStub/Core/OperationResults/StubTableInsertOrReplaceOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableInsertOrReplaceOperationResult
     {

CloudStub/Core/Operations/StubTableMergeOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableMergeOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableMergeOperationDataResult : IStubTableOperationDataResult<StubTableMergeOperationResult>
     {

CloudStub/Core/Operations/StubTableMergeOperationResult.cs → CloudStub/Core/OperationResults/StubTableMergeOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableMergeOperationResult
     {

CloudStub/Core/Operations/StubTableOperationType.cs → CloudStub/Core/OperationResults/StubTableOperationType.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableOperationType
     {

CloudStub/Core/Operations/StubTableQueryDataResult.cs → CloudStub/Core/OperationResults/StubTableQueryDataResult.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableQueryDataResult
     {

CloudStub/Core/Operations/StubTableQueryResult.cs → CloudStub/Core/OperationResults/StubTableQueryResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableQueryResult
     {

CloudStub/Core/Operations/StubTableReplaceOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableReplaceOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableReplaceOperationDataResult : IStubTableOperationDataResult<StubTableReplaceOperationResult>
     {

CloudStub/Core/Operations/StubTableReplaceOperationResult.cs → CloudStub/Core/OperationResults/StubTableReplaceOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableReplaceOperationResult
     {

CloudStub/Core/Operations/StubTableRetrieveOperationDataResult.cs → CloudStub/Core/OperationResults/StubTableRetrieveOperationDataResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public class StubTableRetrieveOperationDataResult : IStubTableOperationDataResult<StubTableRetrieveOperationResult>
     {

CloudStub/Core/Operations/StubTableRetrieveOperationResult.cs → CloudStub/Core/OperationResults/StubTableRetrieveOperationResult.cs

@@ -1,4 +1,4 @@
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core.OperationResults
 {
     public enum StubTableRetrieveOperationResult
     {

CloudStub/Core/StubTable.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using CloudStub.Core.Operations;
+using CloudStub.Core.OperationResults;
 using CloudStub.Core.StorageHandlers;
 
 namespace CloudStub.Core

CloudStub/Core/Operations/StubTableBatchOperation.cs → CloudStub/Core/StubTableBatchOperation.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using CloudStub.Core.OperationResults;
 
-namespace CloudStub.Core.Operations
+namespace CloudStub.Core
 {
     public class StubTableBatchOperation
     {
@@ -78,6 +79,20 @@ public StubTableBatchOperation Delete(StubEntity entity)
             return this;
         }
 
+        public StubTableBatchOperation Retrieve(string partitionKey, string rowKey)
+            => Retrieve(partitionKey, rowKey, default);
+
+        public StubTableBatchOperation Retrieve(string partitionKey, string rowKey, IEnumerable<string> selectedProperties)
+        {
+            if (_partitionKey is null)
+                _partitionKey = partitionKey;
+            else if (!string.Equals(_partitionKey, partitionKey, StringComparison.OrdinalIgnoreCase))
+                throw new ArgumentException("Batch operations can be performed only on the same partition.", nameof(partitionKey));
+
+            _operationCallbacks.Add(partitionCluster => StubTableOperation.Retrieve(partitionKey, rowKey, selectedProperties, partitionCluster));
+            return this;
+        }
+
         public StubTableBatchOperationDataResult Execute()
             => _executeCallback(_partitionKey, _operationCallbacks);
     }

CloudStub/Core/StubTableOperation.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using CloudStub.Core.Operations;
+using CloudStub.Core.OperationResults;
 
 namespace CloudStub.Core
 {
@@ -142,7 +142,7 @@ internal static StubTableRetrieveOperationDataResult Retrieve(string partitionKe
                 if (selectedProperties is null)
                     foreach (var property in entity.Properties)
                         retrieveEntity.Properties.Add(property);
-                else if (selectedProperties.Any())
+                else
                     foreach (var propertyName in selectedProperties)
                         if (entity.Properties.TryGetValue(propertyName, out var propertyValue))
                             retrieveEntity.Properties.Add(propertyName, propertyValue);