Fixed bug in account property DTO mapper.

rg911 · rg911 · commit e2f694e7f7e1 · 2019-05-07T22:51:20.000+01:00
diff --git a/e2e/conf/network.conf b/e2e/conf/network.conf
@@ -1,3 +1,28 @@
 {
-    "APIUrl": "http://localhost:3000"
+    "apiUrl": "http://localhost:3000",
+    "testAccount": {
+        "privateKey": "B3C5B6DD7DCDE9ACF040499E982203404515B26A1D9C909276F2CF9099D72AA5",
+        "address": "SAG4PUQZJH534BN7BAQKESIDWWJPFIHJOLWUSOKB",
+        "publicKey": "16644FB8EDBF3BE36E91AC19EF65B46030EE2A0B2BF7D689B0E0E8AC1F793260"
+    },
+    "multisigAccount": {
+        "privateKey": "95BAE7D0C17DCC9B3BF0C404F863BF15D5DEA2C16AD69CAB635E47E0464B358D",
+        "address": "SCRABJ2OCFOBKMYO3H6FWR2RELHGMYXQRJCDIUFA",
+        "publicKey": "89458BF00F28F6121081CB781DED5F1922A36918B1A682ED3D457FB00D78CD8D"
+    },
+    "cosignatoryAccount": {
+        "privateKey": "EAFC5E1EFB6D37A8DADCC1FAD87266B8A0C185A6763DF58CBD615856A5CDFB0B",
+        "address": "SDG3RSJJIUMPBMXQOEAZ5WJVLCPLJ33WVPRBQICX",
+        "publicKey": "7F12578F5C355DEA763E53E170D21D6D28ED6E2B96C4597A16E875FE06CC030C"
+    },
+    "cosignatory2Account": {
+        "privateKey": "740855D54E7265C3096758DBE143AA33E67D40EF9C00D5251C7CF989BA2AEFAC",
+        "address": "SARPZCINH3565TXYQPANBHDR6XF7UVTY2P2FJJAB",
+        "publicKey": "237A7EA34532E8254095B3E39A676FB9E731D6667B28A54DC453CA3A44034C91"
+    },
+    "cosignatory3Account": {
+        "privateKey": "76879F080CB8D06D24E4C69C2D46AE2B78000A364E8AB1A74120F5A539491077",
+        "address": "SCOZIUOOL3DKQQEZ3FLEAUFGY7SH7XQKM5IBJDGM",
+        "publicKey": "31CE6071B5F501B633A08BD77B7BDFEDD79B7ED43E4FF8A85FF62E39EBBC194E"
+    }
 }
diff --git a/e2e/infrastructure/AccountHttp.spec.ts b/e2e/infrastructure/AccountHttp.spec.ts
@@ -21,17 +21,32 @@ import {Address} from '../../src/model/account/Address';
 import {PublicAccount} from '../../src/model/account/PublicAccount';
 import {NetworkType} from '../../src/model/blockchain/NetworkType';
 
