FIX MosaicService mosaicsAmountView

Author: Aleix602

e2e/service/MosaicService.spec.ts

@@ -0,0 +1,26 @@
+import 'rxjs/add/operator/toPromise';
+import {AccountHttp} from '../../src/infrastructure/AccountHttp';
+import {MosaicHttp} from '../../src/infrastructure/MosaicHttp';
+import {NamespaceHttp} from '../../src/infrastructure/NamespaceHttp';
+import {Address} from '../../src/model/account/Address';
+import {MosaicService} from '../../src/service/MosaicService';
+import {APIUrl} from '../conf/conf.spec';
+
+describe('MosaicService', () => {
+
+    it('should return the mosaic list skipping the expired mosaics', () => {
+        const mosaicService = new MosaicService(
+            new AccountHttp(APIUrl),
+            new MosaicHttp(APIUrl),
+            new NamespaceHttp(APIUrl),
+        );
+
+        const address = Address.createFromRawAddress('SCO2JY-N6OJSM-CJPPVS-Z3OX7P-TWPQEJ-GZTI6W-GLKK');
+
+        return mosaicService.mosaicsAmountViewFromAddress(address)
+            .flatMap((_) => _)
+            .map((mosaic) => console.log('You have', mosaic.relativeAmount(), mosaic.fullName()))
+            .toArray()
+            .toPromise();
+    });
+});

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nem2-sdk",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Reactive Nem2 sdk for typescript and javascript",
   "scripts": {
     "pretest": "npm run build",
@@ -32,20 +32,22 @@
   "typings": "dist/index.d.ts",
   "devDependencies": {
     "@types/chai": "^4.0.4",
-    "@types/mocha": "^2.2.44",
     "@types/lodash": "^4.14.85",
-    "@types/utf8": "^2.1.6",
+    "@types/mocha": "^2.2.44",
     "@types/request": "^2.47.0",
     "@types/request-promise-native": "^1.0.14",
+    "@types/utf8": "^2.1.6",
     "@types/ws": "^3.2.0",
     "assert": "^1.4.1",
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
     "mocha": "^4.0.1",
     "nyc": "^11.3.0",
     "ts-mockito": "^2.2.7",
+    "ts-node": "^5.0.1",
     "tslint": "^5.8.0",
-    "typescript": "^2.5.3"
+    "typescript": "^2.5.3",
+    "typescript-require": "^0.2.9-1"
   },
   "dependencies": {
     "js-joda": "^1.6.2",

package.json

@@ -16,6 +16,7 @@
 
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/operator/toArray';
 import {Observable} from 'rxjs/Observable';
@@ -71,16 +72,15 @@ export class MosaicService {
     mosaicsAmountView(mosaics: Mosaic[]): Observable<MosaicAmountView[]> {
         return Observable.of(mosaics)
             .flatMap((_) => _)
-            .flatMap((mosaic) => this.mosaicsView([mosaic.id]).map((mosaicViews) => {
+            .flatMap((mosaic) => this.mosaicsView([mosaic.id])
+                .filter((_) => _.length !== 0)
+                .map((mosaicViews) => {
                 return new MosaicAmountView(mosaicViews[0].mosaicInfo,
                     mosaicViews[0].namespaceName,
                     mosaicViews[0].mosaicName,
                     mosaic.amount);
             }))
-            .toArray()
-            .catch(() => {
-                return Observable.of([]);
-            });
+            .toArray();
     }
 
     /**