Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added logic to allow query options in select=* calls #971

Draft
wants to merge 2 commits into
base: release-8.x
Choose a base branch
from
Draft

added logic to allow query options in select=* calls #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8607b26
return count for selects with $count and * using ODataRoutingSample a…
corranrogue9 Jun 23, 2023
b0637af
fix
corranrogue9 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/Microsoft.AspNetCore.OData/Formatter/Serialization/ODataResourceSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,22 @@ private async Task WriteResourceAsync(object graph, ODataWriter writer, ODataSer
ResourceContext resourceContext = new ResourceContext(writeContext, structuredType, graph);

SelectExpandNode selectExpandNode = CreateSelectExpandNode(resourceContext);
/*if (expectedType.Definition.FullTypeName() == "ODataRoutingSample.Models.Customer")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete unused code, you can always retrieve it from Git.

{
var selectedProperty = selectExpandNode.SelectedComplexProperties.First(kvp => kvp.Key.Name == "FavoriteAddresses");
selectExpandNode.SelectedComplexProperties[selectedProperty.Key] = new PathSelectItem(
((writeContext.QueryOptions.SelectExpand.SelectExpandClause.SelectedItems.First() as WildcardSelectItem).SubsumedSelectItems.First() as PathSelectItem).SelectedPath,
null,
null,
null,
null,
null,
null,
true,
null,
null);
}*/

if (selectExpandNode != null)
{
ODataResource resource = CreateResource(selectExpandNode, resourceContext);
Expand Down
20 changes: 20 additions & 0 deletions src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,10 @@ internal Expression ProjectElement(QueryBinderContext context, Expression source

bool isSelectingOpenTypeSegments = isContainDynamicPropertySelection || IsSelectAllOnOpenType(selectExpandClause, structuredType);

//// propertiestoinclude is not null for the non-* case
if (propertiesToExpand != null || propertiesToInclude != null || computedProperties != null || autoSelectedProperties != null || isSelectingOpenTypeSegments)
{
//// TODO this returns null in our case
Expression propertyContainerCreation =
BuildPropertyContainer(context, source, structuredType, propertiesToExpand, propertiesToInclude, computedProperties, autoSelectedProperties, isSelectingOpenTypeSegments);

Expand Down Expand Up @@ -506,9 +508,11 @@ internal static IList<DynamicPathSegment> GetSelectExpandProperties(IEdmModel mo
}

// $select=...
//// TODO for * call, select item is a wildcard select item, which has nested pathselectitmes
PathSelectItem pathItem = selectItem as PathSelectItem;
if (pathItem != null)
{
//// TODO so we never enter the if body, and this next call is what adds the count to currentlevelpropertiestoincldue for the non-* case
DynamicPathSegment dynamicSegment = ProcessSelectedItem(pathItem, navigationSource, currentLevelPropertiesInclude);
if (dynamicSegment != null)
{
Expand All @@ -517,6 +521,21 @@ internal static IList<DynamicPathSegment> GetSelectExpandProperties(IEdmModel mo
continue;
}

var wildcardSelectItem = selectItem as WildcardSelectItem;
if (wildcardSelectItem != null)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add tests for this senario

{
//// TODO this doesn't handle cases like $select=*,path/to/definedpropery
//// TODO the defined property gets added twice, but it shouldn't be; webapi could differentiate these cases by looking for '$', but really ODL should have "subsumed" items, and "non-subsumed" items to differentaite bewten the cases
foreach (var subsumedSelectItem in wildcardSelectItem.SubsumedSelectItems.Cast<PathSelectItem>().Where(item => item.HasOptions))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var subsumedSelectItems = wildcardSelectItem.SubsumedSelectItems.Cast().Where(item => item.HasOptions);

  foreach (var subsumedSelectItem in subsumedSelectItems)

{
DynamicPathSegment dynamicSegment = ProcessSelectedItem(subsumedSelectItem, navigationSource, currentLevelPropertiesInclude);
if (dynamicSegment != null)
{
dynamicsSegments.Add(dynamicSegment);
}
}
}

// Skip processing the "WildcardSelectItem and NamespaceQualifiedWildcardSelectItem"
// ODL now doesn't support "$select=property/*" and "$select=property/NS.*"
}
Expand Down Expand Up @@ -951,6 +970,7 @@ internal void BuildSelectedProperty(QueryBinderContext context, Expression sourc

Expression nullCheck = GetNullCheckExpression(structuralProperty, propertyValue, subSelectExpandClause);

//// TODO if countoption is null, this returns a bogus expression
Expression countExpression = CreateTotalCountExpression(context, propertyValue, pathSelectItem.CountOption);

// be noted: the property structured type could be null, because the property maybe not a complex property.
Expand Down