Skip to content

Fixes #415 - Paging arguments limit/skip #416

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 19, 2023
Merged

Fixes #415 - Paging arguments limit/skip #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e00c1dc
Fixes #415 - Paging arguments limit/skip
petruki May 19, 2023
958bd01
Fixed code smells
petruki May 19, 2023
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
6 changes: 4 additions & 2 deletions src/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ export function sortBy(args) {
}

export function validatePagingArgs(args) {
if (args.limit && !Number.isInteger(args.limit))
if (args.limit && !Number.isInteger(parseInt(args.limit)) ||
parseInt(args.limit) < 1)
return false;

if (args.skip && !Number.isInteger(args.skip))
if (args.skip && !Number.isInteger(parseInt(args.skip)) ||
parseInt(args.skip) < 0)
return false;

if (args.sortBy) {
Expand Down
2 changes: 1 addition & 1 deletion src/routers/domain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ router.get('/domain/history/:id', auth, [
const domain = await Services.getDomainById(req.params.id);

const query = 'oldValue newValue updatedBy date -_id';
const history = await getHistory(query, domain._id, undefined, req.query);
const history = await getHistory(query, domain._id, domain._id, req.query);

await verifyOwnership(req.admin, domain, domain._id, ActionTypes.READ, RouterTypes.DOMAIN);

Expand Down
4 changes: 1 addition & 3 deletions src/services/history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import { sortBy, validatePagingArgs } from '../helpers';
import { BadRequestError } from '../exceptions';

export async function getHistory(query, domainId, elementId, pagingArgs = {}) {
const findQuery = elementId ? { domainId, elementId } : { domainId };

if (!validatePagingArgs(pagingArgs))
throw new BadRequestError('Invalid paging args');

return History.find(findQuery)
return History.find({ domainId, elementId })
.select(query)
.sort(sortBy(pagingArgs))
.limit(parseInt(pagingArgs.limit || 10))
Expand Down
22 changes: 21 additions & 1 deletion tests/services/history.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,30 @@ describe('Testing history services', () => {
await expect(call()).rejects.toThrowError('Invalid paging args');
});

test('HISTORY_SERVICE - Should NOT get history - invalid paging args - limit not number', async () => {
const call = async () => {
await getHistory('elementId', domainId, element1Id, {
limit: 'a'
});
};

await expect(call()).rejects.toThrowError('Invalid paging args');
});

test('HISTORY_SERVICE - Should NOT get history - invalid paging args - skip', async () => {
const call = async () => {
await getHistory('elementId', domainId, element1Id, {
skip: '0'
skip: '-1'
});
};

await expect(call()).rejects.toThrowError('Invalid paging args');
});

test('HISTORY_SERVICE - Should NOT get history - invalid paging args - skip not number', async () => {
const call = async () => {
await getHistory('elementId', domainId, element1Id, {
skip: 'a'
});
};

Expand Down