Skip to content

Commit 5866469

Browse files
committed
Shorten query param keys
1 parent 455f991 commit 5866469

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/query-tools/create-search-query.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export function createSearchQuery(
116116
}
117117
else if (queryType === 'lessThan') {
118118
for (const column in query.lessThan) {
119-
const key = 'lessThan_' + column;
119+
const key = 'lt_' + column;
120120

121121
// Append key to queryString
122122
queryString += `${objKey}.${column} < :${key} AND `;
@@ -125,15 +125,15 @@ export function createSearchQuery(
125125
}
126126
else if (queryType === 'greaterThan') {
127127
for (const column in query.greaterThan) {
128-
const key = 'greaterThan_' + column;
128+
const key = 'gt_' + column;
129129

130130
queryString += `${objKey}.${column} > :${key} AND `;
131131
queryParams[key] = `${query.greaterThan[column]}`;
132132
}
133133
}
134134
else if (queryType === 'lessThanOrEqual') {
135135
for (const column in query.lessThanOrEqual) {
136-
const key = 'lessThanOrEqual_' + column;
136+
const key = 'lte_' + column;
137137

138138
queryString +=
139139
`${objKey}.${column} <= ` +
@@ -144,7 +144,7 @@ export function createSearchQuery(
144144
}
145145
else if (queryType === 'greaterThanOrEqual') {
146146
for (const column in query.greaterThanOrEqual) {
147-
const key = 'greaterThanOrEqual_' + column;
147+
const key = 'gte_' + column;
148148

149149
queryString +=
150150
`${objKey}.${column} >= ` +

test/spec/api/query-tools/create-search-query.spec.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ describe('[QueryTools] createSearchQuery()', () => {
123123
query
124124
);
125125

126-
expect(queryString).toBe('obj.id < :lessThan_id');
127-
expect(queryParams).toEqual({ lessThan_id: '100' });
126+
expect(queryString).toBe('obj.id < :lt_id');
127+
expect(queryParams).toEqual({ lt_id: '100' });
128128
});
129129

130130
it('can run lessThanOrEqual query', () => {
@@ -139,8 +139,8 @@ describe('[QueryTools] createSearchQuery()', () => {
139139
query
140140
);
141141

142-
expect(queryString).toBe('obj.id <= :lessThanOrEqual_id');
143-
expect(queryParams).toEqual({ lessThanOrEqual_id: '100' });
142+
expect(queryString).toBe('obj.id <= :lte_id');
143+
expect(queryParams).toEqual({ lte_id: '100' });
144144
});
145145

146146
it('can run greaterThan query', () => {
@@ -155,8 +155,8 @@ describe('[QueryTools] createSearchQuery()', () => {
155155
query
156156
);
157157

158-
expect(queryString).toBe('obj.id > :greaterThan_id');
159-
expect(queryParams).toEqual({ greaterThan_id: '100' });
158+
expect(queryString).toBe('obj.id > :gt_id');
159+
expect(queryParams).toEqual({ gt_id: '100' });
160160
});
161161

162162
it('can run greaterThanOrEqual query', () => {
@@ -171,8 +171,8 @@ describe('[QueryTools] createSearchQuery()', () => {
171171
query
172172
);
173173

174-
expect(queryString).toBe('obj.id >= :greaterThanOrEqual_id');
175-
expect(queryParams).toEqual({ greaterThanOrEqual_id: '100' });
174+
expect(queryString).toBe('obj.id >= :gte_id');
175+
expect(queryParams).toEqual({ gte_id: '100' });
176176
});
177177

178178
it('can run not query', () => {
@@ -252,15 +252,15 @@ describe('[QueryTools] createSearchQuery()', () => {
252252
);
253253

254254
expect(queryString).toBe(
255-
'obj.fname=:where_fname AND (obj.fname=:whereAnyOf_fname) AND obj.fname < :lessThan_fname AND obj.fname <= :lessThanOrEqual_fname AND obj.fname > :greaterThan_fname AND obj.fname >= :greaterThanOrEqual_fname AND obj.fname!=:not_fname'
255+
'obj.fname=:where_fname AND (obj.fname=:whereAnyOf_fname) AND obj.fname < :lt_fname AND obj.fname <= :lte_fname AND obj.fname > :gt_fname AND obj.fname >= :gte_fname AND obj.fname!=:not_fname'
256256
);
257257
expect(queryParams).toEqual({
258258
where_fname: query.where.fname,
259259
whereAnyOf_fname: query.whereAnyOf.fname,
260-
lessThan_fname: query.lessThan.fname,
261-
lessThanOrEqual_fname: query.lessThanOrEqual.fname,
262-
greaterThan_fname: query.greaterThan.fname,
263-
greaterThanOrEqual_fname: query.greaterThanOrEqual.fname,
260+
lt_fname: query.lessThan.fname,
261+
lte_fname: query.lessThanOrEqual.fname,
262+
gt_fname: query.greaterThan.fname,
263+
gte_fname: query.greaterThanOrEqual.fname,
264264
not_fname: query.not.fname
265265
});
266266
});

0 commit comments

Comments
 (0)