Skip to content
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
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "7.1.0",
"version": "7.2.0",
"packages": [
"packages/*"
],
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-auth",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs auth package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/cache/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-cache",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs cache package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-common",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs common package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/elastic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-elastic",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs elastic package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
16 changes: 16 additions & 0 deletions packages/elastic/src/entities/elastic.query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,22 @@ export class ElasticQuery {
return this.withMustNotCondition(QueryType.Exists(key));
}

withMustPrefixCondition(key: string, value: string | undefined): ElasticQuery {
if (value === undefined) {
return this;
}

return this.withMustCondition(QueryType.Prefix(key, value.toLowerCase()));
}

withMustNotPrefixCondition(key: string, value: string | undefined): ElasticQuery {
if (value === undefined) {
return this;
}

return this.withMustNotCondition(QueryType.Prefix(key, value.toLowerCase()));
}

withMustCondition(queries: AbstractQuery[] | AbstractQuery): ElasticQuery {
return this.withCondition(QueryConditionOptions.must, queries);
}
Expand Down
21 changes: 21 additions & 0 deletions packages/elastic/src/entities/prefix.query.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { AbstractQuery } from './abstract.query';

export class PrefixQuery extends AbstractQuery {
constructor(
private readonly key: string,
private readonly value: string,
) {
super();
}

getQuery(): any {
return {
prefix: {
[this.key]: {
value: this.value,
case_insensitive: true,
},
},
};
}
}
5 changes: 5 additions & 0 deletions packages/elastic/src/entities/query.type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ShouldQuery } from "./should.query";
import { WildcardQuery } from "./wildcard.query";
import { StringQuery } from "./string.query";
import { NestedShouldQuery } from "./nested.should.query";
import { PrefixQuery } from './prefix.query';
import { ScriptQuery } from "./script.query";

export class QueryType {
Expand All @@ -29,6 +30,10 @@ export class QueryType {
return new WildcardQuery(key, value);
};

static Prefix = (key: string, value: string): PrefixQuery => {
return new PrefixQuery(key, value);
};

static Nested = (key: string, value: MatchQuery[]): NestedQuery => {
return new NestedQuery(key, value);
};
Expand Down
1 change: 1 addition & 0 deletions packages/elastic/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ export * from './entities/range.query';
export * from './entities/should.query';
export * from './entities/terms.query';
export * from './entities/wildcard.query';
export * from './entities/prefix.query';
48 changes: 48 additions & 0 deletions packages/elastic/test/elastic.utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { RangeLowerThanOrEqual } from "../src/entities/range.lower.than.or.equal
import { TermsQuery } from "../src/entities/terms.query";
import { ElasticQuery } from "../src/entities/elastic.query";
import { AbstractQuery } from "../lib/entities/abstract.query";
import { PrefixQuery } from "../src/entities/prefix.query";

describe('Elastic Query', () => {
describe('Create Elastic Query', () => {
Expand Down Expand Up @@ -120,4 +121,51 @@ describe('Elastic Query', () => {
expect(elasticQuery.toJson().query.bool.must[2].nested.query.bool.should[0].wildcard["data.name"].value).toBe('*day one*');
expect(elasticQuery.toJson().query.bool.must[2].nested.query.bool.should[1].wildcard["data.token"].value).toBe('*day one*');
});

describe('Prefix Query', () => {
it('should create a prefix query', () => {
const query = new PrefixQuery('user', 'ki');
expect(query.getQuery()).toEqual({
prefix: {
user: {
value: 'ki',
case_insensitive: true,
},
},
});
});

it('should create a prefix query and add it to elastic query', () => {
const elasticQuery = ElasticQuery.create();
elasticQuery.withCondition(QueryConditionOptions.must, [new PrefixQuery('user', 'ki')]);

expect(elasticQuery.condition.must.length).toEqual(1);
expect(elasticQuery.condition.must[0].getQuery()).toMatchObject({
prefix: {
user: {
value: 'ki',
case_insensitive: true,
},
},
});
expect(elasticQuery.toJson().query.bool.must).toBeDefined();

expect(elasticQuery.toJson()).toEqual({
query: {
bool: {
must: [
{
prefix: {
user: {
value: 'ki',
case_insensitive: true,
},
},
},
],
},
},
});
});
});
});
2 changes: 1 addition & 1 deletion packages/http/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-http",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs http package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/monitoring/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-monitoring",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs monitoring package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/rabbitmq/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-rabbitmq",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs rabbitmq client package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/redis/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-nestjs-redis",
"version": "7.1.0",
"version": "7.2.0",
"description": "Multiversx SDK Nestjs redis client package",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
Loading