feat(config): make data structure horizontal

packages/backend/src/controllers/api/v1/admin/config/update.ee.js

@@ -3,19 +3,17 @@ import { renderObject } from '../../../../../helpers/renderer.js';
 import Config from '../../../../../models/config.js';
 
 export default async (request, response) => {
-  const config = configParams(request);
+  const updatedConfig = await Config.update(configParams(request));
 
-  await Config.batchUpdate(config);
-
-  renderObject(response, config);
+  renderObject(response, updatedConfig);
 };
 
 const configParams = (request) => {
   const updatableConfigurationKeys = [
-    'logo.svgData',
-    'palette.primary.dark',
-    'palette.primary.light',
-    'palette.primary.main',
+    'logoSvgData',
+    'palettePrimaryDark',
+    'palettePrimaryLight',
+    'palettePrimaryMain',
     'title',
   ];
 

packages/backend/src/controllers/api/v1/admin/config/update.ee.test.js

@@ -5,7 +5,7 @@ import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createUser } from '../../../../../../test/factories/user.js';
 import { createRole } from '../../../../../../test/factories/role.js';
-import { createBulkConfig } from '../../../../../../test/factories/config.js';
+import { updateConfig } from '../../../../../../test/factories/config.js';
 import * as license from '../../../../../helpers/license.ee.js';
 
 describe('PATCH /api/v1/admin/config', () => {
@@ -30,13 +30,13 @@ describe('PATCH /api/v1/admin/config', () => {
 
     const appConfig = {
       title,
-      'palette.primary.main': palettePrimaryMain,
-      'palette.primary.dark': palettePrimaryDark,
-      'palette.primary.light': palettePrimaryLight,
-      'logo.svgData': logoSvgData,
+      palettePrimaryMain: palettePrimaryMain,
+      palettePrimaryDark: palettePrimaryDark,
+      palettePrimaryLight: palettePrimaryLight,
+      logoSvgData: logoSvgData,
     };
 
-    await createBulkConfig(appConfig);
+    await updateConfig(appConfig);
 
     const newTitle = 'Updated title';
 
@@ -51,7 +51,7 @@ describe('PATCH /api/v1/admin/config', () => {
       .expect(200);
 
     expect(response.body.data.title).toEqual(newTitle);
-    expect(response.body.meta.type).toEqual('Object');
+    expect(response.body.meta.type).toEqual('Config');
   });
 
   it('should return created config for unexisting config', async () => {
@@ -68,7 +68,7 @@ describe('PATCH /api/v1/admin/config', () => {
       .expect(200);
 
     expect(response.body.data.title).toEqual(newTitle);
-    expect(response.body.meta.type).toEqual('Object');
+    expect(response.body.meta.type).toEqual('Config');
   });
 
   it('should return null for deleted config entry', async () => {
@@ -83,6 +83,6 @@ describe('PATCH /api/v1/admin/config', () => {
       .expect(200);
 
     expect(response.body.data.title).toBeNull();
-    expect(response.body.meta.type).toEqual('Object');
+    expect(response.body.meta.type).toEqual('Config');
   });
 });

packages/backend/src/controllers/api/v1/automatisch/config.ee.js

@@ -3,7 +3,7 @@ import Config from '../../../../models/config.js';
 import { renderObject } from '../../../../helpers/renderer.js';
 
 export default async (request, response) => {
-  const defaultConfig = {
+  const staticConfig = {
     disableNotificationsPage: appConfig.disableNotificationsPage,
     disableFavicon: appConfig.disableFavicon,
     additionalDrawerLink: appConfig.additionalDrawerLink,
@@ -11,15 +11,12 @@ export default async (request, response) => {
     additionalDrawerLinkText: appConfig.additionalDrawerLinkText,
   };
 
-  let config = await Config.query().orderBy('key', 'asc');
+  const dynamicConfig = await Config.get();
 
-  config = config.reduce((computedConfig, configEntry) => {
-    const { key, value } = configEntry;
+  const dynamicAndStaticConfig = {
+    ...dynamicConfig,
+    ...staticConfig,
+  };
 
-    computedConfig[key] = value?.data;
-
-    return computedConfig;
-  }, defaultConfig);
-
-  renderObject(response, config);
+  renderObject(response, dynamicAndStaticConfig);
 };

packages/backend/src/controllers/api/v1/automatisch/config.ee.test.js

@@ -1,6 +1,6 @@
 import { vi, expect, describe, it } from 'vitest';
 import request from 'supertest';
-import { createConfig } from '../../../../../test/factories/config.js';
+import { updateConfig } from '../../../../../test/factories/config.js';
 import app from '../../../../app.js';
 import configMock from '../../../../../test/mocks/rest/api/v1/automatisch/config.js';
 import * as license from '../../../../helpers/license.ee.js';
@@ -10,52 +10,35 @@ describe('GET /api/v1/automatisch/config', () => {
   it('should return Automatisch config', async () => {
     vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
 
-    const logoConfig = await createConfig({
-      key: 'logo.svgData',
-      value: { data: '<svg>Sample</svg>' },
-    });
-
-    const primaryDarkConfig = await createConfig({
-      key: 'palette.primary.dark',
-      value: { data: '#001F52' },
-    });
-
-    const primaryLightConfig = await createConfig({
-      key: 'palette.primary.light',
-      value: { data: '#4286FF' },
-    });
-
-    const primaryMainConfig = await createConfig({
-      key: 'palette.primary.main',
-      value: { data: '#0059F7' },
-    });
-
-    const titleConfig = await createConfig({
-      key: 'title',
-      value: { data: 'Sample Title' },
+    const logoConfig = await updateConfig({
+      logoSvgData: '<svg>Sample</svg>',
+      palettePrimaryDark: '#001f52',
+      palettePrimrayLight: '#4286FF',
+      palettePrimaryMain: '#0059F7',
+      title: 'Sample Title',
     });
 
     const response = await request(app)
       .get('/api/v1/automatisch/config')
       .expect(200);
 
-    const expectedPayload = configMock(
-      logoConfig,
-      primaryDarkConfig,
-      primaryLightConfig,
-      primaryMainConfig,
-      titleConfig
-    );
+    const expectedPayload = configMock(logoConfig);
 
     expect(response.body).toEqual(expectedPayload);
   });
 
   it('should return additional environment variables', async () => {
-    vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue(true);
+    vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue(
+      true
+    );
     vi.spyOn(appConfig, 'disableFavicon', 'get').mockReturnValue(true);
     vi.spyOn(appConfig, 'additionalDrawerLink', 'get').mockReturnValue('link');
-    vi.spyOn(appConfig, 'additionalDrawerLinkIcon', 'get').mockReturnValue('icon');
-    vi.spyOn(appConfig, 'additionalDrawerLinkText', 'get').mockReturnValue('text');
+    vi.spyOn(appConfig, 'additionalDrawerLinkIcon', 'get').mockReturnValue(
+      'icon'
+    );
+    vi.spyOn(appConfig, 'additionalDrawerLinkText', 'get').mockReturnValue(
+      'text'
+    );
 
     expect(appConfig.disableNotificationsPage).toEqual(true);
     expect(appConfig.disableFavicon).toEqual(true);

packages/backend/src/controllers/api/v1/installation/users/create-user.test.js

@@ -5,7 +5,7 @@ import Config from '../../../../../models/config.js';
 import User from '../../../../../models/user.js';
 import { createRole } from '../../../../../../test/factories/role';
 import { createUser } from '../../../../../../test/factories/user';
-import { createInstallationCompletedConfig } from '../../../../../../test/factories/config';
+import { markInstallationCompleted } from '../../../../../../test/factories/config';
 
 describe('POST /api/v1/installation/users', () => {
   let adminRole;
@@ -59,7 +59,7 @@ describe('POST /api/v1/installation/users', () => {
 
   describe('for completed installations', () => {
     beforeEach(async () => {
-      await createInstallationCompletedConfig();
+      await markInstallationCompleted();
     });
 
     it('should respond with HTTP 403 when installation completed', async () => {