fix(toolkit): fix expand properties name resolving for lookup attribute

ttkoma · Feb 5, 2021 · e39efca · e39efca
1 parent 419f7d4
commit e39efca
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/CrmNx.Xrm.Toolkit/Query/QueryOptions.cs b/CrmNx.Xrm.Toolkit/Query/QueryOptions.cs
@@ -218,7 +218,20 @@ private static bool BuildExpandOptionValue(IWebApiMetadataService metadata, stri
 
                 if (expand.ColumnSet.Columns.Any() && !expand.ColumnSet.AllColumns)
                 {
-                    terms.Add($"{navPropertyName}($select={string.Join(",", expand.ColumnSet.Columns)})");
+                    string selectOptionForExpand;
+
+                    // relationship.ReferencedEntity - EntityLogicalName for expand
+
+                    if (relationship != null)
+                    {
+                        BuildSelectOptionValue(metadata, relationship.ReferencedEntity, expand.ColumnSet, out selectOptionForExpand);
+                    } 
+                    else
+                    {
+                        selectOptionForExpand = string.Join(",", expand.ColumnSet.Columns);
+                    }
+
+                    terms.Add($"{navPropertyName}($select={selectOptionForExpand})");
                     continue;
                 }
                 else if (relationship != null)
@@ -262,16 +275,31 @@ private static bool BuildOrderOptionValue(IWebApiMetadataService webApiMetadata,
             return true;
         }
 
+        /// <summary>
+        /// Return false if result is string.Empty
+        /// </summary>
+        /// <param name="webApiMetadata"></param>
+        /// <param name="entityLogicalName"></param>
+        /// <param name="columnSet"></param>
+        /// <param name="selectOptionValue"></param>
+        /// <returns></returns>
         private static bool BuildSelectOptionValue(IWebApiMetadataService webApiMetadata, string entityLogicalName,
             in ColumnSet columnSet, out string selectOptionValue)
         {
             selectOptionValue = string.Empty;
 
+            if (columnSet != null && columnSet.AllColumns)
+            {
+                // Not property present - need return AllFields
+                return false;
+            }
+
             var entityMd = webApiMetadata.GetEntityMetadata(entityLogicalName);
 
             if (columnSet is null && entityMd != null)
             {
                 selectOptionValue = entityMd.PrimaryIdAttribute;
+                // Only PrimaryIdAttribute
                 return true;
             }
 
@@ -286,11 +314,6 @@ private static bool BuildSelectOptionValue(IWebApiMetadataService webApiMetadata
                 return true;
             }
 
-            if (columnSet != null && columnSet.AllColumns)
-            {
-                return false;
-            }
-
             selectOptionValue = entityMd?.PrimaryIdAttribute;
             return entityMd?.PrimaryIdAttribute != null;
         }

diff --git a/Tests/UnitTests/Query/QueryOptionsTests.cs b/Tests/UnitTests/Query/QueryOptionsTests.cs
@@ -105,11 +105,13 @@ public void GetQueryString_When_Expand_Lookup_Then_Query_IsValid_Test()
             var query = options.BuildQueryString(metadata, "account");
 
 
-            WebUtility.UrlDecode(query).Should()
-                .Be("?$expand=createdby($select=domainname,businessunitid),primarycontactid($select=contactid)");
+            var decodedQuery = WebUtility.UrlDecode(query);
+
+            decodedQuery.Should()
+                .Be("?$expand=createdby($select=domainname,_businessunitid_value),primarycontactid($select=contactid)");
 
             query.Should()
-                .Be("?$expand=createdby($select%3Ddomainname,businessunitid),primarycontactid($select%3Dcontactid)");
+                .Be("?$expand=createdby($select%3Ddomainname,_businessunitid_value),primarycontactid($select%3Dcontactid)");
         }
 
         [Fact()]