@tailgatefantasysports/seasonservice 0.4.4 → 0.4.8

package/SeasonService.js

@@ -54,16 +54,35 @@ module.exports = class SeasonService {
 
     /**
      * Gets the next (or current if in a season) season for `date` up to a year ahead
-     * @param {object} date js date to get next season for
+     * @param {object} date - js date to get next season for
+     * @returns {object}
      */
     getNextSeason(date) {
-        let ceiling = DateTime.fromJSDate(date).plus({ year: 1 }),
+        return this._getSeasonDirection(date, 1);
+    }
+
+    /**
+     * Gets the previous season (or current if in a season) for date, up to a year behind
+     * @param {object} date - js date to get previous season for
+     * @returns {object}
+     */
+    getPreviousSeason(date) {
+        return this._getSeasonDirection(date, -1);
+    }
+
+    /**
+     * Walks to a nearby season from date in direction
+     * @param {number} direction - direction to get season (1 for next, -1 for previous)
+     * @returns {object}
+     */
+    _getSeasonDirection(date, direction) {
+        let ceiling = DateTime.fromJSDate(date).plus({ year: 1 * direction }),
             check = DateTime.fromJSDate(date),
             season = this.getSeason(date);
 
-        while(!season && ceiling > check) {
+        while(!season && (direction > 0 ? ceiling > check : ceiling < check)) {
             season = this.getSeason(check.toJSDate());
-            check = check.plus({ week: 1 });
+            check = check.plus({ week: 1 * direction });
         }
 
         return season;

package/__tests__/SeasonService.test.js

@@ -60,35 +60,31 @@ describe('Get Week', () => {
     })
 });
 
-describe('Get Next Season', () => {
-    test('Next Season Exists', () => {
-        // setup
-        // execute
-        let season = this.service.getNextSeason(new Date('2020-12-30'));
-
-        // assert
-        expect(season.season).toBe('1');
-        expect(season.type).toBe(0);
-        expect(season.start).toStrictEqual(new Date('2021-01-01'));
-        expect(season.end).toStrictEqual(new Date('2021-02-01'));
-    });
-
-    test('Middle of Season', () => {
+describe('Get Next/Previous Season', () => {
+    test.each([
+        ['Next Season: Exists', 'getNextSeason', new Date('2020-12-30'), '1', 0, new Date('2021-01-01'), new Date('2021-02-01')],
+        ['Next Season: Middle of Season', 'getNextSeason', new Date('2021-01-10'), '1', 0, new Date('2021-01-01'), new Date('2021-02-01')],
+        ['Previous Season: Exists', 'getPreviousSeason', new Date('2022-01-10'), '2', 1, new Date('2021-03-01'), new Date('2021-04-01')],
+        ['Previous Season: Middle of Season', 'getPreviousSeason', new Date('2021-01-10'), '1', 0, new Date('2021-01-01'), new Date('2021-02-01')]
+    ])('%s', (_tName, fn, inp, seasonStr, type, start, end) => {
         // setup
         // execute
-        let season = this.service.getNextSeason(new Date('2021-01-10'))
+        let season = this.service[fn](inp);
 
         // assert
-        expect(season.season).toBe('1');
-        expect(season.type).toBe(0);
-        expect(season.start).toStrictEqual(new Date('2021-01-01'));
-        expect(season.end).toStrictEqual(new Date('2021-02-01'));
+        expect(season.season).toBe(seasonStr);
+        expect(season.type).toBe(type);
+        expect(season.start).toStrictEqual(start);
+        expect(season.end).toStrictEqual(end);
     });
 
-    test('Nonexistent Next Season', () => {
+    test.each([
+        ['Next Season: Undefined', 'getNextSeason', new Date('2019-12-30')],
+        ['Previous Season: Undefined', 'getPreviousSeason', new Date('2022-04-02')]
+    ])('%s', (_tName, fn, inp) => {
         // setup
         // execute
-        let season = this.service.getNextSeason(new Date('2021-06-01'));
+        let season = this.service[fn](inp);
 
         // assert
         expect(season).toBeUndefined();

package/__tests__/index.test.js

@@ -5,9 +5,9 @@ describe('Service', () => {
         test.each([
             ['2020 Regular', new Date('2020-10-11T00:00:00Z'), '2020', 1, new Date('2020-09-10T00:00:00Z'), new Date('2021-01-07T00:00:00Z')],
             ['2020 Post', new Date('2021-01-20T00:00:00Z'), '2020', 2, new Date('2021-01-07T00:00:00Z'), new Date('2021-02-07T00:00:00Z')],
-            ['2021 Beta', new Date('2021-06-20T00:00:00Z'), 'BETA', 'beta', new Date('2021-06-16T00:00:00Z'), new Date('2021-09-01T00:00:00Z')],
-            ['2021 Regular', new Date('2021-09-10T00:00:00Z'), '2021', 1, new Date('2021-09-09T00:00:00Z'), new Date('2022-01-10T00:00:00Z')],
-            ['2021 Post', new Date('2022-01-20T00:00:00Z'), '2021', 2, new Date('2022-01-15T00:00:00Z'), new Date('2022-02-14T00:00:00Z')]
+            ['2021 Beta', new Date('2021-06-20T00:00:00Z'), 'BETA', 'beta', new Date('2021-06-16T00:00:00Z'), new Date('2021-08-05T00:00:00Z')],
+            ['2021 Regular', new Date('2021-09-10T00:00:00Z'), '2021', 1, new Date('2021-09-08T00:00:00Z'), new Date('2022-01-12T00:00:00Z')],
+            ['2021 Post', new Date('2022-01-20T00:00:00Z'), '2021', 2, new Date('2022-01-12T00:00:00Z'), new Date('2022-02-15T00:00:00Z')]
         ])('%s', (_tName, date, season, type, start, end) => {
             let frame = SeasonService.getSeason(date);
                 expect(frame.season).toBe(season);

package/app.config.js

@@ -20,7 +20,7 @@ module.exports = {
         },
         2021: {
             [types.preseason]: {
-                start: new Date('2021-08-11T00:00:00Z'),
+                start: new Date('2021-08-04T00:00:00Z'),
                 end: new Date('2021-09-01T00:00:00Z')
             },
             [types.regular]: {
@@ -31,6 +31,20 @@ module.exports = {
                 start: new Date('2022-01-12T00:00:00Z'),
                 end: new Date('2022-02-15T00:00:00Z'),
             }
+        },
+        2022: {
+            [types.preseason]: {
+                start: new Date('2022-08-03T00:00:00Z'),
+                end: new Date('2022-08-31T00:00:00Z')
+            },
+            [types.regular]: {
+                start: new Date('2022-09-07T00:00:00Z'),
+                end: new Date('2023-01-11T00:00:00Z'),
+            },
+            [types.postseason]: {
+                start: new Date('2023-01-11T00:00:00Z'),
+                end: new Date('2023-02-15T00:00:00Z'),
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailgatefantasysports/seasonservice",
-  "version": "0.4.4",
+  "version": "0.4.8",
   "description": "Generic Season Service",
   "main": "index.js",
   "scripts": {