@webiny/api-form-builder-so-ddb-es 5.39.0-beta.0 → 5.39.0-beta.2

package/operations/form/elasticsearchBody.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormElasticType = exports.createElasticsearchBody = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _apiElasticsearch = require("@webiny/api-elasticsearch");
 var _FormElasticsearchFieldPlugin = require("../../plugins/FormElasticsearchFieldPlugin");
 var _FormElasticsearchSortModifierPlugin = require("../../plugins/FormElasticsearchSortModifierPlugin");
@@ -42,7 +40,9 @@ const createElasticsearchQuery = params => {
    * Be aware that, if having more registered operator plugins of same type, the last one will be used.
    */
   const operatorPlugins = (0, _apiElasticsearch.getElasticsearchOperatorPluginsByLocale)(plugins, initialWhere.locale);
-  const where = (0, _objectSpread2.default)({}, initialWhere);
+  const where = {
+    ...initialWhere
+  };
   /**
    * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.
    *
@@ -95,9 +95,10 @@ const createElasticsearchBody = params => {
     return acc;
   }, {});
   const limit = (0, _apiElasticsearch.createLimit)(initialLimit, 100);
-  const query = createElasticsearchQuery((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+  const query = createElasticsearchQuery({
+    ...params,
     fieldPlugins
-  }));
+  });
   const sort = (0, _apiElasticsearch.createSort)({
     sort: initialSort,
     fieldPlugins
@@ -119,17 +120,14 @@ const createElasticsearchBody = params => {
     query: {
       constant_score: {
         filter: {
-          bool: (0, _objectSpread2.default)({}, query)
+          bool: {
+            ...query
+          }
         }
       }
     },
     size: limit + 1,
-    /**
-     * Casting as any is required due to search_after is accepting an array of values.
-     * Which is correct in some cases. In our case, it is not.
-     * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html
-     */
-    search_after: (0, _apiElasticsearch.decodeCursor)(after),
+    search_after: after,
     sort
   };
   const bodyModifiers = plugins.byType(_FormElasticsearchBodyModifierPlugin.FormElasticsearchBodyModifierPlugin.type);

