Initial support for bulk operations and many other fixes / improvements

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [2.5.0]
+
+### Added
+
+- Added FileAttributeMetadata support to MetadataGenerator 
+- Added support for bulk operations: CreateMultipleRequest, UpdateMultipleRequest, UpsertMultipleRequest - https://github.com/DynamicsValue/fake-xrm-easy/issues/122
+- Added new exception to make the initialization of entity records with attributes with a null entity reference more obvious (thanks Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/107
+- Add support for OptionSetValueCollection attributes when they are generated as an IEnumerable<TEnum> (using EBG or pac modelbuilder) - https://github.com/DynamicsValue/fake-xrm-easy/issues/140
+- Added extended wildcard support for the Like operator (thanks Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/139
+
+### Changed
+
+- Resolves referencing EntityAlias or EntityName in conditions inside nested filters of a LinkedEntity (thanks Temmy) - https://github.com/DynamicsValue/fake-xrm-easy/issues/63
+- Resolves Resolving entity references by Alternate Keys when EntityMetadata doesn't have any Keys. - https://github.com/DynamicsValue/fake-xrm-easy/issues/138
+- Resolves an issue where a ConditionExpression with an In operator should to not take array of integers as an input, but instead separate values (thanks Ben and Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/96
+- Resolves filtering Money attributes by an integer value (thanks Ben and Betim) - https://github.com/DynamicsValue/fake-xrm-easy/issues/64
+
+
 ## [2.4.2]
 
 ### Added

src/FakeXrmEasy.Core/Db/InMemoryDb.cs

@@ -13,7 +13,7 @@ namespace FakeXrmEasy.Core.Db
     internal class InMemoryDb
     {
         /// <summary>
-        /// A collection of tables indexed by its logical name
+        /// A collection of tables indexed by their logical name
         /// </summary>
         protected internal Dictionary<string, InMemoryTable> _tables;
 

src/FakeXrmEasy.Core/Exceptions/EntityRecordWithInvalidEntityReferenceException.cs

@@ -0,0 +1,22 @@
+using System;
+using Microsoft.Xrm.Sdk;
+
+namespace FakeXrmEasy.Core.Exceptions
+{
+    /// <summary>
+    /// Throws an exception when an entity record has an entity reference attribute with a null logical name
+    /// </summary>
+    public class NullLogicalNameEntityReferenceException: Exception
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="record">The entity record that has the invalid EntityReference attribute</param>
+        /// <param name="attributeLogicalName">The name of the attribute in the entity record with the invalid entity reference</param>
+        public NullLogicalNameEntityReferenceException(Entity record, string attributeLogicalName) : 
+            base ($"The entity record with logical name '{record.LogicalName}' and Id '{record.Id}' has an entity reference attribute '{attributeLogicalName}' with a null logical name.")
+        {
+
+        }
+    }
+}

src/FakeXrmEasy.Core/Extensions/EntityExtensions.cs

@@ -1,6 +1,7 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using FakeXrmEasy.Abstractions;
@@ -212,7 +213,7 @@ public static Entity RemoveNullAttributes(Entity entity)
         }
 
         /// <summary>
-        /// 
+        /// Clones an attribute value to make sure the object reference in memory is different to the original attribute present in the In-Memory database
         /// </summary>
         /// <param name="attributeValue"></param>
         /// <param name="context"></param>
@@ -311,6 +312,26 @@ internal static object CloneAttribute(object attributeValue, IXrmFakedContext co
                 var copy = new OptionSetValueCollection(original.ToArray());
                 return copy;
             }
+            else if (typeof(IEnumerable).IsAssignableFrom(type))
+            {
+                if (type.IsGenericType)
+                {
+                    var genericTypeArguments = type.GenericTypeArguments;
+                    if (genericTypeArguments.Length == 1 && genericTypeArguments[0].IsEnum)
+                    {
+                        //MultiOption set value
+                        return (attributeValue as IEnumerable).Copy();
+                    }
+                }
+                else if (type.IsArray)
+                {
+                    var elementType = type.GetElementType();
+                    if (elementType.IsEnum)
+                    {
+                        return attributeValue.Copy();
+                    }
+                }
+            }
 #endif
             else if (type == typeof(int) || type == typeof(Int64))
                 return attributeValue; //Not a reference type

src/FakeXrmEasy.Core/Extensions/OptionSetValueCollectionExtensions.cs

@@ -1,5 +1,6 @@
 #if FAKE_XRM_EASY_9
 
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xrm.Sdk;
@@ -18,17 +19,21 @@ public static class OptionSetValueCollectionExtensions
         /// <param name="input"></param>
         /// <param name="isOptionSetValueCollectionAccepted"></param>
         /// <returns></returns>
-        public static HashSet<int> ConvertToHashSetOfInt(object input, bool isOptionSetValueCollectionAccepted)
+        public static HashSet<int> ConvertToHashSetOfInt(this object input, bool isOptionSetValueCollectionAccepted)
         {
+            if (input == null) return null;
+
             var set = new HashSet<int>();
 
             var faultReason = $"The formatter threw an exception while trying to deserialize the message: There was an error while trying to deserialize parameter" +
                 $" http://schemas.microsoft.com/xrm/2011/Contracts/Services:query. The InnerException message was 'Error in line 1 position 8295. Element " +
                 $"'http://schemas.microsoft.com/2003/10/Serialization/Arrays:anyType' contains data from a type that maps to the name " +
-                $"'http://schemas.microsoft.com/xrm/2011/Contracts:{input?.GetType()}'. The deserializer has no knowledge of any type that maps to this name. " +
+                $"'http://schemas.microsoft.com/xrm/2011/Contracts:{input.GetType()}'. The deserializer has no knowledge of any type that maps to this name. " +
                 $"Consider changing the implementation of the ResolveName method on your DataContractResolver to return a non-null value for name " +
-                $"'{input?.GetType()}' and namespace 'http://schemas.microsoft.com/xrm/2011/Contracts'.'.  Please see InnerException for more details.";
+                $"'{input.GetType()}' and namespace 'http://schemas.microsoft.com/xrm/2011/Contracts'.'.  Please see InnerException for more details.";
 
+            var type = input.GetType();
+
             if (input is int)
             {
                 set.Add((int)input);
@@ -74,6 +79,21 @@ public static HashSet<int> ConvertToHashSetOfInt(object input, bool isOptionSetV
             {
                 set.UnionWith((input as OptionSetValueCollection).Select(osv => osv.Value));
             }
+            else if (typeof(IEnumerable).IsAssignableFrom(type))
+            {
+                if (type.IsGenericType)
+                {
+                    var genericTypeArguments = type.GenericTypeArguments;
+                    if (genericTypeArguments.Length == 1 && genericTypeArguments[0].IsEnum)
+                    {
+                        var enumerator = (input as IEnumerable).GetEnumerator();
+                        while (enumerator.MoveNext())
+                        {
+                            set.Add((int)enumerator.Current);
+                        }
+                    }
+                }
+            }
             else
             {
                 throw FakeOrganizationServiceFaultFactory.New(faultReason);

src/FakeXrmEasy.Core/Extensions/TypeExtensions.cs

@@ -23,6 +23,17 @@ public static bool IsOptionSet(this Type t)
                    || nullableType != null && nullableType.IsEnum;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="t"></param>
+        /// <returns></returns>
+        public static bool IsMoney(this Type t)
+        {
+            var nullableType = Nullable.GetUnderlyingType(t);
+            return t == typeof(Money) || nullableType != null && nullableType == typeof(Money);
+        }
+
 #if FAKE_XRM_EASY_9
 
         /// <summary>
@@ -32,8 +43,26 @@ public static bool IsOptionSet(this Type t)
         /// <returns></returns>
         public static bool IsOptionSetValueCollection(this Type t)
         {
-            var nullableType = Nullable.GetUnderlyingType(t);
-            return t == typeof(OptionSetValueCollection);
+            var isActualOptionSetValueCollection = t == typeof(OptionSetValueCollection);
+            var typeIsConvertibleToOptionSetValueCollection = false;
+            if (t.IsGenericType)
+            {
+                var genericTypeArguments = t.GenericTypeArguments;
+                if (genericTypeArguments.Length == 1 && genericTypeArguments[0].IsEnum)
+                {
+                    typeIsConvertibleToOptionSetValueCollection = true;
+                }
+            }
+            else if (t.IsArray)
+            {
+                var elementType = t.GetElementType();
+                if (elementType.IsEnum)
+                {
+                    typeIsConvertibleToOptionSetValueCollection = true;
+                }
+            }
+
+            return isActualOptionSetValueCollection || typeIsConvertibleToOptionSetValueCollection;
         }
 #endif
 

src/FakeXrmEasy.Core/Extensions/XmlExtensionsForFetchXml.cs

@@ -550,32 +550,9 @@ public static ConditionExpression ToConditionExpression(this XElement elem, IXrm
                     break;
                 case "like":
                     op = ConditionOperator.Like;
-
-                    if (value != null)
-                    {
-                        if (value.StartsWith("%") && !value.EndsWith("%"))
-                            op = ConditionOperator.EndsWith;
-                        else if (!value.StartsWith("%") && value.EndsWith("%"))
-                            op = ConditionOperator.BeginsWith;
-                        else if (value.StartsWith("%") && value.EndsWith("%"))
-                            op = ConditionOperator.Contains;
-
-                        value = value.Replace("%", "");
-                    }
                     break;
                 case "not-like":
-                    op = ConditionOperator.NotLike;
-                    if (value != null)
-                    {
-                        if (value.StartsWith("%") && !value.EndsWith("%"))
-                            op = ConditionOperator.DoesNotEndWith;
-                        else if (!value.StartsWith("%") && value.EndsWith("%"))
-                            op = ConditionOperator.DoesNotBeginWith;
-                        else if (value.StartsWith("%") && value.EndsWith("%"))
-                            op = ConditionOperator.DoesNotContain;
-
-                        value = value.Replace("%", "");
-                    }
+                    op = ConditionOperator.NotLike;                  
                     break;
                 case "gt":
                     op = ConditionOperator.GreaterThan;

src/FakeXrmEasy.Core/FakeXrmEasy.Core.csproj

@@ -8,7 +8,7 @@
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">net452</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)'=='FAKE_XRM_EASY'">net452</TargetFrameworks>
     <PackageId>FakeXrmEasy.Core</PackageId>
-    <VersionPrefix>2.4.2</VersionPrefix>
+    <VersionPrefix>2.5.0</VersionPrefix>
     <Authors>Jordi Montaña</Authors>
     <Company>Dynamics Value</Company>
     <Title>FakeXrmEasy Core</Title>
@@ -57,8 +57,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' And '$(Configuration)'=='FAKE_XRM_EASY_9'">
-    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.27" />
-    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.0.0.5" />
+    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.52" />
+    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.1.45" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' And '$(Configuration)'=='FAKE_XRM_EASY_365'">
@@ -102,22 +102,22 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2011" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2013'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2013" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2015'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2015" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_2016'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v2016" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_365'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v365" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='FAKE_XRM_EASY_9'">
-    <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.4.0-*,3.0)" />
+    <PackageReference Include="FakeXrmEasy.Abstractions.v9" Version="[2.5.0-*,3.0)" />
   </ItemGroup>
 
   <Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">

src/FakeXrmEasy.Core/Metadata/MetadataGenerator.cs

@@ -192,7 +192,7 @@ private static T GetCustomAttribute<T>(MemberInfo member) where T : Attribute
             return (T)Attribute.GetCustomAttribute(member, typeof(T));
         }
 
-        private static AttributeMetadata CreateAttributeMetadata(Type propertyType)
+        internal static AttributeMetadata CreateAttributeMetadata(Type propertyType)
         {
             if (typeof(string) == propertyType)
             {
@@ -212,7 +212,46 @@ private static AttributeMetadata CreateAttributeMetadata(Type propertyType)
             }
             else if (propertyType.IsGenericType)
             {
-                Type genericType = propertyType.GetGenericArguments().FirstOrDefault();
+                return CreateAttributeMetadataFromGenericType(propertyType);
+            }
+            else if (typeof(BooleanManagedProperty) == propertyType)
+            {
+                var booleanManaged = new BooleanAttributeMetadata();
+                booleanManaged.SetSealedPropertyValue("AttributeType", AttributeTypeCode.ManagedProperty);
+                return booleanManaged;
+            }
+#if !FAKE_XRM_EASY && !FAKE_XRM_EASY_2013
+            else if (typeof(Guid) == propertyType)
+            {
+                return new UniqueIdentifierAttributeMetadata();
+            }
+#endif
+#if !FAKE_XRM_EASY
+            else if (typeof(byte[]) == propertyType)
+            {
+
+                return new ImageAttributeMetadata();
+            }
+#endif
+#if FAKE_XRM_EASY_9
+            else if (typeof(OptionSetValueCollection).IsAssignableFrom(propertyType))
+            {
+                return new MultiSelectPicklistAttributeMetadata();
+            }
+            else if (typeof(object) == propertyType)
+            {
+                return new FileAttributeMetadata();
+            }
+#endif
+            else
+            {
+                throw new Exception($"Type {propertyType.Name} has not been mapped to an AttributeMetadata.");
+            }
+        }
+
+        internal static AttributeMetadata CreateAttributeMetadataFromGenericType(Type propertyType)
+        {
+            Type genericType = propertyType.GetGenericArguments().FirstOrDefault();
                 if (propertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
                 {
                     if (typeof(int) == genericType)
@@ -262,38 +301,7 @@ private static AttributeMetadata CreateAttributeMetadata(Type propertyType)
                 {
                     throw new Exception($"Type {propertyType.Name}{genericType?.Name} has not been mapped to an AttributeMetadata.");
                 }
-            }
-            else if (typeof(BooleanManagedProperty) == propertyType)
-            {
-                var booleanManaged = new BooleanAttributeMetadata();
-                booleanManaged.SetSealedPropertyValue("AttributeType", AttributeTypeCode.ManagedProperty);
-                return booleanManaged;
-            }
-#if !FAKE_XRM_EASY && !FAKE_XRM_EASY_2013
-            else if (typeof(Guid) == propertyType)
-            {
-                return new UniqueIdentifierAttributeMetadata();
-            }
-#endif
-#if !FAKE_XRM_EASY
-            else if (typeof(byte[]) == propertyType)
-            {
-
-                return new ImageAttributeMetadata();
-            }
-#endif
-#if FAKE_XRM_EASY_9
-            else if (typeof(OptionSetValueCollection).IsAssignableFrom(propertyType))
-            {
-                return new MultiSelectPicklistAttributeMetadata();
-            }
-#endif
-            else
-            {
-                throw new Exception($"Type {propertyType.Name} has not been mapped to an AttributeMetadata.");
-            }
         }
-
         private static OneToManyRelationshipMetadata CreateOneToManyRelationshipMetadata(Type referencingEntity, 
                                                         PropertyInfo referencingAttribute, 
                                                         Type referencedEntity,