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.

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

Adds startsWith and nstartsWith to Elastic Search #5020

Merged
merged 5 commits into from
May 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 25 additions & 6 deletions src/HotChocolate/ElasticSearch/HotChocolate.ElasticSearch.sln
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.1.32421.90
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AED4D809-DEB0-4C6E-AC73-C90863899233}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotChocolate.Data.ElasticSearch.Driver", "src\Data.ElasticSearch.Driver\HotChocolate.Data.ElasticSearch.Driver.csproj", "{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotChocolate.Data.ElasticSearch.Driver", "src\Data.ElasticSearch.Driver\HotChocolate.Data.ElasticSearch.Driver.csproj", "{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotChocolate.Data.ElasticSearch", "src\Data.ElasticSearch\HotChocolate.Data.ElasticSearch.csproj", "{5E40AFDA-93CC-4806-880D-6A93537F19CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FBB2FC8D-9373-471B-A0F2-C0AA21D254FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotChocolate.Data.ElasticSearch.Tests", "test\Data.ElasticSearch.Tests\HotChocolate.Data.ElasticSearch.Tests.csproj", "{5139FD4D-D866-4291-847E-FEE7546EF544}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B77A0EAE-BEE6-43FA-9D50-5F14B983185A}.Release|Any CPU.Build.0 = Release|Any CPU
{5E40AFDA-93CC-4806-880D-6A93537F19CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E40AFDA-93CC-4806-880D-6A93537F19CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E40AFDA-93CC-4806-880D-6A93537F19CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E40AFDA-93CC-4806-880D-6A93537F19CB}.Release|Any CPU.Build.0 = Release|Any CPU
{5139FD4D-D866-4291-847E-FEE7546EF544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5139FD4D-D866-4291-847E-FEE7546EF544}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5139FD4D-D866-4291-847E-FEE7546EF544}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5139FD4D-D866-4291-847E-FEE7546EF544}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B77A0EAE-BEE6-43FA-9D50-5F14B983185A} = {AED4D809-DEB0-4C6E-AC73-C90863899233}
{5E40AFDA-93CC-4806-880D-6A93537F19CB} = {AED4D809-DEB0-4C6E-AC73-C90863899233}
{5139FD4D-D866-4291-847E-FEE7546EF544} = {FBB2FC8D-9373-471B-A0F2-C0AA21D254FC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {66BE188D-3109-456B-B395-FA4E68642064}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ public static IFilterProviderDescriptor<ElasticSearchFilterVisitorContext>
{
descriptor.AddFieldHandler<ElasticSearchStringEqualsOperationHandler>();
descriptor.AddFieldHandler<ElasticSearchStringNotEqualsOperationHandler>();

descriptor.AddFieldHandler<ElasticSearchStringStartsWithOperationHandler>();
descriptor.AddFieldHandler<ElasticSearchStringNotStartsWithOperationHandler>();

/*

Expand All @@ -155,9 +158,7 @@ public static IFilterProviderDescriptor<ElasticSearchFilterVisitorContext>
descriptor.AddFieldHandler<ElasticSearchComparableNotLowerThanHandler>();
descriptor.AddFieldHandler<ElasticSearchComparableLowerThanOrEqualsHandler>();
descriptor.AddFieldHandler<ElasticSearchComparableNotLowerThanOrEqualsHandler>();

descriptor.AddFieldHandler<ElasticSearchStringStartsWithHandler>();
descriptor.AddFieldHandler<ElasticSearchStringNotStartsWithHandler>();

descriptor.AddFieldHandler<ElasticSearchStringEndsWithHandler>();
descriptor.AddFieldHandler<ElasticSearchStringNotEndsWithHandler>();
descriptor.AddFieldHandler<ElasticSearchStringContainsHandler>();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using HotChocolate.Configuration;
using HotChocolate.Data.Filters;
using HotChocolate.Language;
using HotChocolate.Types;
using static HotChocolate.Data.Filters.DefaultFilterOperations;

namespace HotChocolate.Data.ElasticSearch.Filters;

/// <summary>
/// This filter operation handler maps a NotStartsWith operation field to a
/// <see cref="ISearchOperation"/>
/// </summary>
public class ElasticSearchStringNotStartsWithOperationHandler
: ElasticSearchStringStartsWithOperationHandler
{
/// <summary>
/// Initializes a new instance of
/// <see cref="ElasticSearchStringNotStartsWithOperationHandler"/>
/// </summary>
public ElasticSearchStringNotStartsWithOperationHandler(InputParser inputParser)
: base(inputParser)
{
}

/// <inheritdoc />
public override bool CanHandle(
ITypeCompletionContext context,
IFilterInputTypeDefinition typeDefinition,
IFilterFieldDefinition fieldDefinition)
=> context.Type is StringOperationFilterInputType &&
fieldDefinition is FilterOperationFieldDefinition { Id: NotStartsWith };

/// <inheritdoc />
public override ISearchOperation HandleOperation(
ElasticSearchFilterVisitorContext context,
IFilterOperationField field,
IValueNode value,
object? parsedValue)
{
ISearchOperation operation =
base.HandleOperation(context, field, value, parsedValue);
return ElasticSearchOperationHelpers.Negate(operation);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
using HotChocolate.Configuration;
using HotChocolate.Data.Filters;
using HotChocolate.Language;
using HotChocolate.Types;

namespace HotChocolate.Data.ElasticSearch.Filters;

/// <summary>
/// This filter operation handler maps a StartsWith operation field to a
/// <see cref="ISearchOperation"/>
/// </summary>
public class ElasticSearchStringStartsWithOperationHandler
: ElasticSearchOperationHandlerBase
{
/// <summary>
/// Initializes a new instance of
/// <see cref="ElasticSearchStringStartsWithOperationHandler"/>
/// </summary>
public ElasticSearchStringStartsWithOperationHandler(InputParser inputParser)
: base(inputParser)
{
}

/// <inheritdoc />
public override bool CanHandle(
ITypeCompletionContext context,
IFilterInputTypeDefinition typeDefinition,
IFilterFieldDefinition fieldDefinition)
=> context.Type is StringOperationFilterInputType &&
fieldDefinition is FilterOperationFieldDefinition
{
Id: DefaultFilterOperations.StartsWith
};

/// <inheritdoc />
public override ISearchOperation HandleOperation(
ElasticSearchFilterVisitorContext context,
IFilterOperationField field,
IValueNode value,
object? parsedValue)
{
if (parsedValue is not string val)
{
throw ThrowHelper.Filtering_WrongValueProvided(field);
}

IElasticFilterMetadata metadata = field.GetElasticMetadata();

return new TermOperation(
context.GetPath(),
metadata.Kind,
val);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected override IQuery Rewrite(RangeOperation operation)
/// <inheritdoc />
protected override IQuery Rewrite(TermOperation operation)
{
throw new System.NotImplementedException();
return new PrefixQuery {Field = operation.Path, Value = operation.Value};
}

/// <inheritdoc />
Expand Down
Loading