🚧 progress: Start splitting settings#get into sync/async.

infoderm · May 23, 2024 · 1737b43 · 1737b43
1 parent 3e4e4cd
commit 1737b43
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/imports/api/endpoint/settings/reset.tests.ts b/imports/api/endpoint/settings/reset.tests.ts
@@ -15,15 +15,15 @@ server(__filename, () => {
 		const key = 'currency';
 		const value = 123_819_832;
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 
 		await invoke(update, {userId}, [key, value]);
 
-		assert.strictEqual(get(userId, key), value);
+		assert.strictEqual(await get(userId, key), value);
 
 		await invoke(reset, {userId}, [key]);
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 	});
 
 	it('is idempotent', async () => {
@@ -32,23 +32,23 @@ server(__filename, () => {
 		const key = 'x';
 		const value = 123_819_832;
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 
 		await invoke(reset, {userId}, [key]);
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 
 		await invoke(update, {userId}, [key, value]);
 
-		assert.strictEqual(get(userId, key), value);
+		assert.strictEqual(await get(userId, key), value);
 
 		await invoke(reset, {userId}, [key]);
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 
 		await invoke(reset, {userId}, [key]);
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 	});
 
 	it('cannot reset a setting if not logged in', async () => {
@@ -70,13 +70,13 @@ server(__filename, () => {
 		await invoke(update, {userId}, [key, value]);
 		await invoke(update, {userId: `${userId}x`}, [key, valueX]);
 
-		assert.strictEqual(get(userId, key), value);
-		assert.strictEqual(get(`${userId}x`, key), valueX);
+		assert.strictEqual(await get(userId, key), value);
+		assert.strictEqual(await get(`${userId}x`, key), valueX);
 
 		await invoke(reset, {userId}, [key]);
-		assert.strictEqual(get(`${userId}x`, key), valueX);
+		assert.strictEqual(await get(`${userId}x`, key), valueX);
 
 		await invoke(reset, {userId}, [key]);
-		assert.strictEqual(get(`${userId}x`, key), valueX);
+		assert.strictEqual(await get(`${userId}x`, key), valueX);
 	});
 });
diff --git a/imports/api/endpoint/settings/update.tests.ts b/imports/api/endpoint/settings/update.tests.ts
@@ -14,11 +14,11 @@ server(__filename, () => {
 		const key = 'x';
 		const value = 123_819_832;
 
-		assert.strictEqual(get(userId, key), defaults[key]);
+		assert.strictEqual(await get(userId, key), defaults[key]);
 
 		await invoke(update, {userId}, [key, value]);
 
-		assert.strictEqual(get(userId, key), value);
+		assert.strictEqual(await get(userId, key), value);
 	});
 
 	it('can update a setting', async () => {
@@ -30,11 +30,11 @@ server(__filename, () => {
 
 		await invoke(update, {userId}, [key, value]);
 
-		assert.strictEqual(get(userId, key), value);
+		assert.strictEqual(await get(userId, key), value);
 
 		await invoke(update, {userId}, [key, updated]);
 
-		assert.strictEqual(get(userId, key), updated);
+		assert.strictEqual(await get(userId, key), updated);
 	});
 
 	it('cannot set a setting if not logged in', async () => {
@@ -70,6 +70,6 @@ server(__filename, () => {
 
 		await invoke(update, {userId}, [key, value]);
 
-		assert.strictEqual(get(`${userId}x`, key), defaults[key]);
+		assert.strictEqual(await get(`${userId}x`, key), defaults[key]);
 	});
 });
diff --git a/imports/api/settings.ts b/imports/api/settings.ts
@@ -54,11 +54,20 @@ export const defaults: UserSettings = {
 	'displayed-week-days': [...ALL_WEEK_DAYS],
 };
 
-export function get(owner: string, key: string) {
+export function getSync(owner: string, key: string) {
 	const item = findOneSync(Settings, {owner, key});
 	if (item === undefined) {
 		return defaults[key];
 	}
 
 	return item.value;
 }
+
+export async function get(owner: string, key: string) {
+	const item = await Settings.findOneAsync({owner, key});
+	if (item === undefined) {
+		return defaults[key];
+	}
+
+	return item.value;
+}
diff --git a/imports/i18n/datetime.ts b/imports/i18n/datetime.ts
@@ -12,7 +12,7 @@ import intervalToDuration from 'date-fns/intervalToDuration';
 
 import startOfToday from 'date-fns/startOfToday';
 
-import {get as getSetting} from '../api/settings';
+import {getSync as getSetting} from '../api/settings';
 
 import {useSettingCached} from '../ui/settings/hooks';
 import {