Skip to content

fix(core-api): use block query criteria on delegates route #4703

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
sebastijankuzner merged 2 commits into from
Aug 19, 2022
Merged

fix(core-api): use block query criteria on delegates route #4703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
728e618
fix(core-api): use block query criteria
sebastijankuzner Aug 18, 2022
4b1f77e
lint
sebastijankuzner Aug 18, 2022
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
8 changes: 6 additions & 2 deletions packages/core-api/src/controllers/delegates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Hapi from "@hapi/hapi";
import { Identifiers } from "../identifiers";
import { BlockResource, BlockWithTransactionsResource } from "../resources";
import {
blockCriteriaSchemaObject,
DelegateCriteria,
delegateCriteriaSchemaObject,
DelegateResource,
Expand Down Expand Up @@ -88,8 +89,12 @@ export class DelegatesController extends Controller {
return notFound("Delegate not found");
}

const blockCriteria = {
...(this.getQueryCriteria(request.query, blockCriteriaSchemaObject) as Contracts.Shared.OrBlockCriteria),
generatorPublicKey: delegateResource.publicKey,
};

if (request.query.transform) {
const blockCriteria = { generatorPublicKey: delegateResource.publicKey };
const blockWithSomeTransactionsListResult = await this.blockHistoryService.listByCriteriaJoinTransactions(
blockCriteria,
{ typeGroup: Enums.TransactionTypeGroup.Core, type: Enums.TransactionType.MultiPayment },
Expand All @@ -100,7 +105,6 @@ export class DelegatesController extends Controller {

return this.toPagination(blockWithSomeTransactionsListResult, BlockWithTransactionsResource, true);
} else {
const blockCriteria = { generatorPublicKey: delegateResource.publicKey };
const blockListResult = await this.blockHistoryService.listByCriteria(
blockCriteria,
this.getListingOrder(request),
Expand Down