fix rule snooze/unsnooze change history logging

Author: maximpn

x-pack/platform/plugins/shared/alerting/server/application/rule/methods/snooze/snooze_rule.test.ts

@@ -58,6 +58,15 @@ const context = {
 } as unknown as RulesClientContext;
 
 describe('validate snooze params and body', () => {
+  beforeEach(() => {
+    savedObjectsMock.update = jest.fn().mockResolvedValue({
+      id: '123',
+      type: 'alert',
+      attributes: { snoozeSchedule: [] },
+      references: [],
+    });
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -232,7 +241,12 @@ describe('snoozeRule change tracking', () => {
   beforeEach(() => {
     getBeforeSetup(rulesClientParams, taskManager, ruleTypeRegistry);
     unsecuredSavedObjectsClient.get.mockResolvedValue(existingRuleSO);
-    unsecuredSavedObjectsClient.update.mockResolvedValue(updatedRuleSO);
+    unsecuredSavedObjectsClient.update.mockResolvedValue({
+      id: 'rule-1',
+      type: 'alert',
+      attributes: { snoozeSchedule: updatedRuleSO.attributes.snoozeSchedule },
+      references: [],
+    });
     setRuleType();
   });
 

x-pack/platform/plugins/shared/alerting/server/application/rule/methods/snooze/snooze_rule.ts

@@ -121,7 +121,9 @@ async function snoozeWithOCC<Params extends RuleParams = never>(
   });
 
   await logRuleChanges({
-    ruleSOs: [updatedRuleRaw] as Array<SavedObject<RawRule>>,
+    ruleSOs: [
+      { ...updatedRuleRaw, attributes: { ...attributes, ...updatedRuleRaw.attributes } },
+    ] as Array<SavedObject<RawRule>>,
     rulesClientContext: context,
     changesContext: {
       action: RuleChangeTrackingAction.ruleSnooze,

x-pack/platform/plugins/shared/alerting/server/application/rule/methods/unsnooze/unsnooze_rule.test.ts

@@ -70,6 +70,15 @@ const context = {
 } as unknown as RulesClientContext;
 
 describe('validate unsnooze params', () => {
+  beforeEach(() => {
+    savedObjectsMock.update = jest.fn().mockResolvedValue({
+      id: '123',
+      type: 'alert',
+      attributes: { snoozeSchedule: [] },
+      references: [],
+    });
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -212,7 +221,12 @@ describe('unsnoozeRule change tracking', () => {
   beforeEach(() => {
     getBeforeSetup(rulesClientParams, taskManager, ruleTypeRegistry);
     unsecuredSavedObjectsClient.get.mockResolvedValue(existingRuleSO);
-    unsecuredSavedObjectsClient.update.mockResolvedValue(updatedRuleSO);
+    unsecuredSavedObjectsClient.update.mockResolvedValue({
+      id: 'rule-1',
+      type: 'alert',
+      attributes: { snoozeSchedule: updatedRuleSO.attributes.snoozeSchedule },
+      references: [],
+    });
     setRuleType();
   });
 

x-pack/platform/plugins/shared/alerting/server/application/rule/methods/unsnooze/unsnooze_rule.ts

@@ -99,7 +99,9 @@ async function unsnoozeWithOCC(context: RulesClientContext, { id, scheduleIds }:
   });
 
   await logRuleChanges({
-    ruleSOs: [updatedRuleRaw] as Array<SavedObject<RawRule>>,
+    ruleSOs: [
+      { ...updatedRuleRaw, attributes: { ...attributes, ...updatedRuleRaw.attributes } },
+    ] as Array<SavedObject<RawRule>>,
     rulesClientContext: context,
     changesContext: {
       action: RuleChangeTrackingAction.ruleUnsnooze,