@barchart/portfolio-api-common 1.0.225 → 1.0.229

package/lib/api/failures/PortfolioFailureType.js

@@ -90,7 +90,7 @@ module.exports = (() => {
 	const transactionCreateFailedOutOfSequence = new FailureType('TRANSACTION_CREATE_FAILED_OUT_OF_SEQUENCE', 'Unable to process transaction, because the transaction date is out-of-sequence. In other words, it would occur before an existing transaction. Please confirm your intent to re-write transaction history (which could take some time and alter the historical results for this position).');
 	const transactionCreateFailedTypeInvalidForInstrument = new FailureType('TRANSACTION_CREATE_FAILED_TYPE_INVALID_FOR_INSTRUMENT', 'Unable to process transaction, {L|transactionType.description} transactions cannot be used with {L|instrumentType.description} positions.');
 	const transactionCreateFailedTypeInvalidForDirection = new FailureType('TRANSACTION_CREATE_FAILED_TYPE_INVALID_FOR_DIRECTION', 'Unable to process transaction, a {L|positionDirection.description} position would be created (i.e. you would have {L|positionDirection.sign} shares/units). {u|instrumentType.description} positions cannot have {L|positionDirection.description} positions.');
-	const transactionCreateFailedInvalidDirectionSwitch = new FailureType('TRANSACTION_CREATE_FAILED_INVALID_DIRECTION_SWITCH', 'Unable to process transaction, the transaction would switch the position from {L|previousDirection.description} to {L|proposedDirection.description} (i.e. {L|previousDirection.sign} to {L|proposedDirection.sign} shares/units). This is not allowed. Please close the current position (i.e. zero it out) and then enter a second transaction.');
+	const transactionCreateFailedInvalidDirectionSwitch = new FailureType('TRANSACTION_CREATE_FAILED_INVALID_DIRECTION_SWITCH', 'Unable to process transaction, the transaction would switch the position from {L|currentDirection.description} to {L|proposedDirection.description} (i.e. {L|currentDirection.sign} to {L|proposedDirection.sign} shares/units). This is not allowed. Please close the current position (i.e. zero it out) and then enter a second transaction.');
 
 	const transactionDeleteFailedOutOfSequence = new FailureType('TRANSACTION_DELETE_FAILED_OUT_OF_SEQUENCE', 'Deleting any transaction, except for the most recent, will cause transaction history to be re-written. Please confirm your intent to re-write transaction history (which could take some time and alter the historical results for this position).');
 	const transactionDeleteUnsupported = new FailureType('TRANSACTION_DELETE_UNSUPPORTED', 'Unable to delete transaction. This operation is not currently supported (but will be implemented soon).');

package/lib/data/TransactionValidator.js

@@ -91,7 +91,7 @@ module.exports = (() => {
 		 * @return {Boolean}
 		 */
 		static validateDirectionSwitch(instrumentType, currentDirection, proposedDirection) {
-			return currentDirection === null || instrumentType.canSwitchDirection || (!currentDirection.closed && !proposedDirection.closed && currentDirection.positive !== proposedDirection.positive);
+			return currentDirection === null || instrumentType.canSwitchDirection || (currentDirection.closed || proposedDirection.closed || currentDirection.positive === proposedDirection.positive);
 		}
 
 		toString() {
@@ -132,7 +132,7 @@ module.exports = (() => {
 	associateTypes(InstrumentType.OTHER, TransactionType.SELL, true, [ PositionDirection.LONG ]);
 	associateTypes(InstrumentType.OTHER, TransactionType.INCOME, true, [ PositionDirection.LONG ]);
 	associateTypes(InstrumentType.OTHER, TransactionType.FEE, true, [ PositionDirection.LONG ]);
-	associateTypes(InstrumentType.OTHER, TransactionType.VALUATION, true);
+	associateTypes(InstrumentType.OTHER, TransactionType.VALUATION, true, [ PositionDirection.LONG ]);
 
 	associateTypes(InstrumentType.CASH, TransactionType.DEPOSIT, true);
 	associateTypes(InstrumentType.CASH, TransactionType.WITHDRAWAL, true);
@@ -152,19 +152,19 @@ module.exports = (() => {
 		validDirections[instrumentTypeCode].push(positionDirection);
 	}
 
-	associateTypes(InstrumentType.EQUITY, PositionDirection.EVEN);
-	associateTypes(InstrumentType.EQUITY, PositionDirection.LONG);
-	associateTypes(InstrumentType.EQUITY, PositionDirection.SHORT);
+	associateDirections(InstrumentType.EQUITY, PositionDirection.EVEN);
+	associateDirections(InstrumentType.EQUITY, PositionDirection.LONG);
+	associateDirections(InstrumentType.EQUITY, PositionDirection.SHORT);
 
-	associateTypes(InstrumentType.FUND, PositionDirection.EVEN);
-	associateTypes(InstrumentType.FUND, PositionDirection.LONG);
+	associateDirections(InstrumentType.FUND, PositionDirection.EVEN);
+	associateDirections(InstrumentType.FUND, PositionDirection.LONG);
 
-	associateTypes(InstrumentType.OTHER, PositionDirection.EVEN);
-	associateTypes(InstrumentType.OTHER, PositionDirection.LONG);
+	associateDirections(InstrumentType.OTHER, PositionDirection.EVEN);
+	associateDirections(InstrumentType.OTHER, PositionDirection.LONG);
 
-	associateTypes(InstrumentType.CASH, PositionDirection.EVEN);
-	associateTypes(InstrumentType.CASH, PositionDirection.LONG);
-	associateTypes(InstrumentType.CASH, PositionDirection.SHORT);
+	associateDirections(InstrumentType.CASH, PositionDirection.EVEN);
+	associateDirections(InstrumentType.CASH, PositionDirection.LONG);
+	associateDirections(InstrumentType.CASH, PositionDirection.SHORT);
 
 	return TransactionValidator;
 })();

package/package.json

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