@barchart/portfolio-api-common 1.2.126 → 1.2.130

package/lib/data/PositionSummaryFrame.js

@@ -244,6 +244,8 @@ module.exports = (() => {
 		const ranges = [ ];
 
 		if (transactions.length !== 0) {
+			const today = Day.getToday();
+
 			const first = array.first(transactions);
 			const last = array.last(transactions);
 
@@ -254,7 +256,11 @@ module.exports = (() => {
 			if (last.snapshot.open.getIsZero()) {
 				lastDate = last.date;
 			} else {
-				lastDate = Day.getToday();
+				lastDate = today;
+			}
+
+			if (today.month === lastDate.month && today.year === lastDate.year) {
+				lastDate = lastDate.subtractMonths(1);
 			}
 
 			lastDate = lastDate.getEndOfMonth();

package/lib/data/TransactionType.js

@@ -22,6 +22,7 @@ module.exports = (() => {
 	 * @param {Boolean} corporateAction
 	 * @param {Boolean} initial
 	 * @param {Boolean} significant
+	 * @param {Boolean} system
  	 */
 	class TransactionType extends Enum {
 		constructor(code, description, display, sequence, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {

package/package.json

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

package/test/SpecRunner.js

@@ -635,6 +635,8 @@ module.exports = (() => {
 		const ranges = [ ];
 
 		if (transactions.length !== 0) {
+			const today = Day.getToday();
+
 			const first = array.first(transactions);
 			const last = array.last(transactions);
 
@@ -645,7 +647,11 @@ module.exports = (() => {
 			if (last.snapshot.open.getIsZero()) {
 				lastDate = last.date;
 			} else {
-				lastDate = Day.getToday();
+				lastDate = today;
+			}
+
+			if (today.month === lastDate.month && today.year === lastDate.year) {
+				lastDate = lastDate.subtractMonths(1);
 			}
 
 			lastDate = lastDate.getEndOfMonth();
@@ -757,6 +763,7 @@ module.exports = (() => {
 	 * @param {Boolean} corporateAction
 	 * @param {Boolean} initial
 	 * @param {Boolean} significant
+	 * @param {Boolean} system
  	 */
 	class TransactionType extends Enum {
 		constructor(code, description, display, sequence, purchase, sale, income, opening, closing, fee, corporateAction, initial, significant) {
@@ -17911,13 +17918,35 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 		});
 	});
 
+	describe('and yearly position summary ranges are processed for a transaction set that opens in the current year', () => {
+		let ranges;
+
+		beforeEach(() => {
+			const transactions = [
+				{
+					date: Day.getToday(),
+					snapshot: {
+						open: new Decimal(1)
+					},
+					type: TransactionType.BUY
+				}
+			];
+
+			ranges = PositionSummaryFrame.YEARLY.getRanges(transactions);
+		});
+
+		it('should have zero ranges', () => {
+			expect(ranges.length).toEqual(0);
+		});
+	});
+
 	describe('and monthly position summary ranges are processed for a transaction set that does not close', () => {
 		let ranges;
 
 		beforeEach(() => {
 			const transactions = [
 				{
-					date: new Day(2019, 1, 20),
+					date: new Day(2018, 12, 20),
 					snapshot: {
 						open: new Decimal(1)
 					},
@@ -17939,16 +17968,16 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 			expect(ranges.length > 1).toEqual(true);
 		});
 
-		it('the first range should be from 12-31-2018 to 01-31-2019', () => {
-			expect(ranges[0].start.format()).toEqual('2018-12-31');
-			expect(ranges[0].end.format()).toEqual('2019-01-31');
+		it('the first range should be from 11-30-2018 to 12-31-2018', () => {
+			expect(ranges[0].start.format()).toEqual('2018-11-30');
+			expect(ranges[0].end.format()).toEqual('2018-12-31');
 		});
 
-		it('the last range should be for the current month', () => {
+		it('the last range should be for the previous month', () => {
 			const today = Day.getToday();
 
-			expect(ranges[ranges.length - 1].start.format()).toEqual(today.getEndOfMonth().subtractMonths(1).getEndOfMonth().format());
-			expect(ranges[ranges.length - 1].end.format()).toEqual(today.getEndOfMonth().format());
+			expect(ranges[ranges.length - 1].start.format()).toEqual(today.subtractMonths(2).getEndOfMonth().format());
+			expect(ranges[ranges.length - 1].end.format()).toEqual(today.subtractMonths(1).getEndOfMonth().format());
 		});
 	});
 
@@ -18025,6 +18054,28 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 		});
 	});
 
+	describe('and monthly position summary ranges are processed for a transaction set that opens in the current month', () => {
+		let ranges;
+
+		beforeEach(() => {
+			const transactions = [
+				{
+					date: Day.getToday(),
+					snapshot: {
+						open: new Decimal(1)
+					},
+					type: TransactionType.BUY
+				}
+			];
+
+			ranges = PositionSummaryFrame.MONTHLY.getRanges(transactions);
+		});
+
+		it('should have zero ranges', () => {
+			expect(ranges.length).toEqual(0);
+		});
+	});
+
 	describe('and a year-to-date position summary ranges are processed for a transaction set that closed in 2017', () => {
 		let ranges;
 
@@ -18545,12 +18596,10 @@ describe('When a position container data is gathered', () => {
 });
 
 },{"./../../../lib/data/InstrumentType":1,"./../../../lib/data/PositionSummaryFrame":3,"./../../../lib/processing/PositionContainer":6,"./../../../lib/processing/definitions/PositionLevelDefinition":9,"./../../../lib/processing/definitions/PositionLevelType":10,"./../../../lib/processing/definitions/PositionTreeDefinition":11,"@barchart/common-js/lang/Currency":20,"@barchart/common-js/lang/Decimal":22}],55:[function(require,module,exports){
-const Currency = require('@barchart/common-js/lang/Currency'),
-	Day = require('@barchart/common-js/lang/Day'),
+const Day = require('@barchart/common-js/lang/Day'),
 	Decimal = require('@barchart/common-js/lang/Decimal');
 
-const InstrumentType = require('./../../../lib/data/InstrumentType'),
-	TransactionType = require('./../../../lib/data/TransactionType');
+const TransactionType = require('./../../../lib/data/TransactionType');
 
 const TransactionSchema = require('./../../../lib/serialization/TransactionSchema');
 
@@ -18613,4 +18662,4 @@ describe('When transactions are serialized', () => {
 	});
 });
 
-},{"./../../../lib/data/InstrumentType":1,"./../../../lib/data/TransactionType":4,"./../../../lib/serialization/TransactionSchema":12,"@barchart/common-js/lang/Currency":20,"@barchart/common-js/lang/Day":21,"@barchart/common-js/lang/Decimal":22}]},{},[52,53,54,55]);
+},{"./../../../lib/data/TransactionType":4,"./../../../lib/serialization/TransactionSchema":12,"@barchart/common-js/lang/Day":21,"@barchart/common-js/lang/Decimal":22}]},{},[52,53,54,55]);

package/test/specs/data/PositionSummaryFrameSpec.js

@@ -226,13 +226,35 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 		});
 	});
 
+	describe('and yearly position summary ranges are processed for a transaction set that opens in the current year', () => {
+		let ranges;
+
+		beforeEach(() => {
+			const transactions = [
+				{
+					date: Day.getToday(),
+					snapshot: {
+						open: new Decimal(1)
+					},
+					type: TransactionType.BUY
+				}
+			];
+
+			ranges = PositionSummaryFrame.YEARLY.getRanges(transactions);
+		});
+
+		it('should have zero ranges', () => {
+			expect(ranges.length).toEqual(0);
+		});
+	});
+
 	describe('and monthly position summary ranges are processed for a transaction set that does not close', () => {
 		let ranges;
 
 		beforeEach(() => {
 			const transactions = [
 				{
-					date: new Day(2019, 1, 20),
+					date: new Day(2018, 12, 20),
 					snapshot: {
 						open: new Decimal(1)
 					},
@@ -254,16 +276,16 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 			expect(ranges.length > 1).toEqual(true);
 		});
 
-		it('the first range should be from 12-31-2018 to 01-31-2019', () => {
-			expect(ranges[0].start.format()).toEqual('2018-12-31');
-			expect(ranges[0].end.format()).toEqual('2019-01-31');
+		it('the first range should be from 11-30-2018 to 12-31-2018', () => {
+			expect(ranges[0].start.format()).toEqual('2018-11-30');
+			expect(ranges[0].end.format()).toEqual('2018-12-31');
 		});
 
-		it('the last range should be for the current month', () => {
+		it('the last range should be for the previous month', () => {
 			const today = Day.getToday();
 
-			expect(ranges[ranges.length - 1].start.format()).toEqual(today.getEndOfMonth().subtractMonths(1).getEndOfMonth().format());
-			expect(ranges[ranges.length - 1].end.format()).toEqual(today.getEndOfMonth().format());
+			expect(ranges[ranges.length - 1].start.format()).toEqual(today.subtractMonths(2).getEndOfMonth().format());
+			expect(ranges[ranges.length - 1].end.format()).toEqual(today.subtractMonths(1).getEndOfMonth().format());
 		});
 	});
 
@@ -340,6 +362,28 @@ describe('After the PositionSummaryFrame enumeration is initialized', () => {
 		});
 	});
 
+	describe('and monthly position summary ranges are processed for a transaction set that opens in the current month', () => {
+		let ranges;
+
+		beforeEach(() => {
+			const transactions = [
+				{
+					date: Day.getToday(),
+					snapshot: {
+						open: new Decimal(1)
+					},
+					type: TransactionType.BUY
+				}
+			];
+
+			ranges = PositionSummaryFrame.MONTHLY.getRanges(transactions);
+		});
+
+		it('should have zero ranges', () => {
+			expect(ranges.length).toEqual(0);
+		});
+	});
+
 	describe('and a year-to-date position summary ranges are processed for a transaction set that closed in 2017', () => {
 		let ranges;
 

package/test/specs/serialization/TransactionSchemaSpec.js

@@ -1,9 +1,7 @@
-const Currency = require('@barchart/common-js/lang/Currency'),
-	Day = require('@barchart/common-js/lang/Day'),
+const Day = require('@barchart/common-js/lang/Day'),
 	Decimal = require('@barchart/common-js/lang/Decimal');
 
-const InstrumentType = require('./../../../lib/data/InstrumentType'),
-	TransactionType = require('./../../../lib/data/TransactionType');
+const TransactionType = require('./../../../lib/data/TransactionType');
 
 const TransactionSchema = require('./../../../lib/serialization/TransactionSchema');