change some naming

apps/server/src/classes/data-provider/DataProvider.ts

@@ -11,7 +11,7 @@ import {
   UserFields,
   Alias,
   Settings,
-  GoogleSheet,
+  Sheet,
 } from 'ontime-types';
 
 import { data, db } from '../../modules/loadDb.js';
@@ -59,12 +59,12 @@ export class DataProvider {
     await this.persist();
   }
 
-  static getGoogleSheet() {
-    return data.googleSheet;
+  static getSheet() {
+    return data.sheet;
   }
 
-  static async setGoogleSheet(newData: GoogleSheet) {
-    data.googleSheet = { ...newData };
+  static async setSheet(newData: Sheet) {
+    data.sheet = { ...newData };
     await this.persist();
   }
 

apps/server/src/classes/data-provider/DataProvider.utils.ts

@@ -6,13 +6,13 @@ import { DatabaseModel } from 'ontime-types';
  * @param {object} newData
  */
 export function safeMerge(existing: DatabaseModel, newData: Partial<DatabaseModel>) {
-  const { rundown, project, settings, googleSheet, viewSettings, osc, aliases, userFields } = newData || {};
+  const { rundown, project, settings, sheet, viewSettings, osc, aliases, userFields } = newData || {};
   return {
     ...existing,
     rundown: rundown ?? existing.rundown,
     project: { ...existing.project, ...project },
     settings: { ...existing.settings, ...settings },
-    googleSheet: { ...existing.googleSheet, ...googleSheet },
+    sheet: { ...existing.sheet, ...sheet },
     viewSettings: { ...existing.viewSettings, ...viewSettings },
     aliases: aliases ?? existing.aliases,
     userFields: {

apps/server/src/classes/data-provider/__test__/DataProvider.test.ts

@@ -1,4 +1,4 @@
-import { Alias, DatabaseModel, GoogleSheet, OntimeRundown, Settings } from 'ontime-types';
+import { Alias, DatabaseModel, Sheet, OntimeRundown, Settings } from 'ontime-types';
 import { safeMerge } from '../DataProvider.utils.js';
 
 describe('safeMerge', () => {
@@ -21,7 +21,7 @@ describe('safeMerge', () => {
       timeFormat: '24',
       language: 'en',
     },
-    googleSheet: {
+    sheet: {
       worksheet: '1',
       id: '2',
     },
@@ -102,15 +102,15 @@ describe('safeMerge', () => {
     });
   });
 
-  it('merges the google sheet key', () => {
+  it('merges the sheet key', () => {
     const newData = {
-      googleSheet: {
+      sheet: {
         id: '4',
         worksheet: '5',
-      } as GoogleSheet,
+      } as Sheet,
     };
     const mergedData = safeMerge(existing, newData);
-    expect(mergedData.googleSheet).toEqual({
+    expect(mergedData.sheet).toEqual({
       id: '4',
       worksheet: '5',
     });