[Alerting] Add alert.updatedAt field to represent date of last user edit

x-pack/plugins/alerts/server/alerts_client/alerts_client.ts

@@ -236,6 +236,7 @@ export class AlertsClient {
       createdBy: username,
       updatedBy: username,
       createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
       params: validatedAlertTypeParams as RawAlert['params'],
       muteAll: false,
       mutedInstanceIds: [],
@@ -289,12 +290,7 @@ export class AlertsClient {
       });
       createdAlert.attributes.scheduledTaskId = scheduledTask.id;
     }
-    return this.getAlertFromRaw(
-      createdAlert.id,
-      createdAlert.attributes,
-      createdAlert.updated_at,
-      references
-    );
+    return this.getAlertFromRaw(createdAlert.id, createdAlert.attributes, references);
   }
 
   public async get({ id }: { id: string }): Promise<SanitizedAlert> {
@@ -304,7 +300,7 @@ export class AlertsClient {
       result.attributes.consumer,
       ReadOperations.Get
     );
-    return this.getAlertFromRaw(result.id, result.attributes, result.updated_at, result.references);
+    return this.getAlertFromRaw(result.id, result.attributes, result.references);
   }
 
   public async getAlertState({ id }: { id: string }): Promise<AlertTaskState | void> {
@@ -393,13 +389,11 @@ export class AlertsClient {
       type: 'alert',
     });
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const authorizedData = data.map(({ id, attributes, updated_at, references }) => {
+    const authorizedData = data.map(({ id, attributes, references }) => {
       ensureAlertTypeIsAuthorized(attributes.alertTypeId, attributes.consumer);
       return this.getAlertFromRaw(
         id,
         fields ? (pick(attributes, fields) as RawAlert) : attributes,
-        updated_at,
         references
       );
     });
@@ -585,6 +579,7 @@ export class AlertsClient {
       params: validatedAlertTypeParams as RawAlert['params'],
       actions,
       updatedBy: username,
+      updatedAt: new Date().toISOString(),
     });
     try {
       updatedObject = await this.unsecuredSavedObjectsClient.create<RawAlert>(
@@ -607,12 +602,7 @@ export class AlertsClient {
       throw e;
     }
 
-    return this.getPartialAlertFromRaw(
-      id,
-      updatedObject.attributes,
-      updatedObject.updated_at,
-      updatedObject.references
-    );
+    return this.getPartialAlertFromRaw(id, updatedObject.attributes, updatedObject.references);
   }
 
   private apiKeyAsAlertAttributes(
@@ -677,6 +667,7 @@ export class AlertsClient {
         await this.createAPIKey(this.generateAPIKeyName(attributes.alertTypeId, attributes.name)),
         username
       ),
+      updatedAt: new Date().toISOString(),
       updatedBy: username,
     });
     try {
@@ -751,6 +742,7 @@ export class AlertsClient {
           username
         ),
         updatedBy: username,
+        updatedAt: new Date().toISOString(),
       });
       try {
         await this.unsecuredSavedObjectsClient.update('alert', id, updateAttributes, { version });
@@ -829,6 +821,7 @@ export class AlertsClient {
           apiKey: null,
           apiKeyOwner: null,
           updatedBy: await this.getUserName(),
+          updatedAt: new Date().toISOString(),
         }),
         { version }
       );
@@ -875,6 +868,7 @@ export class AlertsClient {
       muteAll: true,
       mutedInstanceIds: [],
       updatedBy: await this.getUserName(),
+      updatedAt: new Date().toISOString(),
     });
     const updateOptions = { version };
 
@@ -913,6 +907,7 @@ export class AlertsClient {
       muteAll: false,
       mutedInstanceIds: [],
       updatedBy: await this.getUserName(),
+      updatedAt: new Date().toISOString(),
     });
     const updateOptions = { version };
 
@@ -957,6 +952,7 @@ export class AlertsClient {
         this.updateMeta({
           mutedInstanceIds,
           updatedBy: await this.getUserName(),
+          updatedAt: new Date().toISOString(),
         }),
         { version }
       );