package/operations/form/elasticsearchBody.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiElasticsearch","require","_FormElasticsearchFieldPlugin","_FormElasticsearchSortModifierPlugin","_FormElasticsearchBodyModifierPlugin","_FormElasticsearchQueryModifierPlugin","createFormElasticType","exports","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","getElasticsearchOperatorPluginsByLocale","locale","_objectSpread2","default","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","applyWhere","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","byType","FormElasticsearchFieldPlugin","type","reduce","acc","plugin","field","createLimit","createSort","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","decodeCursor","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"sources":["elasticsearchBody.ts"],"sourcesContent":["import { SearchBody as esSearchBody } from \"elastic-ts\";\nimport {\n    decodeCursor,\n    getElasticsearchOperatorPluginsByLocale,\n    applyWhere,\n    createLimit,\n    createSort\n} from \"@webiny/api-elasticsearch\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\nimport { FormElasticsearchSortModifierPlugin } from \"~/plugins/FormElasticsearchSortModifierPlugin\";\nimport { FormElasticsearchBodyModifierPlugin } from \"~/plugins/FormElasticsearchBodyModifierPlugin\";\nimport { FormBuilderStorageOperationsListFormsParams } from \"@webiny/api-form-builder/types\";\nimport { FormElasticsearchQueryModifierPlugin } from \"~/plugins/FormElasticsearchQueryModifierPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport const createFormElasticType = (): string => {\n    return \"fb.form\";\n};\n\nconst createInitialQueryValue = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [\n            /**\n             * We add the __type filtering in the initial query because it must be applied.\n             */\n            {\n                term: {\n                    \"__type.keyword\": createFormElasticType()\n                }\n            }\n        ],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface CreateElasticsearchQueryParams extends CreateElasticsearchBodyParams {\n    fieldPlugins: Record<string, FormElasticsearchFieldPlugin>;\n}\n\nconst createElasticsearchQuery = (params: CreateElasticsearchQueryParams) => {\n    const { plugins, where: initialWhere, fieldPlugins } = params;\n    const query = createInitialQueryValue();\n    /**\n     * Be aware that, if having more registered operator plugins of same type, the last one will be used.\n     */\n    const operatorPlugins = getElasticsearchOperatorPluginsByLocale(plugins, initialWhere.locale);\n\n    const where: Partial<FormBuilderStorageOperationsListFormsParams[\"where\"]> = {\n        ...initialWhere\n    };\n    /**\n     * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.\n     *\n     * When ES index is shared between tenants, we need to filter records by tenant ID.\n     * No need for the tenant filtering otherwise as each index is for single tenant.\n     */\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex && where.tenant) {\n        query.must.push({\n            term: {\n                \"tenant.keyword\": where.tenant\n            }\n        });\n    }\n    /**\n     * Remove tenant so it is not applied again later.\n     * Possibly tenant is not defined, but just in case, remove it.\n     */\n    delete where.tenant;\n    /**\n     * Add the locale to filtering.\n     */\n    query.must.push({\n        term: {\n            \"locale.keyword\": where.locale as string\n        }\n    });\n    delete where.locale;\n    /**\n     * We apply other conditions as they are passed via the where value.\n     */\n    applyWhere({\n        query,\n        where,\n        fields: fieldPlugins,\n        operators: operatorPlugins\n    });\n\n    return query;\n};\n\ninterface CreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    where: FormBuilderStorageOperationsListFormsParams[\"where\"];\n    limit: number;\n    after?: string;\n    sort: string[];\n}\n\nexport const createElasticsearchBody = (params: CreateElasticsearchBodyParams): esSearchBody => {\n    const { plugins, where, limit: initialLimit, sort: initialSort, after } = params;\n\n    const fieldPlugins = plugins\n        .byType<FormElasticsearchFieldPlugin>(FormElasticsearchFieldPlugin.type)\n        .reduce((acc, plugin) => {\n            acc[plugin.field] = plugin;\n            return acc;\n        }, {} as Record<string, FormElasticsearchFieldPlugin>);\n\n    const limit = createLimit(initialLimit, 100);\n\n    const query = createElasticsearchQuery({\n        ...params,\n        fieldPlugins\n    });\n\n    const sort = createSort({\n        sort: initialSort,\n        fieldPlugins\n    });\n\n    const queryModifiers = plugins.byType<FormElasticsearchQueryModifierPlugin>(\n        FormElasticsearchQueryModifierPlugin.type\n    );\n\n    for (const plugin of queryModifiers) {\n        plugin.modifyQuery({\n            query,\n            where\n        });\n    }\n\n    const sortModifiers = plugins.byType<FormElasticsearchSortModifierPlugin>(\n        FormElasticsearchSortModifierPlugin.type\n    );\n\n    for (const plugin of sortModifiers) {\n        plugin.modifySort({\n            sort\n        });\n    }\n\n    const body = {\n        query: {\n            constant_score: {\n                filter: {\n                    bool: {\n                        ...query\n                    }\n                }\n            }\n        },\n        size: limit + 1,\n        /**\n         * Casting as any is required due to search_after is accepting an array of values.\n         * Which is correct in some cases. In our case, it is not.\n         * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html\n         */\n        search_after: decodeCursor(after) as any,\n        sort\n    };\n\n    const bodyModifiers = plugins.byType<FormElasticsearchBodyModifierPlugin>(\n        FormElasticsearchBodyModifierPlugin.type\n    );\n\n    for (const plugin of bodyModifiers) {\n        plugin.modifyBody({\n            body\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}
+{"version":3,"names":["_apiElasticsearch","require","_FormElasticsearchFieldPlugin","_FormElasticsearchSortModifierPlugin","_FormElasticsearchBodyModifierPlugin","_FormElasticsearchQueryModifierPlugin","createFormElasticType","exports","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","getElasticsearchOperatorPluginsByLocale","locale","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","applyWhere","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","byType","FormElasticsearchFieldPlugin","type","reduce","acc","plugin","field","createLimit","createSort","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"sources":["elasticsearchBody.ts"],"sourcesContent":["import { PrimitiveValue, SearchBody as esSearchBody } from \"elastic-ts\";\nimport {\n    applyWhere,\n    createLimit,\n    createSort,\n    getElasticsearchOperatorPluginsByLocale\n} from \"@webiny/api-elasticsearch\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\nimport { FormElasticsearchSortModifierPlugin } from \"~/plugins/FormElasticsearchSortModifierPlugin\";\nimport { FormElasticsearchBodyModifierPlugin } from \"~/plugins/FormElasticsearchBodyModifierPlugin\";\nimport { FormBuilderStorageOperationsListFormsParams } from \"@webiny/api-form-builder/types\";\nimport { FormElasticsearchQueryModifierPlugin } from \"~/plugins/FormElasticsearchQueryModifierPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport const createFormElasticType = (): string => {\n    return \"fb.form\";\n};\n\nconst createInitialQueryValue = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [\n            /**\n             * We add the __type filtering in the initial query because it must be applied.\n             */\n            {\n                term: {\n                    \"__type.keyword\": createFormElasticType()\n                }\n            }\n        ],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface CreateElasticsearchQueryParams extends CreateElasticsearchBodyParams {\n    fieldPlugins: Record<string, FormElasticsearchFieldPlugin>;\n}\n\nconst createElasticsearchQuery = (params: CreateElasticsearchQueryParams) => {\n    const { plugins, where: initialWhere, fieldPlugins } = params;\n    const query = createInitialQueryValue();\n    /**\n     * Be aware that, if having more registered operator plugins of same type, the last one will be used.\n     */\n    const operatorPlugins = getElasticsearchOperatorPluginsByLocale(plugins, initialWhere.locale);\n\n    const where: Partial<FormBuilderStorageOperationsListFormsParams[\"where\"]> = {\n        ...initialWhere\n    };\n    /**\n     * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.\n     *\n     * When ES index is shared between tenants, we need to filter records by tenant ID.\n     * No need for the tenant filtering otherwise as each index is for single tenant.\n     */\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex && where.tenant) {\n        query.must.push({\n            term: {\n                \"tenant.keyword\": where.tenant\n            }\n        });\n    }\n    /**\n     * Remove tenant so it is not applied again later.\n     * Possibly tenant is not defined, but just in case, remove it.\n     */\n    delete where.tenant;\n    /**\n     * Add the locale to filtering.\n     */\n    query.must.push({\n        term: {\n            \"locale.keyword\": where.locale as string\n        }\n    });\n    delete where.locale;\n    /**\n     * We apply other conditions as they are passed via the where value.\n     */\n    applyWhere({\n        query,\n        where,\n        fields: fieldPlugins,\n        operators: operatorPlugins\n    });\n\n    return query;\n};\n\ninterface CreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    where: FormBuilderStorageOperationsListFormsParams[\"where\"];\n    limit: number;\n    after?: PrimitiveValue[];\n    sort: string[];\n}\n\nexport const createElasticsearchBody = (params: CreateElasticsearchBodyParams): esSearchBody => {\n    const { plugins, where, limit: initialLimit, sort: initialSort, after } = params;\n\n    const fieldPlugins = plugins\n        .byType<FormElasticsearchFieldPlugin>(FormElasticsearchFieldPlugin.type)\n        .reduce((acc, plugin) => {\n            acc[plugin.field] = plugin;\n            return acc;\n        }, {} as Record<string, FormElasticsearchFieldPlugin>);\n\n    const limit = createLimit(initialLimit, 100);\n\n    const query = createElasticsearchQuery({\n        ...params,\n        fieldPlugins\n    });\n\n    const sort = createSort({\n        sort: initialSort,\n        fieldPlugins\n    });\n\n    const queryModifiers = plugins.byType<FormElasticsearchQueryModifierPlugin>(\n        FormElasticsearchQueryModifierPlugin.type\n    );\n\n    for (const plugin of queryModifiers) {\n        plugin.modifyQuery({\n            query,\n            where\n        });\n    }\n\n    const sortModifiers = plugins.byType<FormElasticsearchSortModifierPlugin>(\n        FormElasticsearchSortModifierPlugin.type\n    );\n\n    for (const plugin of sortModifiers) {\n        plugin.modifySort({\n            sort\n        });\n    }\n\n    const body = {\n        query: {\n            constant_score: {\n                filter: {\n                    bool: {\n                        ...query\n                    }\n                }\n            }\n        },\n        size: limit + 1,\n        search_after: after,\n        sort\n    };\n\n    const bodyModifiers = plugins.byType<FormElasticsearchBodyModifierPlugin>(\n        FormElasticsearchBodyModifierPlugin.type\n    );\n\n    for (const plugin of bodyModifiers) {\n        plugin.modifyBody({\n            body\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}

package/operations/form/index.d.ts

@@ -1,4 +1,4 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Client } from "@elastic/elasticsearch";
 import { PluginsContainer } from "@webiny/plugins";
 import { FormBuilderFormStorageOperations } from "../../types";
@@ -10,7 +10,7 @@ export declare type DbRecord<T = any> = T & {
 export interface CreateFormStorageOperationsParams {
     entity: Entity<any>;
     esEntity: Entity<any>;
-    table: Table;
+    table: Table<string, string, string>;
     elasticsearch: Client;
     plugins: PluginsContainer;
 }

package/operations/form/index.js

@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _query = require("@webiny/db-dynamodb/utils/query");
 var _error = _interopRequireDefault(require("@webiny/error"));
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
 var _configurations = require("../../configurations");
 var _filter = require("@webiny/db-dynamodb/utils/filter");
@@ -17,6 +15,7 @@ var _sort = require("@webiny/db-dynamodb/utils/sort");
 var _utils = require("@webiny/utils");
 var _elasticsearchBody = require("./elasticsearchBody");
 var _apiElasticsearch = require("@webiny/api-elasticsearch");
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const getESDataForLatestRevision = form => ({
   __type: (0, _elasticsearchBody.createFormElasticType)(),
   id: form.id,
@@ -87,11 +86,15 @@ const createFormStorageOperations = params => {
       PK: createFormPartitionKey(form),
       SK: createLatestSortKey()
     };
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
-      TYPE: createFormType()
-    }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
-      TYPE: createFormLatestType()
-    }, latestKeys))];
+    const items = [entity.putBatch({
+      ...form,
+      TYPE: createFormType(),
+      ...revisionKeys
+    }), entity.putBatch({
+      ...form,
+      TYPE: createFormLatestType(),
+      ...latestKeys
+    })];
     try {
       await (0, _batchWrite.batchWriteAll)({
         table,
@@ -111,11 +114,15 @@ const createFormStorageOperations = params => {
         tenant: form.tenant,
         locale: form.locale
       });
-      await esEntity.put((0, _objectSpread2.default)({
-        index,
-        data: getESDataForLatestRevision(form),
-        TYPE: createFormType()
-      }, latestKeys));
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: {
+          index,
+          data: getESDataForLatestRevision(form),
+          TYPE: createFormType(),
+          ...latestKeys
+        }
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not insert form data into Elasticsearch table.", ex.code || "CREATE_FORM_ERROR", {
         latestKeys,
@@ -138,11 +145,15 @@ const createFormStorageOperations = params => {
       PK: createFormPartitionKey(form),
       SK: createLatestSortKey()
     };
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch({
+      ...form,
+      ...revisionKeys,
       TYPE: createFormType()
-    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
+    }), entity.putBatch({
+      ...form,
+      ...latestKeys,
       TYPE: createFormLatestType()
-    }))];
+    })];
     try {
       await (0, _batchWrite.batchWriteAll)({
         table,
@@ -164,11 +175,15 @@ const createFormStorageOperations = params => {
         tenant: form.tenant,
         locale: form.locale
       });
-      await esEntity.put((0, _objectSpread2.default)({
-        index,
-        data: getESDataForLatestRevision(form),
-        TYPE: createFormLatestType()
-      }, latestKeys));
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: {
+          index,
+          data: getESDataForLatestRevision(form),
+          TYPE: createFormLatestType(),
+          ...latestKeys
+        }
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create form in the Elasticsearch table, from existing form.", ex.code || "CREATE_FORM_FROM_ERROR", {
         latestKeys,
@@ -206,13 +221,17 @@ const createFormStorageOperations = params => {
       }
     });
     const isLatestForm = latestForm ? latestForm.id === form.id : false;
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
-      TYPE: createFormType()
-    }, revisionKeys))];
+    const items = [entity.putBatch({
+      ...form,
+      TYPE: createFormType(),
+      ...revisionKeys
+    })];
     if (isLatestForm) {
-      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), {}, {
-        TYPE: createFormLatestType()
-      }, latestKeys)));
+      items.push(entity.putBatch({
+        ...form,
+        TYPE: createFormLatestType(),
+        ...latestKeys
+      }));
     }
     try {
       await (0, _batchWrite.batchWriteAll)({
@@ -241,11 +260,15 @@ const createFormStorageOperations = params => {
         tenant: form.tenant,
         locale: form.locale
       });
-      await esEntity.put((0, _objectSpread2.default)({
-        index,
-        data: getESDataForLatestRevision(form),
-        TYPE: createFormLatestType()
-      }, latestKeys));
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: {
+          index,
+          data: getESDataForLatestRevision(form),
+          TYPE: createFormLatestType(),
+          ...latestKeys
+        }
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update form data in the Elasticsearch table.", ex.code || "UPDATE_FORM_ERROR", {
         latestKeys,
@@ -296,11 +319,10 @@ const createFormStorageOperations = params => {
       SK: sortKey
     };
     try {
-      const result = await entity.get(keys);
-      if (!result || !result.Item) {
-        return null;
-      }
-      return (0, _cleanup.cleanupItem)(entity, result.Item);
+      return await (0, _dbDynamodb.getClean)({
+        entity,
+        keys
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get form by keys.", ex.code || "GET_FORM_ERROR", {
         keys
@@ -325,9 +347,10 @@ const createFormStorageOperations = params => {
       tenant: where.tenant,
       locale: where.locale
     });
-    const query = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, esConfig), {}, {
+    const query = {
+      ...esConfig,
       body
-    });
+    };
     let response;
     try {
       response = await elasticsearch.search(query);
@@ -395,10 +418,11 @@ const createFormStorageOperations = params => {
         options: queryAllParams.options
       });
     }
-    const where = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialWhere), {}, {
+    const where = {
+      ...initialWhere,
       id: undefined,
       formId: undefined
-    });
+    };
     const filteredItems = (0, _filter.filterItems)({
       plugins,
       items,
@@ -456,7 +480,10 @@ const createFormStorageOperations = params => {
       SK: createLatestSortKey()
     };
     try {
-      await esEntity.delete(latestKeys);
+      await (0, _dbDynamodb.deleteItem)({
+        entity: esEntity,
+        keys: latestKeys
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete latest form record from Elasticsearch.", ex.code || "DELETE_FORM_ERROR", {
         latestKeys
@@ -499,11 +526,12 @@ const createFormStorageOperations = params => {
           return new Date(b.publishedOn).getTime() - new Date(a.publishedOn).getTime();
         }).shift();
         if (previouslyPublishedForm) {
-          items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedForm), {}, {
+          items.push(entity.putBatch({
+            ...previouslyPublishedForm,
             PK: createFormPartitionKey(previouslyPublishedForm),
             SK: createLatestPublishedSortKey(),
             TYPE: createFormLatestPublishedType()
-          })));
+          }));
         } else {
           items.push(entity.deleteBatch({
             PK: createFormPartitionKey(form),
@@ -515,20 +543,22 @@ const createFormStorageOperations = params => {
        * Sort out the latest record.
        */
       if (isLatest && previous) {
-        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previous), latestKeys), {}, {
+        items.push(entity.putBatch({
+          ...previous,
+          ...latestKeys,
           TYPE: createFormLatestType()
-        })));
+        }));
         const {
           index
         } = _configurations.configurations.es({
           tenant: previous.tenant,
           locale: previous.locale
         });
-        esDataItem = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          index
-        }, latestKeys), {}, {
+        esDataItem = {
+          index,
+          ...latestKeys,
           data: getESDataForLatestRevision(previous)
-        });
+        };
       }
     }
     /**
@@ -554,7 +584,10 @@ const createFormStorageOperations = params => {
       return form;
     }
     try {
-      await esEntity.put(esDataItem);
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: esDataItem
+      });
       return form;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete form from to the Elasticsearch table.", ex.code || "DELETE_FORM_REVISION_ERROR", {
@@ -607,18 +640,24 @@ const createFormStorageOperations = params => {
     /**
      * Update revision and latest published records
      */
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch({
+      ...form,
+      ...revisionKeys,
       TYPE: createFormType()
-    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestPublishedKeys), {}, {
+    }), entity.putBatch({
+      ...form,
+      ...latestPublishedKeys,
       TYPE: createFormLatestPublishedType()
-    }))];
+    })];
     /**
      * Update the latest form as well
      */
     if (isLatestForm) {
-      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
+      items.push(entity.putBatch({
+        ...form,
+        ...latestKeys,
         TYPE: createFormLatestType()
-      })));
+      }));
     }
     try {
       await (0, _batchWrite.batchWriteAll)({
@@ -646,11 +685,15 @@ const createFormStorageOperations = params => {
     });
     const esData = getESDataForLatestRevision(form);
     try {
-      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
-        index,
-        TYPE: createFormLatestType(),
-        data: esData
-      }));
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: {
+          ...latestKeys,
+          index,
+          TYPE: createFormLatestType(),
+          data: esData
+        }
+      });
       return form;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not publish form to the Elasticsearch.", ex.code || "PUBLISH_FORM_ERROR", {
