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

Fixed a bug in SearchByCriteria query and added sortBy parameter to enable custom sort #20

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixed a bug in SearchByCriteria query and added sortBy parameter to enable custom sort #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ CoverageReports/
*.iml
target/
.idea/
/net/src/Sdl.Tridion.Api.Client/Sdl.Tridion.Api.Client.sln
4 changes: 2 additions & 2 deletions net/src/Sdl.Tridion.Api.Client/ApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,12 @@ public FacetedSearchResults SearchByRawCriteria(string rawCriteria, InputResultF
/// <param name="pagination"></param>
/// <returns></returns>
/// <exception cref="ApiException"></exception>
public FacetedSearchResults SearchByCriteria(InputCriteria inputCriteria, InputResultFilter resultFilter, IPagination pagination)
public FacetedSearchResults SearchByCriteria(InputCriteria inputCriteria, InputResultFilter resultFilter, IPagination pagination, InputSortBy sort)
{
try
{
var response =
_client.Execute<ContentQuery>(GraphQLRequests.SearchByCriteria(inputCriteria, resultFilter, pagination));
_client.Execute<ContentQuery>(GraphQLRequests.SearchByCriteria(inputCriteria, resultFilter, pagination, sort));
return response.TypedResponseData.Search;
}
catch (RuntimeBinderException e)
Expand Down
2 changes: 1 addition & 1 deletion net/src/Sdl.Tridion.Api.Client/ContentModel/ContentModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3111,7 +3111,7 @@ public class Search
/// <summary>
/// Matching score of the result.
/// </summary>
public float Score { get; set; }
public float? Score { get; set; }

/// <summary>
/// The url of the search result.
Expand Down
3 changes: 2 additions & 1 deletion net/src/Sdl.Tridion.Api.Client/GraphQLRequests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public static IGraphQLRequest SearchByRawCriteria(string rawCritera, InputResult
.Build();
}

public static IGraphQLRequest SearchByCriteria(InputCriteria criteria, InputResultFilter resultFilter, IPagination pagination)
public static IGraphQLRequest SearchByCriteria(InputCriteria criteria, InputResultFilter resultFilter, IPagination pagination, InputSortBy sort)
{
QueryBuilder builder =
new QueryBuilder().WithQueryResource("SearchByCriteria", false);
Expand All @@ -327,6 +327,7 @@ public static IGraphQLRequest SearchByCriteria(InputCriteria criteria, InputResu
.WithVariable("criteria", criteria)
.WithVariable("inputResultFilter", resultFilter)
.WithPagination(pagination)
.WithInputSortBy(sort)
.Build();
}

Expand Down
2 changes: 1 addition & 1 deletion net/src/Sdl.Tridion.Api.Client/IApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ List<TaxonomySitemapItem> GetSitemapSubtree(ContentNamespace ns, int publication
/// <param name="resultFilter"></param>
/// <param name="pagination"></param>
/// <returns></returns>
FacetedSearchResults SearchByCriteria(InputCriteria criteria, InputResultFilter resultFilter, IPagination pagination);
FacetedSearchResults SearchByCriteria(InputCriteria criteria, InputResultFilter resultFilter, IPagination pagination, InputSortBy sort);

/// <summary>
/// Faceted Search by criteria
Expand Down
4 changes: 2 additions & 2 deletions net/src/Sdl.Tridion.Api.Client/Queries/SearchByCriteria.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
query search($first: Int, $after: String, $criteria: InputCriteria, $inputResultFilter: InputResultFilter) {
search(InputCriteria: $criteria, resultFilter: $inputResultFilter ) {
query search($first: Int, $after: String, $criteria: InputCriteria, $inputResultFilter: InputResultFilter, $inputSortBy: InputSortBy) {
search(criteria: $criteria, resultFilter: $inputResultFilter, sortBy: $inputSortBy) {
results(first: $first, after: $after) {
hits
edges {
Expand Down
2 changes: 2 additions & 0 deletions net/src/Sdl.Tridion.Api.Client/QueryBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public QueryBuilder WithInputPublicationFilter(InputPublicationFilter filter)

public QueryBuilder WithInputSortParam(InputSortParam sort) => WithVariable("inputSortParam", sort);

public QueryBuilder WithInputSortBy(InputSortBy sort) => WithVariable("InputSortBy", sort);

public QueryBuilder WithInputComponentPresentationFilter(InputComponentPresentationFilter filter)
=> WithVariable("filter", filter);

Expand Down