@@ -999,6 +995,7 @@ export class AlertsClient {
         alertId,
         this.updateMeta({
           updatedBy: await this.getUserName(),
+          updatedAt: new Date().toISOString(),
           mutedInstanceIds: mutedInstanceIds.filter((id: string) => id !== alertInstanceId),
         }),
         { version }
@@ -1050,19 +1047,17 @@ export class AlertsClient {
   private getAlertFromRaw(
     id: string,
     rawAlert: RawAlert,
-    updatedAt: SavedObject['updated_at'],
     references: SavedObjectReference[] | undefined
   ): Alert {
     // In order to support the partial update API of Saved Objects we have to support
     // partial updates of an Alert, but when we receive an actual RawAlert, it is safe
     // to cast the result to an Alert
-    return this.getPartialAlertFromRaw(id, rawAlert, updatedAt, references) as Alert;
+    return this.getPartialAlertFromRaw(id, rawAlert, references) as Alert;
   }
 
   private getPartialAlertFromRaw(
     id: string,
-    { createdAt, meta, scheduledTaskId, ...rawAlert }: Partial<RawAlert>,
-    updatedAt: SavedObject['updated_at'] = createdAt,
+    { createdAt, updatedAt, meta, scheduledTaskId, ...rawAlert }: Partial<RawAlert>,
     references: SavedObjectReference[] | undefined
   ): PartialAlert {
     // Not the prettiest code here, but if we want to use most of the

x-pack/plugins/alerts/server/alerts_client/tests/create.test.ts

@@ -196,6 +196,7 @@ describe('create()', () => {
       createdAt: '2019-02-12T21:01:22.479Z',
       createdBy: 'elastic',
       updatedBy: 'elastic',
+      updatedAt: '2019-02-12T21:01:22.479Z',
       muteAll: false,
       mutedInstanceIds: [],
       actions: [
@@ -330,6 +331,7 @@ describe('create()', () => {
           "foo",
         ],
         "throttle": null,
+        "updatedAt": "2019-02-12T21:01:22.479Z",
         "updatedBy": "elastic",
       }
     `);
@@ -418,6 +420,7 @@ describe('create()', () => {
           bar: true,
         },
         createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -555,6 +558,7 @@ describe('create()', () => {
           bar: true,
         },
         createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -631,6 +635,7 @@ describe('create()', () => {
           bar: true,
         },
         createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -971,6 +976,7 @@ describe('create()', () => {
         createdBy: 'elastic',
         createdAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
+        updatedAt: '2019-02-12T21:01:22.479Z',
         enabled: true,
         meta: {
           versionApiKeyLastmodified: 'v7.10.0',
@@ -1092,6 +1098,7 @@ describe('create()', () => {
         createdBy: 'elastic',
         createdAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
+        updatedAt: '2019-02-12T21:01:22.479Z',
         enabled: false,
         meta: {
           versionApiKeyLastmodified: 'v7.10.0',

x-pack/plugins/alerts/server/alerts_client/tests/disable.test.ts

@@ -12,7 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/s
 import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 import { InvalidatePendingApiKey } from '../../types';
 
 const taskManager = taskManagerMock.createStart();
@@ -45,6 +45,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('disable()', () => {
   let alertsClient: AlertsClient;
   const existingAlert = {
@@ -136,6 +138,7 @@ describe('disable()', () => {
         scheduledTaskId: null,
         apiKey: null,
         apiKeyOwner: null,
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
         actions: [
           {
@@ -190,6 +193,7 @@ describe('disable()', () => {
         scheduledTaskId: null,
         apiKey: null,
         apiKeyOwner: null,
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
         actions: [
           {

x-pack/plugins/alerts/server/alerts_client/tests/enable.test.ts

@@ -13,7 +13,7 @@ import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
 import { TaskStatus } from '../../../../task_manager/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 import { InvalidatePendingApiKey } from '../../types';
 
 const taskManager = taskManagerMock.createStart();
@@ -46,6 +46,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('enable()', () => {
   let alertsClient: AlertsClient;
   const existingAlert = {
@@ -186,6 +188,7 @@ describe('enable()', () => {
         meta: {
           versionApiKeyLastmodified: kibanaVersion,
         },
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
         apiKey: null,
         apiKeyOwner: null,
@@ -292,6 +295,7 @@ describe('enable()', () => {
         apiKey: Buffer.from('123:abc').toString('base64'),
         apiKeyOwner: 'elastic',
         updatedBy: 'elastic',
+        updatedAt: '2019-02-12T21:01:22.479Z',
         actions: [
           {
             group: 'default',

x-pack/plugins/alerts/server/alerts_client/tests/find.test.ts

@@ -79,6 +79,7 @@ describe('find()', () => {
               bar: true,
             },
             createdAt: new Date().toISOString(),
+            updatedAt: new Date().toISOString(),
             actions: [
               {
                 group: 'default',

x-pack/plugins/alerts/server/alerts_client/tests/get.test.ts

@@ -59,6 +59,7 @@ describe('get()', () => {
           bar: true,
         },
         createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',

x-pack/plugins/alerts/server/alerts_client/tests/get_alert_instance_summary.test.ts

@@ -76,6 +76,7 @@ const BaseAlertInstanceSummarySavedObject: SavedObject<RawAlert> = {
     createdBy: null,
     updatedBy: null,
     createdAt: mockedDateString,
+    updatedAt: mockedDateString,
     apiKey: null,
     apiKeyOwner: null,
     throttle: null,

x-pack/plugins/alerts/server/alerts_client/tests/mute_all.test.ts

@@ -12,7 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/s
 import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
 const alertTypeRegistry = alertTypeRegistryMock.create();
@@ -43,6 +43,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('muteAll()', () => {
   test('mutes an alert', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
@@ -74,6 +76,7 @@ describe('muteAll()', () => {
       {
         muteAll: true,
         mutedInstanceIds: [],
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
       },
       {

x-pack/plugins/alerts/server/alerts_client/tests/mute_instance.test.ts

@@ -12,7 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/s
 import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
 const alertTypeRegistry = alertTypeRegistryMock.create();
@@ -44,6 +44,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('muteInstance()', () => {
   test('mutes an alert instance', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
@@ -68,6 +70,7 @@ describe('muteInstance()', () => {
       '1',
       {
         mutedInstanceIds: ['2'],
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
       },
       {

x-pack/plugins/alerts/server/alerts_client/tests/unmute_all.test.ts

@@ -12,7 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/s
 import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
 const alertTypeRegistry = alertTypeRegistryMock.create();
@@ -44,6 +44,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('unmuteAll()', () => {
   test('unmutes an alert', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
@@ -75,6 +77,7 @@ describe('unmuteAll()', () => {
       {
         muteAll: false,
         mutedInstanceIds: [],
+        updatedAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
       },
       {

x-pack/plugins/alerts/server/alerts_client/tests/unmute_instance.test.ts

@@ -12,7 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/s
 import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
 import { AlertsAuthorization } from '../../authorization/alerts_authorization';
 import { ActionsAuthorization } from '../../../../actions/server';
-import { getBeforeSetup } from './lib';
+import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
 const alertTypeRegistry = alertTypeRegistryMock.create();
@@ -44,6 +44,8 @@ beforeEach(() => {
   getBeforeSetup(alertsClientParams, taskManager, alertTypeRegistry);
 });
 
+setGlobalDate();
+
 describe('unmuteInstance()', () => {
   test('unmutes an alert instance', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
@@ -69,6 +71,7 @@ describe('unmuteInstance()', () => {
       {
         mutedInstanceIds: [],
         updatedBy: 'elastic',
+        updatedAt: '2019-02-12T21:01:22.479Z',
       },
       { version: '123' }
     );