Skip to content

Added Order to QueryParameters #121

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 4 commits into from Apr 15, 2019
Merged

Added Order to QueryParameters #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d976b69
order in query params
aleixmorgadas Apr 13, 2019
33d1dc6
added default enum values for API
aleixmorgadas Apr 13, 2019
8f44ef3
CreateTransactionFromDTO takes care when message is null
aleixmorgadas Apr 13, 2019
9b497bb
Merge branch 'master' into master
evias Apr 15, 2019
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
47 changes: 47 additions & 0 deletions e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,53 @@ describe('CreateTransactionFromDTO', () => {
ValidateTransaction.validateStandaloneTx(transferTransaction, transferTransactionDTO);
});

it('standalone without message', () => {
const transferTransactionDTO = {
meta: {
hash: '18C036C20B32348D63684E09A13128A2C18F6A75650D3A5FB43853D716E5E219',
height: [
1,
0,
],
id: '59FDA0733F17CF0001772CA7',
index: 19,
merkleComponentHash: '18C036C20B32348D63684E09A13128A2C18F6A75650D3A5FB43853D716E5E219',
},
transaction: {
deadline: [
10000,
0,
],
fee: [
0,
0,
],
mosaics: [
{
amount: [
3863990592,
95248,
],
id: [
3646934825,
3576016193,
],
},
],
recipient: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142',
signature: '553E696EB4A54E43A11D180EBA57E4B89D0048C9DD2604A9E0608120018B9E0' +
'2F6EE63025FEEBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
signer: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
type: 16724,
version: 36867,
},
};

const transferTransaction = CreateTransactionFromDTO(transferTransactionDTO);

ValidateTransaction.validateStandaloneTx(transferTransaction, transferTransactionDTO);
});

it('aggregate', () => {
const aggregateTransferTransactionDTO = {
meta: {
Expand Down
18 changes: 17 additions & 1 deletion src/infrastructure/QueryParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@
* limitations under the License.
*/

/**
* @since 0.11.3
*/
export enum Order {
ASC = 'id',
DESC = '-id',
}


/**
* The query params structure describes pagination params for requests.
*
Expand All @@ -34,7 +43,14 @@ export class QueryParams {
/**
* Id after which we want objects to be returned
*/
public readonly id?: string) {
public readonly id?: string,
/**
* Order of transactions.
* DESC. Newer to older.
* ASC. Older to newer.
*/
public readonly order: Order = Order.DESC,
) {
this.pageSize = (pageSize >= 10 && pageSize <= 100) ? pageSize : 10;
this.id = id;
}
Expand Down
2 changes: 1 addition & 1 deletion src/infrastructure/transaction/CreateTransactionFromDTO.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
UInt64.fromUint(transactionDTO.maxFee || 0),
extractRecipient(transactionDTO.recipient),
extractMosaics(transactionDTO.mosaics),
extractMessage(transactionDTO.message.payload),
extractMessage(transactionDTO.message !== undefined ? transactionDTO.message.payload : undefined),
transactionDTO.signature,
transactionDTO.signer ? PublicAccount.createFromPublicKey(transactionDTO.signer,
extractNetworkType(transactionDTO.version)) : undefined,
Expand Down