Split the code out a bit to make it easier to follow

Author: Lan2u

src/dependencies.ts

@@ -9,12 +9,10 @@ import {StatusCodes} from 'http-status-codes';
 import {Resource} from './types/resource';
 import {EventName, EventOfType} from './types/domain-event';
 import {SharedReadModel} from './read-models/shared-state';
+import {LastGoogleSheetRowRead} from './read-models/shared-state/return-types';
 
 export type GoogleSheetId = string;
 
-// Future scans of the sheet should start at this row + 1 if set otherwise scan the entire sheet.
-export type LastGoogleSheetRowRead = O.Option<number>;
-
 export type Dependencies = {
   commitEvent: (
     resource: Resource,

src/google/google.ts

@@ -7,12 +7,17 @@ import * as E from 'fp-ts/Either';
 import {pipe} from 'fp-ts/lib/function';
 import {sheets} from '@googleapis/sheets';
 import {GoogleAuth} from 'google-auth-library';
-import {columnIndexToLetter} from '../../google/extract-metadata';
 import {formatValidationErrors} from 'io-ts-reporters';
 import {DateTime} from 'luxon';
 
 const DEFAULT_TIMEZONE = 'Europe/London';
 
+export type ColumnLetter = string;
+export type ColumnIndex = number; // 0-indexed.
+// Doesn't support beyond 26 columns but actually thats fine for the current data.
+export const columnIndexToLetter = (index: ColumnIndex): ColumnLetter =>
+  'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.charAt(index);
+
 // Not all the google form sheets are actually in Europe/London.
 // Issue first noticed because CI is in a different zone (UTC) than local test machine (BST).
 export const GoogleTimezone = tt.withValidate(t.string, (input, context) =>

src/init-dependencies/google/pull_sheet_data.ts

@@ -2,16 +2,17 @@ import * as RA from 'fp-ts/ReadonlyArray';
 import * as O from 'fp-ts/Option';
 
 import {Logger} from 'pino';
-import {GoogleSpreadsheetDataForSheet} from '../init-dependencies/google/pull_sheet_data';
+import {
+  ColumnIndex,
+  GoogleSpreadsheetDataForSheet,
+} from '../../../init-dependencies/google/pull_sheet_data';
 import {array} from 'fp-ts';
 import {pipe} from 'fp-ts/lib/function';
 
 const EMAIL_COLUMN_NAMES = ['email address', 'email'];
 
 export type GoogleSheetName = string;
 
-type ColumnLetter = string;
-type ColumnIndex = number; // 0-indexed.
 // Requires a subsequent call to get the column names.
 export interface GoogleSheetMetadata {
   name: GoogleSheetName;
@@ -26,9 +27,6 @@ export interface GoogleSheetMetadata {
 }
 
 export const MAX_COLUMN_INDEX = 25;
-// Doesn't support beyond 26 columns but actually thats fine for the current data.
-export const columnIndexToLetter = (index: ColumnIndex): ColumnLetter =>
-  'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.charAt(index);
 
 export const extractGoogleSheetMetadata =
   (logger: Logger) =>

src/google/extract-metadata.ts …event-sources/google/extract-metadata.tssrc/google/extract-metadata.ts renamed to src/read-models/external-event-sources/google/extract-metadata.ts src/google/extract-metadata.ts renamed to src/read-models/external-event-sources/google/extract-metadata.ts

@@ -0,0 +1,47 @@
+import {Logger} from 'pino';
+import * as O from 'fp-ts/Option';
+import {DomainEvent} from '../../../types';
+import {BetterSQLite3Database} from 'drizzle-orm/better-sqlite3';
+
+import {GoogleHelpers} from '../../../init-dependencies/google/pull_sheet_data';
+
+import {Dependencies} from '../../../dependencies';
+
+import {startSpan} from '@sentry/node';
+
+import {asyncApplyTrainingSheetEvents} from './training-sheet';
+import {asyncApplyTroubleTicketEvents} from './trouble-tickets';
+
+export async function asyncApplyGoogleEvents(
+  logger: Logger,
+  currentState: BetterSQLite3Database,
+  googleHelpers: GoogleHelpers,
+  updateState: (event: DomainEvent) => void,
+  googleRefreshIntervalMs: number,
+  troubleTicketSheetId: O.Option<string>,
+  cacheSheetData: Dependencies['cacheSheetData'],
+  cacheTroubleTicketData: Dependencies['cacheTroubleTicketData']
+) {
+  await startSpan(
+    {
+      name: 'Apply Google Events',
+    },
+    async () => {
+      await asyncApplyTroubleTicketEvents(
+        logger,
+        googleHelpers,
+        troubleTicketSheetId,
+        updateState,
+        cacheTroubleTicketData
+      );
+      await asyncApplyTrainingSheetEvents(
+        logger,
+        currentState,
+        googleHelpers,
+        updateState,
+        googleRefreshIntervalMs,
+        cacheSheetData
+      );
+    }
+  );
+}