PR comments

elastic · Oct 15, 2024 · fcd19df · fcd19df
1 parent 0ff0bc1
commit fcd19df
Show file tree

Hide file tree

Showing 3 changed files with 203 additions and 351 deletions.
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts
@@ -96,7 +96,7 @@ export const getNotesRoute = (router: SecuritySolutionPluginRouter) => {
               return response.ok({ body });
             }
 
-            // searching for all the notes associated with a specific for saved object id
+            // searching for all the notes associated with a specific saved object id
             const options: SavedObjectsFindOptions = {
               type: noteSavedObjectType,
               hasReference: {

diff --git a/...ntegration/test_suites/investigation/saved_objects/trial_license_complete_tier/helpers.ts b/...ntegration/test_suites/investigation/saved_objects/trial_license_complete_tier/helpers.ts
@@ -7,7 +7,7 @@
 
 import type SuperTest from 'supertest';
 import { v4 as uuidv4 } from 'uuid';
-import { TimelineTypeEnum } from '@kbn/security-solution-plugin/common/api/timeline';
+import { BareNote, TimelineTypeEnum } from '@kbn/security-solution-plugin/common/api/timeline';
 import { NOTE_URL } from '@kbn/security-solution-plugin/common/constants';
 import type { Client } from '@elastic/elasticsearch';
 import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
@@ -53,82 +53,26 @@ export const deleteAllNotes = async (es: Client): Promise<void> => {
   });
 };
 
-export const createNoteAssociatedWithDocumentOnly = async (
+export const createNote = async (
   supertest: SuperTest.Agent,
-  documentId: string,
-  noteText: string
+  note: {
+    documentId?: string;
+    savedObjectId?: string;
+    user?: string;
+    text: string;
+  }
 ) =>
   await supertest
     .patch(NOTE_URL)
     .set('kbn-xsrf', 'true')
     .send({
       note: {
-        eventId: documentId,
-        timelineId: '',
+        eventId: note.documentId || '',
+        timelineId: note.savedObjectId || '',
         created: Date.now(),
-        createdBy: 'elastic',
+        createdBy: note.user || 'elastic',
         updated: Date.now(),
-        updatedBy: 'elastic',
-        note: noteText,
-      },
-    });
-
-export const createNoteAssociatedWithSavedObjectOnly = async (
-  supertest: SuperTest.Agent,
-  savedObjectId: string,
-  noteText: string
-) =>
-  await supertest
-    .patch(NOTE_URL)
-    .set('kbn-xsrf', 'true')
-    .send({
-      note: {
-        eventId: '',
-        timelineId: savedObjectId,
-        created: Date.now(),
-        createdBy: 'elastic',
-        updated: Date.now(),
-        updatedBy: 'elastic',
-        note: noteText,
-      },
-    });
-
-export const createNoteAssociatedWithDocumentAndSavedObject = async (
-  supertest: SuperTest.Agent,
-  documentId: string,
-  savedObjectId: string,
-  noteText: string
-) =>
-  await supertest
-    .patch(NOTE_URL)
-    .set('kbn-xsrf', 'true')
-    .send({
-      note: {
-        eventId: documentId,
-        timelineId: savedObjectId,
-        created: Date.now(),
-        createdBy: 'elastic',
-        updated: Date.now(),
-        updatedBy: 'elastic',
-        note: noteText,
-      },
-    });
-
-export const createNoteAssociatedWithNothing = async (
-  supertest: SuperTest.Agent,
-  noteText: string
-) =>
-  await supertest
-    .patch(NOTE_URL)
-    .set('kbn-xsrf', 'true')
-    .send({
-      note: {
-        eventId: '',
-        timelineId: '',
-        created: Date.now(),
-        createdBy: 'elastic',
-        updated: Date.now(),
-        updatedBy: 'elastic',
-        note: noteText,
-      },
+        updatedBy: note.user || 'elastic',
+        note: note.text,
+      } as BareNote,
     });