Adding error check and test

elastic · May 26, 2023 · 0fddd61 · 0fddd61
1 parent 8136935
commit 0fddd61
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/x-pack/plugins/cases/server/services/attachments/index.test.ts b/x-pack/plugins/cases/server/services/attachments/index.test.ts
@@ -101,6 +101,25 @@ describe('AttachmentService', () => {
         ).resolves.not.toThrow();
       });
 
+      it('returns error objects unmodified', async () => {
+        const userAttachment = createUserAttachment({ foo: 'bar' });
+
+        const errorResponseObj = createErrorSO();
+
+        unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({
+          saved_objects: [errorResponseObj, userAttachment],
+        });
+
+        const res = await service.bulkCreate({
+          attachments: [
+            { attributes: createUserAttachment().attributes, references: [], id: '1' },
+            { attributes: createUserAttachment().attributes, references: [], id: '1' },
+          ],
+        });
+
+        expect(res).toStrictEqual({ saved_objects: [errorResponseObj, createUserAttachment()] });
+      });
+
       it('strips excess fields', async () => {
         unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({
           saved_objects: [createUserAttachment({ foo: 'bar' })],

diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -240,16 +240,20 @@ export class AttachmentService {
     const validatedAttachments: AttachmentSavedObjectTransformed[] = [];
 
     for (const so of res.saved_objects) {
-      const transformedAttachment = injectAttachmentSOAttributesFromRefs(
-        so,
-        this.context.persistableStateAttachmentTypeRegistry
-      );
+      if (isSOError(so)) {
+        validatedAttachments.push(so as AttachmentSavedObjectTransformed);
+      } else {
+        const transformedAttachment = injectAttachmentSOAttributesFromRefs(
+          so,
+          this.context.persistableStateAttachmentTypeRegistry
+        );
 
-      const validatedAttributes = decodeOrThrow(AttachmentTransformedAttributesRt)(
-        transformedAttachment.attributes
-      );
+        const validatedAttributes = decodeOrThrow(AttachmentTransformedAttributesRt)(
+          transformedAttachment.attributes
+        );
 
-      validatedAttachments.push(Object.assign(so, { attributes: validatedAttributes }));
+        validatedAttachments.push(Object.assign(so, { attributes: validatedAttributes }));
+      }
     }
 
     return Object.assign(res, { saved_objects: validatedAttachments });

diff --git a/x-pack/plugins/cases/server/services/attachments/operations/get.ts b/x-pack/plugins/cases/server/services/attachments/operations/get.ts
@@ -180,8 +180,6 @@ export class AttachmentGetter {
     response: SavedObjectsFindResponse<AttachmentPersistedAttributes>
   ): Array<SavedObject<AttributesTypeAlerts>> {
     return response.saved_objects.map((so) => {
-      // We need a cast here because the limited attachment type conflicts with the expected result even though they
-      // should be the same
       const validatedAttributes = decodeOrThrow(AttributesTypeAlertsRt)(so.attributes);
 
       return Object.assign(so, { attributes: validatedAttributes });