Add tests for dataService and add filterOptions to exclude start date

Author: 64json

karma.conf.js

@@ -22,10 +22,10 @@ module.exports = function (config) {
       thresholds: {
         emitWarning: false,
         global: {
-          statements: 85,
-          branches: 85,
-          functions: 85,
-          lines: 85,
+          statements: 90,
+          branches: 75,
+          functions: 90,
+          lines: 90,
         },
       },
     },

src/app.component.spec.ts

@@ -14,13 +14,13 @@ describe('AppComponent', () => {
     }).compileComponents();
   }));
 
-  it('should create the app', () => {
+  it('should create the app.', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'Guide-Doge'`, () => {
+  it(`should have as title 'Guide-Doge'.`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
     expect(app.TITLE).toEqual('Guide-Doge');

src/models/data-cube/filters.ts

@@ -1,18 +1,33 @@
-import { Category, Filter, Row } from './types';
+import { Category, Filter, FilterOptions, Row } from './types';
 
 const millisecondsPerDay = 24 * 60 * 60 * 1000;
 
-export function betweenDates(startDate: Date, endDate: Date): Filter {
+const defaultOptions: FilterOptions = {
+  excludeStartDate: false,
+  excludeEndDate: false,
+};
+
+export function betweenDates(startDate: Date, endDate: Date, options: Partial<FilterOptions> = {}): Filter {
+  const { excludeStartDate, excludeEndDate } = {
+    ...defaultOptions,
+    ...options,
+  };
   return (categories: Category[]) => {
     const nThDayIndex = categories.findIndex(
       category => category.name === 'nthDay',
     );
-    const startIndex = Math.round(
+    let startIndex = Math.round(
       (Date.now() - startDate.getTime()) / millisecondsPerDay,
     );
-    const endIndex = Math.round(
+    if (excludeStartDate) {
+      startIndex--;
+    }
+    let endIndex = Math.round(
       (Date.now() - endDate.getTime()) / millisecondsPerDay,
     );
+    if (excludeEndDate) {
+      endIndex++;
+    }
     return (row: Row) =>
       row.header[nThDayIndex] <= startIndex &&
       row.header[nThDayIndex] >= endIndex;

src/models/data-cube/types.ts

@@ -116,3 +116,13 @@ export interface ResultRow {
   categories: Map<string, string | number>;
   values: Map<string, number>;
 }
+
+/**
+ * The options used to filter rows.
+ */
+export interface FilterOptions {
+  /** Exclude start date */
+  excludeStartDate: boolean;
+  /** Exclude end date */
+  excludeEndDate: boolean;
+}

src/models/melody/melody.model.spec.ts

@@ -30,7 +30,7 @@ describe('Melody', () => {
     expect(melody.duration).toBe(noteDuration * values.length);
   });
 
-  it('should have playhead at the very beginning of the sequence', () => {
+  it('should have playhead at the very beginning of the sequence.', () => {
     expect(melody.currentDatumIndex).toBe(0);
   });
 

src/services/data/data.service.spec.ts

@@ -0,0 +1,27 @@
+import { DataService } from './data.service';
+import { mockMeasureName } from '../../utils/mocks.spec';
+import { Duration } from 'luxon';
+
+describe('DataService', () => {
+  let dataService: DataService;
+
+  beforeEach(() => {
+    dataService = new DataService();
+  });
+
+  it('should instantiate.', () => {
+    expect(dataService).toBeInstanceOf(DataService);
+  });
+
+  it('should get data for the given days.', () => {
+    for (const days of [7, 14, 30]) {
+      const data = dataService.getMeasureOverDays(mockMeasureName, days);
+      expect(data.length).toBe(days);
+      const firstDate = data[0].date;
+      const lastDate = data[data.length - 1].date;
+      const actualDifference = lastDate.getTime() - firstDate.getTime();
+      const expectedDifference = Duration.fromObject({ days: days - 1 }).as('milliseconds');
+      expect(actualDifference).toBe(expectedDifference);
+    }
+  });
+});

src/services/data/data.service.ts

@@ -9,6 +9,7 @@ import {
 } from '../../models/data-cube/presets';
 import { betweenDates } from '../../models/data-cube/filters';
 import { generateCube } from 'src/models/data-cube/generation';
+import { Datum } from '../../d3/xy-chart.d3';
 
 export class DataService {
   private dataCube = generateCube(
@@ -24,7 +25,7 @@ export class DataService {
     },
   );
 
-  getMeasureOverDays(measureName: string, days = 30) {
+  getMeasureOverDays(measureName: string, days = 30): Datum[] {
     const categoryName = 'nthDay';
     const endDate = DateTime.local();
     const startDate = endDate.minus({ day: days });
@@ -33,7 +34,7 @@ export class DataService {
       .getDataFor(
         [categoryName],
         [measureName],
-        [betweenDates(startDate.toJSDate(), endDate.toJSDate())],
+        [betweenDates(startDate.toJSDate(), endDate.toJSDate(), { excludeStartDate: true })],
       )
       .map(row => ({
         date: startDate

src/utils/mocks.spec.ts

@@ -0,0 +1,23 @@
+import { AudificationPreference, Preference } from '../services/preference/types';
+import { Datum } from '../d3/xy-chart.d3';
+import { activeUserMeasure } from '../models/data-cube/presets';
+
+export const mockPreference: Preference = {
+  enabled: false,
+};
+
+export const mockAudificationPreference: AudificationPreference = {
+  ...mockPreference,
+  highestPitch: 0,
+  lowestPitch: 0,
+  noteDuration: 0,
+  readAfter: false,
+  readBefore: false,
+};
+
+export const mockDatum: Datum = {
+  date: new Date(),
+  value: 0,
+};
+
+export const mockMeasureName = activeUserMeasure.name;