Small refactor

elastic · Feb 1, 2024 · 73a0d61 · 73a0d61
1 parent 9046b00
commit 73a0d61
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 27 deletions.
diff --git a/src/plugins/content_management/server/content_client/content_client.test.ts b/src/plugins/content_management/server/content_client/content_client.test.ts
@@ -48,6 +48,8 @@ describe('ContentClient', () => {
           storageContext: {} as any,
         });
       };
+      // With this test and runtime check we can rely on all the existing tests of the Content Crud.
+      // e.g. the tests about events being dispatched, etc.
       expect(expectToThrow).toThrowError('Crud instance missing or not an instance of ContentCrud');
     });
   });

diff --git a/src/plugins/content_management/server/core/core.ts b/src/plugins/content_management/server/core/core.ts
@@ -120,9 +120,9 @@ export class Core {
       const clientFactory = getContentClientFactory({
         contentRegistry: this.contentRegistry,
       });
-      const client = clientFactory(contentTypeId);
+      const contentClient = clientFactory(contentTypeId);
 
-      return client.getForRequest<T>({
+      return contentClient.getForRequest<T>({
         requestHandlerContext,
         request,
         version: version ?? contentDefinition.version.latest,

diff --git a/src/plugins/content_management/server/rpc/procedures/bulk_get.ts b/src/plugins/content_management/server/rpc/procedures/bulk_get.ts
@@ -19,11 +19,11 @@ export const bulkGet: ProcedureDefinition<Context, BulkGetIn<string>, BulkGetRes
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).bulkGet(ids, options);
+    });
+
+    return client.bulkGet(ids, options);
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/create.ts b/src/plugins/content_management/server/rpc/procedures/create.ts
@@ -18,11 +18,11 @@ export const create: ProcedureDefinition<Context, CreateIn<string>> = {
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).create(data, options);
+    });
+
+    return client.create(data, options);
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/delete.ts b/src/plugins/content_management/server/rpc/procedures/delete.ts
@@ -17,11 +17,11 @@ export const deleteProc: ProcedureDefinition<Context, DeleteIn<string>> = {
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).delete(id, options);
+    });
+
+    return client.delete(id, options);
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/get.ts b/src/plugins/content_management/server/rpc/procedures/get.ts
@@ -18,11 +18,11 @@ export const get: ProcedureDefinition<Context, GetIn<string>> = {
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).get(id, options);
+    });
+
+    return client.get(id, options);
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/msearch.ts b/src/plugins/content_management/server/rpc/procedures/msearch.ts
@@ -19,7 +19,8 @@ export const mSearch: ProcedureDefinition<Context, MSearchIn, MSearchOut> = {
       contentRegistry: ctx.contentRegistry,
       mSearchService: ctx.mSearchService,
     });
+    const mSearchClient = clientFactory(ctx);
 
-    return clientFactory(ctx).msearch({ contentTypes, query });
+    return mSearchClient.msearch({ contentTypes, query });
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/search.ts b/src/plugins/content_management/server/rpc/procedures/search.ts
@@ -18,11 +18,11 @@ export const search: ProcedureDefinition<Context, SearchIn<string>> = {
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).search(query, options);
+    });
+
+    return client.search(query, options);
   },
 };
diff --git a/src/plugins/content_management/server/rpc/procedures/update.ts b/src/plugins/content_management/server/rpc/procedures/update.ts
@@ -17,11 +17,11 @@ export const update: ProcedureDefinition<Context, UpdateIn<string>> = {
     const clientFactory = getContentClientFactory({
       contentRegistry: ctx.contentRegistry,
     });
-    const { getForRequest } = clientFactory(contentTypeId);
-
-    return getForRequest({
+    const client = clientFactory(contentTypeId).getForRequest({
       ...ctx,
       version,
-    }).update(id, data, options);
+    });
+
+    return client.update(id, data, options);
   },
 };