Skip to content
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

Jump to bottom

fix(core-api): set default orderBy value #3777

Merged
merged 1 commit into from
Jun 7, 2020
Merged

fix(core-api): set default orderBy value #3777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions packages/core-api/src/routes/blocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.blockCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.blocksOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand Down Expand Up @@ -77,7 +77,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand All @@ -92,7 +92,7 @@ export const register = (server: Hapi.Server): void => {
validate: {
query: Joi.object({
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.blocksOrderBy,
transform: Joi.bool().default(true),
}),
payload: Joi.object({
Expand Down
4 changes: 2 additions & 2 deletions packages/core-api/src/routes/transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand Down Expand Up @@ -107,7 +107,7 @@ export const register = (server: Hapi.Server): void => {
validate: {
query: Joi.object({
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
payload: Joi.object({
Expand Down
2 changes: 1 addition & 1 deletion packages/core-api/src/routes/votes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand Down
10 changes: 5 additions & 5 deletions packages/core-api/src/routes/wallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand All @@ -99,7 +99,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand All @@ -118,7 +118,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand All @@ -137,7 +137,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand All @@ -156,7 +156,7 @@ export const register = (server: Hapi.Server): void => {
query: Joi.object({
...server.app.schemas.transactionCriteriaSchemas,
...server.app.schemas.pagination,
orderBy: server.app.schemas.orderBy,
orderBy: server.app.schemas.transactionsOrderBy,
transform: Joi.bool().default(true),
}),
},
Expand Down
5 changes: 5 additions & 0 deletions packages/core-api/src/schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export const createSchemas = (settings: SchemaSettings) => {
"orderBy query parameter (<iteratee>:<direction>)",
);

const blocksOrderBy = orderBy.default("height:desc");
const transactionsOrderBy = orderBy.default("timestamp:desc,sequence:desc");

const equalCriteria = (value: any) => value;
const numericCriteria = (value: any) =>
Joi.alternatives().try(
Expand Down Expand Up @@ -127,6 +130,8 @@ export const createSchemas = (settings: SchemaSettings) => {
numberFixedOrBetween,
walletId,
orderBy,
blocksOrderBy,
transactionsOrderBy,
blockCriteriaSchemas,
transactionCriteriaSchemas,
};
Expand Down