update timed loader to use class composition

src/loaders/TimedApiBasedRepositoryLoader.ts

@@ -1,5 +1,4 @@
-import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { ApiBasedShuttleRepositoryLoader } from "./ApiBasedShuttleRepositoryLoader";
+import { RepositoryLoader } from "./RepositoryLoader";
 
 // Ideas to break this into smaller pieces in the future:
 // Have one repository data loader running for each supported system
@@ -15,18 +14,15 @@ import { ApiBasedShuttleRepositoryLoader } from "./ApiBasedShuttleRepositoryLoad
 // - OrderedStops: reload every few minutes
 // - Systems: reload once a day
 
-export class TimedApiBasedShuttleRepositoryLoader extends ApiBasedShuttleRepositoryLoader {
+export class TimedApiBasedRepositoryLoader {
   private shouldBeRunning: boolean = false;
   private timer: any;
 
   readonly timeout = 10000;
 
   constructor(
-    public passioSystemId: string,
-    public systemIdForConstructedData: string,
-    repository: ShuttleGetterSetterRepository,
+    public loader: RepositoryLoader,
   ) {
-    super(passioSystemId, systemIdForConstructedData, repository);
     this.startFetchDataAndUpdate = this.startFetchDataAndUpdate.bind(this);
   }
 
@@ -48,14 +44,7 @@ export class TimedApiBasedShuttleRepositoryLoader extends ApiBasedShuttleReposit
     if (!this.shouldBeRunning) return;
 
     try {
-      await this.fetchAndUpdateRouteDataForSystem();
-      await this.fetchAndUpdateStopAndPolylineDataForRoutesInSystem();
-      await this.fetchAndUpdateShuttleDataForSystem();
-
-      // Because ETA method doesn't support pruning yet,
-      // add a call to the clear method here
-      await this.repository.clearEtaData();
-      await this.fetchAndUpdateEtaDataForExistingStopsForSystem();
+      await this.loader.fetchAndUpdateAll();
     } catch (e) {
       console.error(e);
     }