fix(core): Persist customFields in updateGlobalSettings mutation (vendurehq#4343)

Author: Ryrahul

packages/core/e2e/custom-field-relations.e2e-spec.ts

@@ -710,6 +710,44 @@ describe('Custom field relations', () => {
                 `);
                 assertCustomFieldIds(updateGlobalSettings.customFields, 'T_2', ['T_3', 'T_4']);
             });
+
+            it('updating scalar custom fields persists alongside relational ones', async () => {
+                await adminClient.query(gql`
+                    mutation {
+                        updateGlobalSettings(
+                            input: {
+                                customFields: {
+                                    primitive: "updated_value"
+                                    singleId: "T_2"
+                                    multiIds: ["T_3", "T_4"]
+                                }
+                            }
+                        ) {
+                            ... on GlobalSettings {
+                                id
+                            }
+                        }
+                    }
+                `);
+
+                const { updateGlobalSettings } = await adminClient.query(gql`
+                    mutation {
+                        updateGlobalSettings(
+                            input: {
+                                customFields: { singleId: "T_3" }
+                            }
+                        ) {
+                            ... on GlobalSettings {
+                                id
+                                ${customFieldsSelection}
+                            }
+                        }
+                    }
+                `);
+
+                expect(updateGlobalSettings.customFields.single).toEqual({ id: 'T_3' });
+                expect(updateGlobalSettings.customFields.primitive).toBe('updated_value');
+            });
         });
 
         describe('Order entity', () => {

packages/core/src/service/services/global-settings.service.ts

@@ -76,9 +76,10 @@ export class GlobalSettingsService {
 
     async updateSettings(ctx: RequestContext, input: UpdateGlobalSettingsInput): Promise<GlobalSettings> {
         const settings = await this.getSettings(ctx);
-        await this.eventBus.publish(new GlobalSettingsEvent(ctx, settings, input));
         patchEntity(settings, input);
+        await this.eventBus.publish(new GlobalSettingsEvent(ctx, settings, input));
+        await this.connection.getRepository(ctx, GlobalSettings).save(settings);
         await this.customFieldRelationService.updateRelations(ctx, GlobalSettings, input, settings);
-        return this.connection.getRepository(ctx, GlobalSettings).save(settings);
+        return settings;
     }
 }