-import {APIUrl} from '../conf/conf.spec';
-
 describe('AccountHttp', () => {
-    const accountAddress = Address.createFromRawAddress('SDRDGFTDLLCB67D4HPGIMIHPNSRYRJRT7DOBGWZY');
-    const accountPublicKey = '1026D70E1954775749C6811084D6450A3184D977383F0E4282CD47118AF37755';
-    const publicAccount = PublicAccount.createFromPublicKey('846B4439154579A5903B1459C9CF69CB8153F6D0110A7A0ED61DE29AE4810BF2',
-        NetworkType.MIJIN_TEST);
-    const multisigPublicAccount = PublicAccount.createFromPublicKey('B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D',
-        NetworkType.MIJIN_TEST);
-
-    const accountHttp = new AccountHttp(APIUrl);
+    let accountAddress: Address;
+    let accountPublicKey: string;
+    let publicAccount: PublicAccount;
+    let multisigPublicAccount: PublicAccount;
+    let accountHttp: AccountHttp;
+
+    before((done) => {
+        const path = require('path');
+        require('fs').readFile(path.resolve(__dirname, '../conf/network.conf'), (err, data) => {
+            if (err) {
+                throw err;
+            }
+            const json = JSON.parse(data);
+            console.log(json);
+
+            accountAddress = Address.createFromRawAddress(json.testAccount.address);
+            // accountAddress = Address.createFromRawAddress('SBAGR4-IBHFHZ-YURYBL-F4XAJT-3CECON-3N2IGJ-Q3X2');
+            accountPublicKey = json.testAccount.publicKey;
+            publicAccount = PublicAccount.createFromPublicKey(json.testAccount.publicKey, NetworkType.MIJIN_TEST);
+            multisigPublicAccount = PublicAccount.createFromPublicKey(json.multisigAccount.publicKey, NetworkType.MIJIN_TEST);
+
+            accountHttp = new AccountHttp(json.apiUrl);
+            done();
+        });
+    });
 
     describe('getAccountInfo', () => {
         it('should return account data given a NEM Address', (done) => {
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "pretest": "npm run build",
     "test": "mocha --ui bdd --recursive ./dist/test --timeout 90000",
     "e2econfigcopy": "copyfiles --flat ./e2e/conf/*.conf ./dist/e2e/conf/",
-    "test:e2e": "mocha --ui bdd --recursive ./dist/e2e --timeout 90000",
+    "test:e2e": "npm run build && mocha --ui bdd --recursive ./dist/e2e --timeout 90000",
     "test:all": "mocha --ui bdd --recursive ./dist/ --timeout 90000",
     "build": "rm -rf dist/ && tsc && npm run e2econfigcopy ",
     "test:cov": "nyc --reporter=lcov --reporter=text-lcov npm t && nyc report --reporter=text-lcov",
diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts
@@ -33,6 +33,8 @@ import {Http} from './Http';
 import {NetworkHttp} from './NetworkHttp';
 import {QueryParams} from './QueryParams';
 import {CreateTransactionFromDTO} from './transaction/CreateTransactionFromDTO';
+import { AccountProperties } from '../model/account/AccountProperties';
+import { AccountProperty } from '../model/account/AccountProperty';
 
 /**
  * Account http repository.
@@ -87,11 +89,12 @@ export class AccountHttp extends Http implements AccountRepository {
      */
     public getAccountProperty(publicAccount: PublicAccount): Observable<AccountPropertiesInfo> {
         return observableFrom(this.accountRoutesApi.getAccountProperties(publicAccount.publicKey)).pipe(map((accountProperties) => {
-                return new AccountPropertiesInfo(
-                    accountProperties.meta,
-                    accountProperties.accountProperties,
-                );
-            }));
+            return new AccountPropertiesInfo(
+                accountProperties.meta,
+                new AccountProperties(Address.createFromEncoded(accountProperties.accountProperties.address),
+                                      accountProperties.accountProperties.properties.map((prop) =>
+                                            new AccountProperty(prop.propertyType, prop.values))));
+        }));
     }
 
     /**
@@ -106,7 +109,9 @@ export class AccountHttp extends Http implements AccountRepository {
             return accountProperties.map((property) => {
                 return new AccountPropertiesInfo(
                     property.meta,
-                    property.accountProperties,
+                    new AccountProperties(Address.createFromEncoded(property.accountProperties.address),
+                                          property.accountProperties.properties.map((prop) =>
+                                            new AccountProperty(prop.propertyType, prop.values))),
                 );
             });
         }));
@@ -119,7 +124,7 @@ export class AccountHttp extends Http implements AccountRepository {
      */
     public getAccountsInfo(addresses: Address[]): Observable<AccountInfo[]> {
         const accountIdsBody = {
-            accountIds: addresses.map((address) => address.plain()),
+            addresses: addresses.map((address) => address.plain()),
         };
         return observableFrom(
             this.accountRoutesApi.getAccountsInfo(accountIdsBody)).pipe(map((accountsInfoMetaDataDTO) => {
diff --git a/src/infrastructure/Listener.ts b/src/infrastructure/Listener.ts
@@ -16,7 +16,7 @@
 
 import {Observable, Subject} from 'rxjs';
 import {filter, map, share} from 'rxjs/operators';
-import 'ws';
+import * as WebSocket from 'ws';
 import {Address} from '../model/account/Address';
 import {PublicAccount} from '../model/account/PublicAccount';
 import {BlockInfo} from '../model/blockchain/BlockInfo';
diff --git a/src/model/account/AccountPropertiesInfo.ts b/src/model/account/AccountPropertiesInfo.ts
@@ -32,7 +32,7 @@ export class AccountPropertiesInfo {
                 /**
                  * Properties.
                  */
-                public readonly accountProperties: AccountProperties[]) {
+                public readonly accountProperties: AccountProperties) {
 
     }
 }
diff --git a/test/model/account/AccountPropertiesInfo.spec.ts b/test/model/account/AccountPropertiesInfo.spec.ts
@@ -15,37 +15,43 @@
  */
 
 import {deepEqual} from 'assert';
+import { AccountProperties } from '../../../src/model/account/AccountProperties';
+import { AccountPropertiesInfo } from '../../../src/model/account/AccountPropertiesInfo';
+import { AccountProperty } from '../../../src/model/account/AccountProperty';
 import {Address} from '../../../src/model/account/Address';
-import {AccountPropertiesInfo, PropertyModificationType, PropertyType } from '../../../src/model/model';
+import { PropertyModificationType } from '../../../src/model/account/PropertyModificationType';
+import { PropertyType } from '../../../src/model/account/PropertyType';
 
 describe('AccountPropertiesInfo', () => {
 
     it('should createComplete an AccountPropertiesInfo object', () => {
 
         const accountPropertiesInfoDTO = {
             meta: {id: '12345'},
-            accountProperties: [{
-                address: Address.createFromEncoded('9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142'),
+            accountProperties: {
+                address: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142',
                 properties: [{
                     propertyType: PropertyType.AllowAddress,
                     values: [{modificationType: PropertyModificationType.Add,
                               value: 'SDUP5PLHDXKBX3UU5Q52LAY4WYEKGEWC6IB3VBFM',
                              }],
                 }],
-            }],
+            },
         };
 
         const accountPropertiesInfo = new AccountPropertiesInfo(
             accountPropertiesInfoDTO.meta,
-            accountPropertiesInfoDTO.accountProperties,
+            new AccountProperties(Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address),
+                                  accountPropertiesInfoDTO.accountProperties.properties.map((prop) =>
+                                            new AccountProperty(prop.propertyType, prop.values))),
         );
 
         deepEqual(accountPropertiesInfo.meta.id, accountPropertiesInfoDTO.meta.id);
-        deepEqual(accountPropertiesInfo.accountProperties.length, accountPropertiesInfoDTO.accountProperties.length);
-        deepEqual(accountPropertiesInfo.accountProperties[0].address, accountPropertiesInfoDTO.accountProperties[0].address);
-        deepEqual(accountPropertiesInfo.accountProperties[0].properties.length,
-            accountPropertiesInfoDTO.accountProperties[0].properties.length);
-        deepEqual(accountPropertiesInfo.accountProperties[0].properties[0].values[0],
-            accountPropertiesInfoDTO.accountProperties[0].properties[0].values[0]);
+        deepEqual(accountPropertiesInfo.accountProperties.address,
+                    Address.createFromEncoded(accountPropertiesInfoDTO.accountProperties.address));
+        deepEqual(accountPropertiesInfo.accountProperties.properties.length,
+            accountPropertiesInfoDTO.accountProperties.properties.length);
+        deepEqual(accountPropertiesInfo.accountProperties.properties[0].values[0],
+            accountPropertiesInfoDTO.accountProperties.properties[0].values[0]);
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class AccountPropertiesInfo {`
`32`	`32`	`/**`
`33`	`33`	`* Properties.`
`34`	`34`	`*/`
`35`		`- public readonly accountProperties: AccountProperties[]) {`
	`35`	`+ public readonly accountProperties: AccountProperties) {`
`36`	`36`
`37`	`37`	`}`
`38`	`38`	`}`