@barchart/portfolio-api-common 1.2.68 → 1.2.72

package/lib/formatters/TransactionFormatter.js

@@ -30,13 +30,13 @@ module.exports = (() => {
 		 * @static
 		 * @param {Array.<Object>} transactions
 		 * @param {Array.<Object>} positions
-		 * @param {Boolean=} mutate
+		 * @param {Boolean=} descending
 		 * @returns {Array}
 		 */
-		static format(transactions, positions, mutate) {
+		static format(transactions, positions, descending) {
 			assert.argumentIsArray(transactions, 'transactions');
 			assert.argumentIsArray(positions, 'positions');
-			assert.argumentIsOptional(mutate, 'mutate', Boolean);
+			assert.argumentIsOptional(descending, 'descending', Boolean);
 
 			const instruments = positions.reduce((map, p) => {
 				const instrument = Object.assign({ }, p.instrument || { });
@@ -68,22 +68,20 @@ module.exports = (() => {
 						formatted = Object.assign({}, formatted, formattedTransaction);
 					}
 
-					let transactionToInsert;
-
-					if (mutate) {
-						transaction.formatted = formatted;
-
-						transactionToInsert = transaction;
-					} else {
-						transactionToInsert = formatted;
-					}
-
-					list.push(transactionToInsert);
+					list.push(formatted);
 				}
 
 				return list;
 			}, [ ]);
 
+			let comparator;
+
+			if (is.boolean(descending) && descending) {
+				comparator = comparatorDescending;
+			} else {
+				comparator = comparatorAscending;
+			}
+
 			a.sort(comparator);
 
 			a.forEach((t) => {
@@ -99,9 +97,21 @@ module.exports = (() => {
 		 * @public
 		 * @static
 		 * @param {Array.<Object>} transactions
+		 * @param {Boolean=} descending
 		 * @returns {Array}
 		 */
-		sort(transactions) {
+		sort(transactions, descending) {
+			assert.argumentIsArray(transactions, 'transactions');
+			assert.argumentIsOptional(descending, 'descending', Boolean);
+
+			let comparator;
+
+			if (is.boolean(descending) && descending) {
+				comparator = comparatorDescending;
+			} else {
+				comparator = comparatorAscending;
+			}
+
 			return transactions.sort(comparator);
 		}
 
@@ -277,15 +287,14 @@ module.exports = (() => {
 		}
 	}
 
-	const comparator = ComparatorBuilder.startWith((a, b) => {
-		return Day.compareDays(a.date, b.date);
-	}).thenBy((a, b) => {
-		return comparators.compareNumbers(getInstrumentTypePriority(a.instrument.type), getInstrumentTypePriority(b.instrument.type));
-	}).thenBy((a, b) => {
-		return comparators.compareStrings(a.instrument.id, b.instrument.id);
-	}).thenBy((a, b) => {
-		return comparators.compareNumbers(a.sequence, b.sequence);
-	}).toComparator();
+	const comparatorAscending = ComparatorBuilder.startWith((a, b) => Day.compareDays(a.date, b.date))
+		.thenBy((a, b) => comparators.compareNumbers(getInstrumentTypePriority(a.instrument.type), getInstrumentTypePriority(b.instrument.type)))
+		.thenBy((a, b) => comparators.compareStrings(a.instrument.id, b.instrument.id))
+		.thenBy((a, b) => comparators.compareNumbers(a.sequence, b.sequence))
+		.toComparator();
+
+	const comparatorDescending = ComparatorBuilder.startWith((a, b) => comparatorAscending(b, a))
+		.toComparator();
 
 	return TransactionFormatter;
 })();

package/package.json

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