Fix types

elastic · Jun 17, 2021 · f50a883 · f50a883
1 parent cc13afd
commit f50a883
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/x-pack/plugins/cases/server/client/alerts/update_status.ts b/x-pack/plugins/cases/server/client/alerts/update_status.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UpdateAlertRequest } from './client';
 import { CasesClientArgs } from '..';
+import { UpdateAlertRequest } from './types';
 
 interface UpdateAlertsStatusArgs {
   alerts: UpdateAlertRequest[];

diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -54,7 +54,7 @@ import {
 } from '../../common';
 import { createCaseError } from '../../common/error';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
-import { UpdateAlertRequest } from '../alerts/client';
+import { UpdateAlertRequest } from '../alerts/types';
 import { CasesClientInternal } from '../client_internal';
 import { CasesClientArgs } from '..';
 import { Operations, OwnerEntity } from '../../authorization';

diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
@@ -29,6 +29,7 @@ const createCasesSubClientMock = (): CasesSubClientMock => {
     getTags: jest.fn(),
     getReporters: jest.fn(),
     getCaseIDsByAlertID: jest.fn(),
+    getAllAlertsAttachToCase: jest.fn(),
   };
 };
 

diff --git a/x-pack/plugins/cases/server/client/sub_cases/update.ts b/x-pack/plugins/cases/server/client/sub_cases/update.ts
@@ -43,7 +43,7 @@ import {
   flattenSubCaseSavedObject,
 } from '../../common';
 import { createCaseError } from '../../common/error';
-import { UpdateAlertRequest } from '../../client/alerts/client';
+import { UpdateAlertRequest } from '../../client/alerts/types';
 import { CasesClientArgs } from '../types';
 import { CasesClientInternal } from '../client_internal';
 

diff --git a/x-pack/plugins/cases/server/services/alerts/index.ts b/x-pack/plugins/cases/server/services/alerts/index.ts
@@ -13,7 +13,7 @@ import { ElasticsearchClient, Logger } from 'kibana/server';
 import { MAX_ALERTS_PER_SUB_CASE } from '../../../common/constants';
 import { AlertInfo } from '../../common';
 import { createCaseError } from '../../common/error';
-import { UpdateAlertRequest } from '../../client/alerts/client';
+import { UpdateAlertRequest } from '../../client/alerts/types';
 
 export type AlertServiceContract = PublicMethodsOf<AlertService>;
 

diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts
@@ -30,6 +30,7 @@ export const createCaseServiceMock = (): CaseServiceMock => {
     findCases: jest.fn(),
     findSubCases: jest.fn(),
     findSubCasesByCaseId: jest.fn(),
+    getAllAlertsAttachToCase: jest.fn(),
     getAllCaseComments: jest.fn(),
     getAllSubCaseComments: jest.fn(),
     getCase: jest.fn(),

diff --git a/...se_api_integration/security_and_spaces/tests/common/alerts/get_alerts_attached_to_case.ts b/...se_api_integration/security_and_spaces/tests/common/alerts/get_alerts_attached_to_case.ts
@@ -83,19 +83,19 @@ export default ({ getService }: FtrProviderContext): void => {
           ),
         ]);
 
-        const [_, case2WithComments] = await Promise.all([
-          createComment({
-            supertest: supertestWithoutAuth,
-            caseId: case1.id,
-            params: postCommentAlertReq,
-            auth: secOnlyAuth,
-          }),
+        const [case2WithComments] = await Promise.all([
           createComment({
             supertest: supertestWithoutAuth,
             caseId: case2.id,
             params: { ...postCommentAlertReq, alertId: 'test-id-3', owner: 'observabilityFixture' },
             auth: obsOnlyAuth,
           }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case1.id,
+            params: postCommentAlertReq,
+            auth: secOnlyAuth,
+          }),
         ]);
 
         // This call cannot be made inside the Promise.all call