fix(api-elasticsearch): create cursor from PrimitiveValue type

webiny · Oct 17, 2024 · 45b6e76 · 45b6e76
1 parent b9cc85b
commit 45b6e76
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 27 deletions.
diff --git a/...i-elasticsearch-tasks/__tests__/tasks/dataSynchronization/dataSynchronizationTask.test.ts b/...i-elasticsearch-tasks/__tests__/tasks/dataSynchronization/dataSynchronizationTask.test.ts
@@ -8,12 +8,12 @@ jest.mock("~/tasks/dataSynchronization/createFactories", () => {
     return {
         createFactories: (): IFactories => {
             return {
-                createElasticsearch: ({ manager }) => {
+                createElasticsearchToDynamoDb: ({ manager }) => {
                     return {
                         run: async input => {
                             return manager.response.continue({
                                 ...input,
-                                elasticsearch: {
+                                elasticsearchToDynamoDb: {
                                     finished: true
                                 }
                             });
@@ -72,7 +72,7 @@ describe("data synchronization - elasticsearch", () => {
         const task = await context.tasks.createTask<IDataSynchronizationInput>({
             definitionId: DATA_SYNCHRONIZATION_TASK,
             input: {
-                elasticsearch: {
+                elasticsearchToDynamoDb: {
                     finished: true
                 },
                 dynamoDbElasticsearch: {
@@ -110,7 +110,7 @@ describe("data synchronization - elasticsearch", () => {
                         dynamoDbElasticsearch: {
                             finished: true
                         },
-                        elasticsearch: {
+                        elasticsearchToDynamoDb: {
                             finished: true
                         }
                     }

diff --git a/...es/api-elasticsearch-tasks/src/tasks/dataSynchronization/DataSynchronizationTaskRunner.ts b/...es/api-elasticsearch-tasks/src/tasks/dataSynchronization/DataSynchronizationTaskRunner.ts
@@ -27,8 +27,8 @@ export class DataSynchronizationTaskRunner {
          * First we check if we need to sync Elasticsearch.
          */
         //
-        if (!input.elasticsearch?.finished) {
-            const sync = this.factories.createElasticsearch({
+        if (!input.elasticsearchToDynamoDb?.finished) {
+            const sync = this.factories.createElasticsearchToDynamoDb({
                 manager: this.manager,
                 indexManager: this.indexManager
             });

diff --git a/packages/api-elasticsearch-tasks/src/tasks/dataSynchronization/createFactories.ts b/packages/api-elasticsearch-tasks/src/tasks/dataSynchronization/createFactories.ts
@@ -1,12 +1,12 @@
 import { IFactories } from "./types";
 import { DynamoDbElasticsearchSynchronization } from "./dynamoDbElasticsearch/DynamoDbElasticsearchSynchronization";
-import { ElasticsearchSynchronization } from "./elasticsearch/ElasticsearchSynchronization";
+import { ElasticsearchToDynamoDbSynchronization } from "./elasticsearch/ElasticsearchToDynamoDbSynchronization";
 import { DynamoDbSynchronization } from "./dynamoDb/DynamoDbSynchronization";
 
 export const createFactories = (): IFactories => {
     return {
-        createElasticsearch: params => {
-            return new ElasticsearchSynchronization(params);
+        createElasticsearchToDynamoDb: params => {
+            return new ElasticsearchToDynamoDbSynchronization(params);
         },
         createDynamoDbElasticsearch: params => {
             return new DynamoDbElasticsearchSynchronization(params);

diff --git a/...ticsearch/ElasticsearchSynchronization.ts → ...ElasticsearchToDynamoDbSynchronization.ts b/...ticsearch/ElasticsearchSynchronization.ts → ...ElasticsearchToDynamoDbSynchronization.ts
@@ -31,7 +31,7 @@ interface ISearchResultHitsItemSource {
     id: string;
 }
 
-export class ElasticsearchSynchronization implements ISynchronization {
+export class ElasticsearchToDynamoDbSynchronization implements ISynchronization {
     private readonly manager: IDataSynchronizationManager;
     private readonly indexManager: IIndexManager;
 
@@ -41,8 +41,8 @@ export class ElasticsearchSynchronization implements ISynchronization {
     }
 
     public async run(input: IDataSynchronizationInput): Promise<ITaskResponseResult> {
-        const lastIndex = input.elasticsearch?.index;
-        let cursor = input.elasticsearch?.cursor;
+        const lastIndex = input.elasticsearchToDynamoDb?.index;
+        let cursor = input.elasticsearchToDynamoDb?.cursor;
         const indexes = await this.fetchAllIndexes();
         const next = lastIndex ? indexes.findIndex(index => index === lastIndex) + 1 : 0;
 
@@ -54,8 +54,8 @@ export class ElasticsearchSynchronization implements ISynchronization {
             } else if (this.manager.isCloseToTimeout()) {
                 return this.manager.response.continue({
                     ...input,
-                    elasticsearch: {
-                        ...input.elasticsearch,
+                    elasticsearchToDynamoDb: {
+                        ...input.elasticsearchToDynamoDb,
                         index: currentIndex,
                         cursor
                     }
@@ -85,8 +85,8 @@ export class ElasticsearchSynchronization implements ISynchronization {
                 });
                 return this.manager.response.continue({
                     ...input,
-                    elasticsearch: {
-                        ...input.elasticsearch,
+                    elasticsearchToDynamoDb: {
+                        ...input.elasticsearchToDynamoDb,
                         index: currentIndex,
                         cursor: done ? undefined : newCursor
                     }
@@ -98,8 +98,8 @@ export class ElasticsearchSynchronization implements ISynchronization {
 
         return this.manager.response.continue({
             ...input,
-            elasticsearch: {
-                ...input.elasticsearch,
+            elasticsearchToDynamoDb: {
+                ...input.elasticsearchToDynamoDb,
                 finished: true
             }
         });

diff --git a/packages/api-elasticsearch-tasks/src/tasks/dataSynchronization/types.ts b/packages/api-elasticsearch-tasks/src/tasks/dataSynchronization/types.ts
@@ -7,14 +7,14 @@ export interface IDataSynchronizationInputValue {
     finished?: boolean;
 }
 
-export interface IDataSynchronizationInputElasticsearchValue
+export interface IDataSynchronizationInputElasticsearchToDynamoDbValue
     extends IDataSynchronizationInputValue {
     index?: string;
     cursor?: PrimitiveValue[];
 }
 
 export interface IDataSynchronizationInput {
-    elasticsearch?: IDataSynchronizationInputElasticsearchValue;
+    elasticsearchToDynamoDb?: IDataSynchronizationInputElasticsearchToDynamoDbValue;
     dynamoDbElasticsearch?: IDataSynchronizationInputValue;
     dynamoDb?: IDataSynchronizationInputValue;
 }
@@ -49,7 +49,7 @@ export interface IDynamoDbSyncFactory {
 }
 
 export interface IFactories {
-    createElasticsearch: IElasticsearchSyncFactory;
+    createElasticsearchToDynamoDb: IElasticsearchSyncFactory;
     createDynamoDbElasticsearch: IDynamoDbElasticsearchSyncFactory;
     createDynamoDb: IDynamoDbSyncFactory;
 }

diff --git a/packages/api-elasticsearch/src/cursors.ts b/packages/api-elasticsearch/src/cursors.ts
@@ -3,12 +3,16 @@ import { PrimitiveValue } from "~/types";
 /**
  * Encode a received cursor value into something that can be passed on to the user.
  */
-export const encodeCursor = (cursor?: string | string[] | null): string | undefined => {
-    if (!cursor) {
+export const encodeCursor = (input?: PrimitiveValue[]): string | undefined => {
+    if (!input) {
         return undefined;
     }
 
-    cursor = Array.isArray(cursor) ? cursor.map(encodeURIComponent) : encodeURIComponent(cursor);
+    const cursor = Array.isArray(input)
+        ? input
+              .filter((item: PrimitiveValue): item is string | number | boolean => item !== null)
+              .map(item => encodeURIComponent(item))
+        : encodeURIComponent(input);
 
     try {
         return Buffer.from(JSON.stringify(cursor)).toString("base64");
@@ -28,7 +32,7 @@ export const decodeCursor = (cursor?: string | null): PrimitiveValue[] | undefin
     try {
         const value = JSON.parse(Buffer.from(cursor, "base64").toString("ascii"));
         if (Array.isArray(value)) {
-            return value.map(decodeURIComponent);
+            return value.filter(item => item !== null).map(decodeURIComponent);
         }
         const decoded = decodeURIComponent(value);
         return decoded ? [decoded] : undefined;

diff --git a/packages/api-elasticsearch/src/types.ts b/packages/api-elasticsearch/src/types.ts
@@ -1,5 +1,5 @@
 import { ApiResponse, Client } from "@elastic/elasticsearch";
-import { BoolQueryConfig as esBoolQueryConfig, PrimitiveValue, Query as esQuery } from "elastic-ts";
+import { BoolQueryConfig, PrimitiveValue, Query as esQuery } from "elastic-ts";
 import { Context, GenericRecord } from "@webiny/api/types";
 /**
  * Re-export some dep lib types.
@@ -15,7 +15,7 @@ export interface ElasticsearchContext extends Context {
  * To simplify our plugins, we say that query contains arrays of objects, not single objects.
  * And that they all are defined as empty arrays at the start.
  */
-export interface ElasticsearchBoolQueryConfig extends esBoolQueryConfig {
+export interface ElasticsearchBoolQueryConfig extends BoolQueryConfig {
     must: esQuery[];
     filter: esQuery[];
     should: esQuery[];