Fixes with implementation from tests

Author: Lan2u

src/dependencies.ts

@@ -42,10 +42,8 @@ export type Dependencies = {
   getCachedSheetData: () => TE.TaskEither<
     FailureWithStatus,
     ReadonlyArray<{
-      cache_entry_id: string;
-      cached_timestamp: Date;
+      cached_at: Date;
       sheet_id: string;
-      equipment_id: string;
       cached_data: t.Validation<
         ReadonlyArray<
           | EventOfType<'EquipmentTrainingQuizResult'>

src/init-dependencies/google/cached-data-table.ts

@@ -4,10 +4,8 @@ import * as tt from 'io-ts-types';
 export const CachedDataTable = t.strict({
   rows: t.readonlyArray(
     t.strict({
-      cache_entry_id: t.string,
-      cached_timestamp: tt.DateFromNumber,
+      cached_at: tt.DateFromNumber,
       sheet_id: t.string,
-      equipment_id: t.string,
       cached_data: t.string,
     })
   ),

src/init-dependencies/google/ensure-cached-sheet-data-table-exists.ts

@@ -8,7 +8,7 @@ export const ensureCachedSheetDataTableExists = (dbClient: Client) =>
       dbClient.execute(`
     CREATE TABLE IF NOT EXISTS cached_sheet_data (
       sheet_id TEXT PRIMARY KEY,
-      cache_timestamp timestamp,
+      cached_at timestamp,
       cached_data TEXT
     );
     `),

src/init-dependencies/google/get-cached-sheet-data.ts

@@ -84,16 +84,16 @@ export const cacheSheetData =
         dbClient
           .execute({
             sql: `
-              INSERT INTO cached_sheet_data (cache_timestamp, sheet_id, cached_data)
-              VALUES ($cacheTimestamp, $sheetId, $cachedData)
+              INSERT INTO cached_sheet_data (cached_at, sheet_id, cached_data)
+              VALUES ($cachedAt, $sheetId, $cachedData)
               ON CONFLICT (sheet_id) DO UPDATE SET
-                cache_timestamp = excluded.cache_timestamp,
+                cached_at = excluded.cached_at,
                 cached_data = excluded.cached_data;
             `,
             args: {
-              cacheTimestamp,
+              cachedAt: cacheTimestamp,
               sheetId,
-              data: JSON.stringify(data),
+              cachedData: JSON.stringify(data),
             },
           })
           .then(() => {}),

src/load-cached-sheet-data.ts

@@ -24,18 +24,16 @@ export const loadCachedSheetData = async (
     events.right.forEach(cachedSheetData => {
       if (E.isLeft(cachedSheetData.cached_data)) {
         logger.info(
-          'Failed to load events for sheet %s, equipment %s generated at %s, skipping...',
+          'Failed to load events for sheet %s cached at %s, skipping...',
           cachedSheetData.sheet_id,
-          cachedSheetData.equipment_id,
-          cachedSheetData.cached_timestamp.toISOString()
+          cachedSheetData.cached_at.toISOString()
         );
       } else {
         logger.info(
-          'Loaded % events for sheet %s, equipment %s generated at %s',
+          'Loaded % events for sheet %s, cached at %s',
           cachedSheetData.cached_data.right.length,
           cachedSheetData.sheet_id,
-          cachedSheetData.equipment_id,
-          cachedSheetData.cached_timestamp.toISOString()
+          cachedSheetData.cached_at.toISOString()
         );
         cachedSheetData.cached_data.right.forEach(updateState);
       }

tests/init-dependencies/happy-path-adapters.helper.ts

@@ -9,7 +9,7 @@ import {initSharedReadModel} from '../../src/read-models/shared-state';
 import * as libsqlClient from '@libsql/client';
 import {localGoogleHelpers} from './pull-local-google';
 
-export const cacheSheetData = (
+const cacheSheetData = (
   _cacheTimestamp: Date,
   _sheetId: string,
   _data: ReadonlyArray<

tests/training-sheets/cached-sheet-data.test.ts

@@ -17,10 +17,8 @@ describe('Cache sheet data', () => {
     const sheetId = 'myTestingSheetId';
     const cacheTimestamp = new Date(2024, 1, 23, 4, 23, 45);
     let cachedData: ReadonlyArray<{
-      cache_entry_id: string;
-      cached_timestamp: Date;
+      cached_at: Date;
       sheet_id: string;
-      equipment_id: string;
       cached_data: t.Validation<
         ReadonlyArray<
           | EventOfType<'EquipmentTrainingQuizResult'>
@@ -49,20 +47,17 @@ describe('Cache sheet data', () => {
           }),
         ])()
       );
-      console.log(await db.execute('SELECT * FROM cached_sheet_data'));
-
       cachedData = getRightOrFail(await getCachedSheetData(db)()());
     });
     it('Each sheet is cached', () => {
       expect(cachedData).toHaveLength(1); // 1 sheet
     });
-    // it('All events cached are returned', () => {
-    //   expect(getRightOrFail(cachedData[0].cached_data)).toHaveLength(2); // 2 events.
-    // });
-    // it('Event cache is correctly labeled', () => {
-    //   expect(cachedData[0].equipment_id).toStrictEqual(equipmentId);
-    //   expect(cachedData[0].sheet_id).toStrictEqual(sheetId);
-    //   expect(cachedData[0].cached_timestamp).toStrictEqual(cacheTimestamp);
-    // });
+    it('All events cached are returned', () => {
+      expect(getRightOrFail(cachedData[0].cached_data)).toHaveLength(2); // 2 events.
+    });
+    it('Event cache is correctly labeled', () => {
+      expect(cachedData[0].sheet_id).toStrictEqual(sheetId);
+      expect(cachedData[0].cached_at).toStrictEqual(cacheTimestamp);
+    });
   });
 });