Fix bug in next timeslot

Author: lprichar

Angular/src/app/home/home.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { TrackDataService } from '../track-data.service';
 import { WatchNowService } from '../watch-now.service';
 
 @Component({
@@ -7,34 +8,22 @@ import { WatchNowService } from '../watch-now.service';
   styleUrls: ['./home.component.scss']
 })
 export class HomeComponent implements OnInit {
-  constructor(private watchNowService: WatchNowService) { }
+  constructor(
+    private watchNowService: WatchNowService, 
+    private trackDataService: TrackDataService
+    ) { }
 
   public hours: Date[] = [];
   public tracks: Track[] = [];
 
   ngOnInit(): void {
-    const trackNames = ['Web', 'Cloud', 'ML', 'Other'];
+    const trackNames = TrackDataService.trackNames;
     this.tracks = trackNames.map(n => <Track>{
       title: n,
       liveUrl: this.watchNowService.getUrlForRoom(n)
     })
 
-    const year = 2021;
-    const month = 10;
-    const day = 16;
-    const hours2 = [ 
-      [9, 0],
-      [9, 30],
-      [10, 30],
-      [11, 30],
-      [13, 0],
-      [14, 0],
-      [15, 0],
-      [16, 0],
-    ]
-    this.hours = hours2.map(h => 
-      new Date(year, month-1, day, h[0], h[1])
-    );
+    this.hours = this.trackDataService.getTimes();
   }
 }
 

Angular/src/app/now-showing/now-showing.component.ts

@@ -6,6 +6,7 @@ import {
   Session,
   SessionizeService,
 } from '../sessionize-service.service';
+import { TrackDataService } from '../track-data.service';
 import { WatchNowService } from '../watch-now.service';
 
 @Component({
@@ -25,7 +26,8 @@ export class NowShowingComponent implements OnInit {
     private route: ActivatedRoute,
     private sessionizeService: SessionizeService,
     private dateConverterService: DateConverterService,
-    private watchNowService: WatchNowService
+    private watchNowService: WatchNowService,
+    private trackDataService: TrackDataService
   ) {}
 
   ngOnInit(): void {
@@ -38,7 +40,8 @@ export class NowShowingComponent implements OnInit {
         this.route.params.subscribe((params) => {
           this.sessionsByRoom = {};
           const dateAsSeconds = parseInt(params.date, 10);
-          this.date = new Date(dateAsSeconds);
+          const dateParam = new Date(dateAsSeconds);
+          this.date = this.getNearestDate(dateParam);
           this.nextDate = this.getNextDate(this.date);
 
           const sessionsAtThisTime = sessionizeApiResult.sessions.filter(
@@ -59,13 +62,13 @@ export class NowShowingComponent implements OnInit {
   }
 
   private getNextDate(date: Date): Date {
-    const nextDate = new Date(date);
-    if (date.getMinutes() === 0) {
-      nextDate.setHours(date.getHours() + 1);
-    } else {
-      nextDate.setMinutes(date.getMinutes() + 30);
-    }
-    return nextDate;
+    return this.trackDataService.getTimes()
+      .filter(t => t > date)[0];
+  }
+
+  private getNearestDate(date: Date): Date {
+    return this.trackDataService.getTimes()
+      .filter(t => t >= date)[0];
   }
 
   public getPlayUrl(room: Room): string {

Angular/src/app/track-data.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TrackDataService } from './track-data.service';
+
+describe('TrackDataService', () => {
+  let service: TrackDataService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(TrackDataService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

Angular/src/app/track-data.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TrackDataService {
+  constructor() { }
+
+  public static readonly year = 2021;
+  public static readonly month = 10;
+  public static readonly day = 16;
+  public static readonly hours = [ 
+    [9, 0],
+    [9, 30],
+    [10, 30],
+    [11, 30],
+    [13, 0],
+    [14, 0],
+    [15, 0],
+    [16, 0],
+  ];
+
+  public static readonly trackNames = ['Web', 'Cloud', 'ML', 'Other'];
+
+  public getTimes(): Date[] {
+    return TrackDataService.hours.map(h => 
+      new Date(TrackDataService.year, TrackDataService.month-1, TrackDataService.day, h[0], h[1])
+    );
+  }
+}