refactor: initialise data

apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts

@@ -27,6 +27,19 @@ import {
   customFieldChangelog,
 } from '../rundownCache.js';
 
+beforeAll(() => {
+  vi.mock('../../../classes/data-provider/DataProvider.js', () => {
+    return {
+      getDataProvider: vi.fn().mockImplementation(() => {
+        return {
+          setCustomFields: vi.fn().mockImplementation((newData) => newData),
+          setRundown: vi.fn().mockImplementation((newData) => newData),
+        };
+      }),
+    };
+  });
+});
+
 describe('generate()', () => {
   it('creates normalised versions of a given rundown', () => {
     const testRundown: OntimeRundown = [
@@ -849,23 +862,6 @@ describe('calculateRuntimeDelaysFrom()', () => {
 
 describe('custom fields', () => {
   describe('createCustomField()', () => {
-    beforeEach(() => {
-      vi.mock('../../classes/data-provider/DataProvider.js', () => {
-        return {
-          DataProvider: {
-            ...vi.fn().mockImplementation(() => {
-              return {};
-            }),
-            getCustomFields: vi.fn().mockReturnValue({}),
-            setCustomFields: vi.fn().mockImplementation((newData) => {
-              return newData;
-            }),
-            persist: vi.fn().mockReturnValue({}),
-          },
-        };
-      });
-    });
-
     it('creates a field from given parameters', async () => {
       const expected = {
         lighting: {

apps/server/src/services/rundown-service/rundownCache.ts

@@ -11,7 +11,7 @@ import {
 } from 'ontime-types';
 import { generateId, insertAtIndex, reorderArray, swapEventData, checkIsNextDay } from 'ontime-utils';
 
-import { DataProvider } from '../../classes/data-provider/DataProvider.js';
+import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 import { createPatch } from '../../utils/parser.js';
 import { getTotalDuration } from '../timerUtils.js';
 import { apply } from './delayUtils.js';
@@ -59,8 +59,8 @@ export async function init(initialRundown: Readonly<OntimeRundown>, customFields
   persistedRundown = structuredClone(initialRundown) as OntimeRundown;
   persistedCustomFields = structuredClone(customFields);
   generate();
-  await DataProvider.setRundown(persistedRundown);
-  await DataProvider.setCustomFields(customFields);
+  await getDataProvider().setRundown(persistedRundown);
+  await getDataProvider().setCustomFields(customFields);
 }
 
 /**
@@ -248,8 +248,8 @@ export function mutateCache<T extends object>(mutation: MutatingFn<T>) {
     });
 
     // defer writing to the database
-    setImmediate(() => {
-      DataProvider.setRundown(persistedRundown);
+    setImmediate(async () => {
+      await getDataProvider().setRundown(persistedRundown);
     });
 
     return { newEvent, newRundown, didMutate };
@@ -413,9 +413,9 @@ function invalidateIfUsed(label: CustomFieldLabel) {
   }
   // ... and schedule a cache update
   // schedule a non priority cache update
-  setImmediate(() => {
+  setImmediate(async () => {
     generate();
-    DataProvider.setRundown(persistedRundown);
+    await getDataProvider().setRundown(persistedRundown);
   });
 }
 
@@ -424,8 +424,8 @@ function invalidateIfUsed(label: CustomFieldLabel) {
  * @param persistedCustomFields
  */
 function scheduleCustomFieldPersist(persistedCustomFields: CustomFields) {
-  setImmediate(() => {
-    DataProvider.setCustomFields(persistedCustomFields);
+  setImmediate(async () => {
+    await getDataProvider().setCustomFields(persistedCustomFields);
   });
 }