@@ -710,9 +753,11 @@ const createFormStorageOperations = params => {
     });
     const isLatest = latestForm ? latestForm.id === form.id : false;
     const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), {}, {
+    const items = [entity.putBatch({
+      ...form,
+      ...revisionKeys,
       TYPE: createFormType()
-    }))];
+    })];
     let esData = undefined;
     if (isLatest) {
       esData = getESDataForLatestRevision(form);
@@ -734,9 +779,11 @@ const createFormStorageOperations = params => {
       });
       const previouslyPublishedRevision = revisions.shift();
       if (previouslyPublishedRevision) {
-        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedRevision), latestPublishedKeys), {}, {
+        items.push(entity.putBatch({
+          ...previouslyPublishedRevision,
+          ...latestPublishedKeys,
           TYPE: createFormLatestPublishedType()
-        })));
+        }));
       } else {
         items.push(entity.deleteBatch(latestPublishedKeys));
       }
@@ -769,11 +816,15 @@ const createFormStorageOperations = params => {
       locale: form.locale
     });
     try {
-      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
-        index,
-        TYPE: createFormLatestType(),
-        data: esData
-      }));
+      await (0, _dbDynamodb.put)({
+        entity: esEntity,
+        item: {
+          ...latestKeys,
+          index,
+          TYPE: createFormLatestType(),
+          data: esData
+        }
+      });
       return form;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not unpublish form from the Elasticsearch.", ex.code || "UNPUBLISH_FORM_ERROR", {