@barchart/portfolio-api-common 1.0.1 → 1.0.5

package/lib/data/TransactionType.js

@@ -304,7 +304,7 @@ module.exports = (() => {
 	const buyShort = new TransactionType('BS', 'Buy To Cover', true, false, false, false, true);
 	const sellShort = new TransactionType('SS', 'Sell Short',  false, true, false, true, false);
 	const dividend = new TransactionType('DV', 'Dividend', false, false, true, false, false);
-	const dividendReinvest = new TransactionType('DR', 'Dividend (Reinvested)', false, false, false, true, false);
+	const dividendReinvest = new TransactionType('DX', 'Dividend (Reinvested)', false, false, false, true, false);
 	const dividendStock = new TransactionType('DS', 'Dividend (Stock)', false, false, false, true, false);
 	const split = new TransactionType('SP', 'Split', false, false, false, true, false);
 	const fee = new TransactionType('F', 'Fee', false, false, false, true, false);

package/lib/formatters/TransactionFormatter.js

@@ -1,16 +1,16 @@
-const assert = require('@barchart/common-js/lang/assert');
+const assert = require('@barchart/common-js/lang/assert'),
+	is = require('@barchart/common-js/lang/is'),
+	numberFormatter = require('@barchart/common-js/lang/formatter');
 
-const ValuationType = require('./../data/ValuationType');
+const TransactionType = require('./../data/TransactionType');
 
 module.exports = (() => {
 	'use strict';
 
 	/**
-	 * Static utilities for formatting {@link Transaction} objects for 
-	 * display to humans.
+	 * Static configuration data.
 	 *
 	 * @public
-	 * @extends {Enum}
 	 */
 	class TransactionFormatter {
 		constructor(schema) {
@@ -18,14 +18,54 @@ module.exports = (() => {
 		}
 
 		/**
-		 * Formats transactions for display to humans.
+		 * Formats transactions by adding "formatted" attribute
+		 * and "instrument" attribute from position
 		 *
 		 * @public
 		 * @static
-		 * @param {Array.<Transaction>} transactions
+		 * @param {Array} transactions
+		 * @param {Array} positions
+		 * @param {String} returnType - Whether the return values should be appended to the transaction
+		 * 	
+		 * @returns {Array}
 		 */
-		static format(transactions) {
-			return [ ];
+		static format(transactions, positions, returnType) {
+			assert.argumentIsRequired(transactions, 'transactions', Array);
+			assert.argumentIsRequired(positions, 'positions', Array);
+
+			const positionMap = {};
+
+			positions.map((p) => positionMap[p.position] = p.instrument);
+
+			return transactions.filter((t) => positionMap[t.position]).map((transaction) => {
+				transaction.instrument = positionMap[transaction.position];
+
+				let formatted = getBasicTransaction(transaction);
+
+				if (formatters.has(transaction.type)) {
+					const formatterFunction = formatters.get(transaction.type);
+
+					const formattedTransaction = formatterFunction(transaction);
+
+					Object.keys(formattedTransaction).map((key) => {
+						if (!is.undefined(formattedTransaction[key]) && is.fn(formattedTransaction[key].toFloat)) {
+							const precision = transaction.instrument.currency.precision;
+
+							formattedTransaction[key] = numberFormatter.numberToString(formattedTransaction[key].toFloat(), precision, ',');
+						}
+					});
+
+					formatted = Object.assign({}, formatted, formattedTransaction);
+				}
+
+				if (returnType === 'append') {
+					transaction.formatted = formatted;
+
+					return transaction;
+				}
+
+				return formatted;
+			});
 		}
 
 		toString() {
@@ -33,5 +73,130 @@ module.exports = (() => {
 		}
 	}
 
+	const getBasicTransaction = (t) => {
+		return {
+			date: t.date,
+			type: t.type,
+			sequence: t.sequence,
+			instrument: t.instrument
+		};
+	};
+
+	const formatters = new Map();
+	
+	const buySellFormatter = (t) => {
+		return {
+			boughtSold: t.quantity,
+			price: t.trade.price,
+			fee: t.fee,
+			total: t.amount
+		};
+	};
+	formatters.set(TransactionType.BUY, buySellFormatter);
+	formatters.set(TransactionType.SELL, buySellFormatter);
+	formatters.set(TransactionType.BUY_SHORT, buySellFormatter);
+	formatters.set(TransactionType.SELL_SHORT, buySellFormatter);
+
+	formatters.set(TransactionType.DIVIDEND, (t) => {
+		return {
+			shares: t.snapshot.open,
+			total: t.dividend.amout,
+			rate: t.dividend.rate
+		};
+	});
+
+	formatters.set(TransactionType.DIVIDEND_STOCK, (t) => {
+		const shares = t.snapshot.open.subtract(t.quantity);
+		const rate = (is.object(t.dividend) && is.string(t.dividend.rate)) || '';
+
+		return {
+			boughtSold: t.quantity,
+			shares: shares,
+			rate: rate
+		};
+	});
+
+	formatters.set(TransactionType.DISTRIBUTION_CASH, (t) => {
+		return {
+			shares: t.snapshot.open,
+			total: t.dividend.amount,
+			rate: t.dividend.rate
+		};
+	});
+
+	formatters.set(TransactionType.DIVIDEND_REINVEST, (t) => {
+		return {
+			shares: t.snapshot.open.subtract(t.quantity),
+			price: t.dividend.price,
+			fee: t.fee,
+			total: t.quantity,
+			rate: t.dividend.rate
+		}
+	});
+
+	formatters.set(TransactionType.DISTRIBUTION_FUND, (t) => {
+		return {
+			shares: t.snapshot.open.subtract(t.quantity),
+			fee: t.fee
+		}
+	});
+
+	formatters.set(TransactionType.INCOME, (t) => {
+		return {
+			total: t.income.amount
+		};	
+	});
+
+	formatters.set(TransactionType.FEE, (t) => {
+		return {
+			total: t.charge.amount
+		};
+	});
+
+	formatters.set(TransactionType.FEE_UNITS, (t) => {
+		return {
+			total: t.charge.amount,
+			boughtSold: t.quantity
+		};
+	});
+
+	formatters.set(TransactionType.SPLIT, (t) => {
+		return {
+			shares: t.quantity,
+			rate: t.split.numerator.divide(t.split.denominator)
+		};
+	});
+
+	formatters.set(TransactionType.VALUATION, (t) => {
+		return {
+			price: t.valuation.value
+		};
+	});
+
+	const cashFormatter = (t) => {
+		return {
+			total: t.quantity
+		};
+	};
+
+	formatters.set(TransactionType.DEPOSIT, cashFormatter);
+	formatters.set(TransactionType.WITHDRAWAL, cashFormatter);
+
+	formatters.set(TransactionType.DEBIT, (t) => {
+		const formatted = cashFormatter(t);
+
+		formatted.description = t.description;
+
+		return formatted;
+	});
+
+	formatters.set(TransactionType.CREDIT, (t) => {
+		const formatted = cashFormatter(t);
+
+		formatted.description = t.description;
+
+		return formatted;
+	});
+
 	return TransactionFormatter;
-})();
+})();

package/lib/serialization/TransactionSchema.js

@@ -52,10 +52,42 @@ module.exports = (() => {
 	}
 
 	const complete = new TransactionSchema(SchemaBuilder.withName('Complete')
+		.withField('portfolio', DataType.STRING)
+		.withField('position', DataType.STRING)
 		.withField('sequence', DataType.NUMBER)
+		.withField('type', DataType.forEnum(TransactionType, 'TransactionType'))
 		.withField('date', DataType.DAY)
-		.withField('description', DataType.STRING)
+		.withField('description', DataType.STRING, true)
 		.withField('amount', DataType.DECIMAL)
+		.withField('quantity', DataType.DECIMAL)
+		.withField('fee', DataType.DECIMAL, true)
+		.withField('reference.position', DataType.STRING, true)
+		.withField('reference.sequence', DataType.NUMBER, true)
+		.withField('snapshot.open', DataType.DECIMAL)
+		.withField('snapshot.buys', DataType.DECIMAL)
+		.withField('snapshot.sells', DataType.DECIMAL)
+		.withField('snapshot.gain', DataType.DECIMAL)
+		.withField('snapshot.basis', DataType.DECIMAL)
+		.withField('snapshot.income', DataType.DECIMAL)
+		.withField('snapshot.value', DataType.DECIMAL)
+		.withField('legacy.system', DataType.STRING, true)
+		.withField('legacy.user', DataType.STRING, true)
+		.withField('legacy.portfolio', DataType.STRING)
+		.withField('legacy.position', DataType.STRING, true)
+		.withField('legacy.transaction', DataType.STRING, true)
+		.withField('trade.price', DataType.DECIMAL, true)
+		.withField('dividend.rate', DataType.DECIMAL, true)
+		.withField('dividend.effective', DataType.DAY, true)
+		.withField('dividend.price', DataType.DECIMAL, true)
+		.withField('dividend.amount', DataType.DECIMAL, true)
+		.withField('dividend.reference', DataType.STRING, true)
+		.withField('split.numerator', DataType.DECIMAL, true)
+		.withField('split.denominator', DataType.DECIMAL, true)
+		.withField('split.effective', DataType.DAY, true)
+		.withField('split.reference', DataType.STRING, true)
+		.withField('charge.amount', DataType.DECIMAL, true)
+		.withField('income.amount', DataType.DECIMAL, true)
+		.withField('valuation.value', DataType.DECIMAL, true)
 		.schema
 	);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Common classes used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",
@@ -9,7 +9,7 @@
   },
   "scripts": {},
   "dependencies": {
-    "@barchart/common-js": "3.2.35"
+    "@barchart/common-js": "~3.2.0"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",