💚 CLA has been signed

Hi @achawla83 , thank you for the PR!

The string.Contains() part looks mostly fine 🙂 Could you please use MatchPhrase instead of Wildcard for slightly improved performance and also add a test here?

For the Any() part: Same as a above - could you please add some tests? I'm not sure TermsQuery behaves the way you want it to behave in this case. If I remember correctly, this will also return documents for which none of the terms are matching, unless you specify MinumumShouldMatch = 1 (which I remember is deprecated). I think we have to do some research about the best practice here.

Edit: Should be fine without MinumumShouldMatch 🙂

Hi @flobernd,

Thank you for the feedback! I’ve updated the code to use MatchPhraseQuery instead of WildcardQuery, as suggested. However, I’m not very familiar with writing test cases since my primary focus is on development. Could you please guide me or point me to an example so I can create the appropriate test?

Thanks for your understanding!

Hi @achawla83 , thanks for updating the PR.

The best place to add a test would be this file which contains filter tests specific to the Elasticsearch connector. You can find some examples in the generic test suite that is provided by Microsoft and used as a common ground for all connector implementations. The related Fixture class contains the definition of the test records and the seed functionality. There already is at least a string and a string[] field so modifying the test data record (or adding a custom one) should not be required.

Hi @flobernd,

I made an update related to the failing test StringContains_with_substring.
This test was expecting 2 results but was returning 0. The issue was caused by the use of MatchQuery, which doesn’t support true substring matching.

Since the .Contains("fo") logic requires a substring match, I replaced the MatchQuery with a WildcardQuery that uses {substring}. This aligns the Elasticsearch behavior with what the test expects.

Updated code:

return new WildcardQuery(property.StorageName)
{
    Wildcard = $"*{substring.ToLower(System.Globalization.CultureInfo.InvariantCulture)}*"
};

After this change, the test passes as expected.

I also added the necessary test cases to ensure this scenario is covered.

Let me know if you want to adjust the behavior or discuss alternative approaches.

Hi @achawla83 , thank you for adding the tests. I'll have a look soon 🙂 Regarding MatchPhraseQuery vs. Wildcard: You are correct that match-phrase can not be used to look for a substring within a single word. Wildcard query on the other hand is quite slow unfortunately (if the searched field is not mapped as wildcard), but there is not much we can do in this context.