@barchart/portfolio-api-common 1.2.46 → 1.2.50

package/lib/formatters/TransactionFormatter.js

@@ -146,13 +146,18 @@ module.exports = (() => {
 	});
 
 	formatters.set(TransactionType.DIVIDEND_STOCK, (t) => {
-		const rate = (is.object(t.dividend) && is.string(t.dividend.rate)) || '';
-
-		return {
+		const data = {
 			boughtSold: t.quantity,
-			shares: t.snapshot.open.subtract(t.quantity),
-			rate: rate
+			fee: t.fee
 		};
+
+		if (t.dividend && t.dividend.rate && t.dividend.price) {
+			data.shares = t.snapshot.open.subtract(t.quantity);
+			data.price = t.dividend.price;
+			data.rate = t.dividend.rate;
+		}
+
+		return data;
 	});
 
 	formatters.set(TransactionType.DIVIDEND_REINVEST, (t) => {
@@ -174,15 +179,22 @@ module.exports = (() => {
 	});
 
 	formatters.set(TransactionType.DISTRIBUTION_FUND, (t) => {
-		return {
-			shares: t.snapshot.open.subtract(t.quantity),
+		const data = {
+			boughtSold: t.quantity,
 			fee: t.fee
 		};
+
+		if (t.dividend && t.dividend.rate && t.dividend.price) {
+			data.shares = t.snapshot.open.subtract(t.quantity);
+			data.price = t.dividend.price;
+			data.rate = t.dividend.rate;
+		}
+
+		return data;
 	});
 
 	formatters.set(TransactionType.DISTRIBUTION_REINVEST, (t) => {
 		return {
-			boughtSold: t.quantity,
 			shares: t.snapshot.open.subtract(t.quantity),
 			price: t.dividend.price,
 			fee: t.fee,
@@ -205,7 +217,6 @@ module.exports = (() => {
 
 	formatters.set(TransactionType.FEE_UNITS, (t) => {
 		return {
-			total: t.charge.amount,
 			boughtSold: t.quantity
 		};
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.2.46",
+  "version": "1.2.50",
   "description": "Common classes used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",