Add support for generating types for action parameters that have collection parameters.

Author: LuukN2

src/Common.OData.ApiExplorer/AspNet.OData/ClassProperty.cs

@@ -30,7 +30,18 @@ internal ClassProperty( IEnumerable<Assembly> assemblies, IEdmOperationParameter
             Contract.Requires( parameter != null );
 
             Name = parameter.Name;
-            type = parameter.Type.Definition.GetClrType( assemblies );
+
+            if ( parameter.Type.IsCollection() )
+            {
+                var collectionType = parameter.Type.AsCollection();
+                var elementType = collectionType.ElementType().Definition.GetClrType( assemblies );
+                type = typeof( IEnumerable<> ).MakeGenericType( elementType );
+            }
+            else
+            {
+                type = parameter.Type.Definition.GetClrType( assemblies );
+            }
+
             Attributes = AttributesFromOperationParameter( parameter );
         }
 

test/Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -242,6 +242,33 @@ public void substitute_should_generate_type_for_action_parameters()
             substitutionType.Should().HaveProperty<bool>( "callbackRequired" );
         }
 
+        [Fact]
+        public void substitute_should_generate_type_for_action_parameters_with_collection_parameters()
+        {
+            // arrange
+            var modelBuilder = new ODataConventionModelBuilder();
+            var contact = modelBuilder.EntitySet<Contact>( "Contacts" ).EntityType;
+            var action = contact.Action( "PlanMeeting" );
+
+            action.Parameter<DateTime>( "when" );
+            action.CollectionParameter<Contact>( "attendees" );
+            action.CollectionParameter<string>( "topics" );
+
+            var context = NewContext( modelBuilder.GetEdmModel() );
+            var model = context.Model;
+            var qualifiedName = $"{model.EntityContainer.Namespace}.{action.Name}";
+            var operation = (IEdmAction) model.FindDeclaredOperations( qualifiedName ).Single();
+
+            // act
+            var substitutionType = context.ModelTypeBuilder.NewActionParameters( operation, ApiVersion.Default );
+
+            // assert
+            substitutionType.GetRuntimeProperties().Should().HaveCount( 3 );
+            substitutionType.Should().HaveProperty<DateTimeOffset>( "when" );
+            substitutionType.Should().HaveProperty<IEnumerable<Contact>>( "attendees" );
+            substitutionType.Should().HaveProperty<IEnumerable<string>>( "topics" );
+        }
+
         public static IEnumerable<object[]> SubstitutionNotRequiredData
         {
             get

test/Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests/AspNet.OData/Employer.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
-
 namespace Microsoft.AspNet.OData
 {
+    using System;
+    using System.Collections.Generic;
+
     public class Employer
     {
         public int EmployerId { get; set; }

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -242,6 +242,33 @@ public void substitute_should_generate_type_for_action_parameters()
             substitutionType.Should().HaveProperty<bool>( "callbackRequired" );
         }
 
+        [Fact]
+        public void substitute_should_generate_type_for_action_parameters_with_collection_parameters()
+        {
+            // arrange
+            var modelBuilder = new ODataConventionModelBuilder();
+            var contact = modelBuilder.EntitySet<Contact>( "Contacts" ).EntityType;
+            var action = contact.Action( "PlanMeeting" );
+
+            action.Parameter<DateTime>( "when" );
+            action.CollectionParameter<Contact>( "attendees" );
+            action.CollectionParameter<string>( "topics" );
+
+            var context = NewContext( modelBuilder.GetEdmModel() );
+            var model = context.Model;
+            var qualifiedName = $"{model.EntityContainer.Namespace}.{action.Name}";
+            var operation = (IEdmAction) model.FindDeclaredOperations( qualifiedName ).Single();
+
+            // act
+            var substitutionType = context.ModelTypeBuilder.NewActionParameters( operation, ApiVersion.Default );
+
+            // assert
+            substitutionType.GetRuntimeProperties().Should().HaveCount( 3 );
+            substitutionType.Should().HaveProperty<DateTimeOffset>( "when" );
+            substitutionType.Should().HaveProperty<IEnumerable<Contact>>( "attendees" );
+            substitutionType.Should().HaveProperty<IEnumerable<string>>( "topics" );
+        }
+
         public static IEnumerable<object[]> SubstitutionNotRequiredData
         {
             get

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/Employer.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
-
 namespace Microsoft.AspNet.OData
 {
+    using System;
+    using System.Collections.Generic;
+
     public class Employer
     {
         public int EmployerId { get; set; }