5805 typing issue in rest api (#5818)
Fixed types for: - uuid - email - datetime - date - number - currency.amountMicros - select - multiSelect ## Before  ## After 
This commit is contained in:
@ -78,12 +78,12 @@ describe('FilterInputFactory', () => {
|
||||
it('should create filter parser properly', () => {
|
||||
const request: any = {
|
||||
query: {
|
||||
filter: 'fieldNumber[eq]:1,fieldString[eq]:"Test"',
|
||||
filter: 'fieldNumber[eq]:1,fieldText[eq]:"Test"',
|
||||
},
|
||||
};
|
||||
|
||||
expect(service.create(request, objectMetadata)).toEqual({
|
||||
and: [{ fieldNumber: { eq: 1 } }, { fieldString: { eq: 'Test' } }],
|
||||
and: [{ fieldNumber: { eq: 1 } }, { fieldText: { eq: 'Test' } }],
|
||||
});
|
||||
});
|
||||
|
||||
@ -91,21 +91,21 @@ describe('FilterInputFactory', () => {
|
||||
const request: any = {
|
||||
query: {
|
||||
filter:
|
||||
'and(fieldNumber[eq]:1,fieldString[gte]:"Test",not(fieldString[ilike]:"%val%"),or(not(and(fieldString[startsWith]:"test",fieldNumber[in]:[2,4,5])),fieldCurrency.amountMicros[gt]:1))',
|
||||
'and(fieldNumber[eq]:1,fieldText[gte]:"Test",not(fieldText[ilike]:"%val%"),or(not(and(fieldText[startsWith]:"test",fieldNumber[in]:[2,4,5])),fieldCurrency.amountMicros[gt]:1))',
|
||||
},
|
||||
};
|
||||
|
||||
expect(service.create(request, objectMetadata)).toEqual({
|
||||
and: [
|
||||
{ fieldNumber: { eq: 1 } },
|
||||
{ fieldString: { gte: 'Test' } },
|
||||
{ not: { fieldString: { ilike: '%val%' } } },
|
||||
{ fieldText: { gte: 'Test' } },
|
||||
{ not: { fieldText: { ilike: '%val%' } } },
|
||||
{
|
||||
or: [
|
||||
{
|
||||
not: {
|
||||
and: [
|
||||
{ fieldString: { startsWith: 'test' } },
|
||||
{ fieldText: { startsWith: 'test' } },
|
||||
{ fieldNumber: { in: [2, 4, 5] } },
|
||||
],
|
||||
},
|
||||
|
||||
@ -32,13 +32,13 @@ describe('OrderByInputFactory', () => {
|
||||
it('should create order by parser properly', () => {
|
||||
const request: any = {
|
||||
query: {
|
||||
order_by: 'fieldNumber[AscNullsFirst],fieldString[DescNullsLast]',
|
||||
order_by: 'fieldNumber[AscNullsFirst],fieldText[DescNullsLast]',
|
||||
},
|
||||
};
|
||||
|
||||
expect(service.create(request, objectMetadata)).toEqual({
|
||||
fieldNumber: OrderByDirection.AscNullsFirst,
|
||||
fieldString: OrderByDirection.DescNullsLast,
|
||||
fieldText: OrderByDirection.DescNullsLast,
|
||||
});
|
||||
});
|
||||
|
||||
@ -95,7 +95,7 @@ describe('OrderByInputFactory', () => {
|
||||
it('should throw if direction invalid', () => {
|
||||
const request: any = {
|
||||
query: {
|
||||
order_by: 'fieldString[invalid]',
|
||||
order_by: 'fieldText[invalid]',
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@ -41,14 +41,14 @@ describe('parseFilterContent', () => {
|
||||
});
|
||||
|
||||
it('should parse query filter with comma in value ', () => {
|
||||
expect(parseFilterContent('and(fieldString[eq]:"val,ue")')).toEqual([
|
||||
'fieldString[eq]:"val,ue"',
|
||||
expect(parseFilterContent('and(fieldText[eq]:"val,ue")')).toEqual([
|
||||
'fieldText[eq]:"val,ue"',
|
||||
]);
|
||||
});
|
||||
|
||||
it('should parse query filter with comma in value ', () => {
|
||||
expect(parseFilterContent("and(fieldString[eq]:'val,ue')")).toEqual([
|
||||
"fieldString[eq]:'val,ue'",
|
||||
expect(parseFilterContent("and(fieldText[eq]:'val,ue')")).toEqual([
|
||||
"fieldText[eq]:'val,ue'",
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@ -51,25 +51,25 @@ describe('parseFilter', () => {
|
||||
it('should parse string filter test 4', () => {
|
||||
expect(
|
||||
parseFilter(
|
||||
'and(fieldString[gt]:"val,ue",or(fieldNumber[is]:NOT_NULL,not(fieldString[startsWith]:"val"),and(fieldNumber[eq]:6,fieldString[ilike]:"%val%")),or(fieldNumber[eq]:4,fieldString[is]:NULL))',
|
||||
'and(fieldText[gt]:"val,ue",or(fieldNumber[is]:NOT_NULL,not(fieldText[startsWith]:"val"),and(fieldNumber[eq]:6,fieldText[ilike]:"%val%")),or(fieldNumber[eq]:4,fieldText[is]:NULL))',
|
||||
objectMetadataItemMock,
|
||||
),
|
||||
).toEqual({
|
||||
and: [
|
||||
{ fieldString: { gt: 'val,ue' } },
|
||||
{ fieldText: { gt: 'val,ue' } },
|
||||
{
|
||||
or: [
|
||||
{ fieldNumber: { is: 'NOT_NULL' } },
|
||||
{ not: { fieldString: { startsWith: 'val' } } },
|
||||
{ not: { fieldText: { startsWith: 'val' } } },
|
||||
{
|
||||
and: [
|
||||
{ fieldNumber: { eq: 6 } },
|
||||
{ fieldString: { ilike: '%val%' } },
|
||||
{ fieldText: { ilike: '%val%' } },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{ or: [{ fieldNumber: { eq: 4 } }, { fieldString: { is: 'NULL' } }] },
|
||||
{ or: [{ fieldNumber: { eq: 4 } }, { fieldText: { is: 'NULL' } }] },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
@ -2,7 +2,7 @@ import {
|
||||
fieldCurrencyMock,
|
||||
fieldLinkMock,
|
||||
fieldNumberMock,
|
||||
fieldStringMock,
|
||||
fieldTextMock,
|
||||
objectMetadataItemMock,
|
||||
} from 'src/engine/api/__mocks__/object-metadata-item.mock';
|
||||
import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
|
||||
@ -13,8 +13,8 @@ describe('mapFieldMetadataToGraphqlQuery', () => {
|
||||
mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldNumberMock),
|
||||
).toEqual('fieldNumber');
|
||||
expect(
|
||||
mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldStringMock),
|
||||
).toEqual('fieldString');
|
||||
mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldTextMock),
|
||||
).toEqual('fieldText');
|
||||
expect(
|
||||
mapFieldMetadataToGraphqlQuery(objectMetadataItemMock, fieldLinkMock),
|
||||
).toEqual(`
|
||||
|
||||
Reference in New Issue
Block a user