@webiny/api-form-builder-so-ddb 0.0.0-unstable.fcdad0bc61 → 0.0.0-unstable.fdd9228b5d

package/operations/form/index.d.ts

@@ -1,9 +1,9 @@
-import { Entity, Table } from "dynamodb-toolbox";
-import { PluginsContainer } from "@webiny/plugins";
-import { FormBuilderFormStorageOperations } from "../../types";
+import type { Entity, Table } from "@webiny/db-dynamodb/toolbox";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { FormBuilderFormStorageOperations } from "../../types";
 export interface CreateFormStorageOperationsParams {
     entity: Entity<any>;
-    table: Table;
+    table: Table<string, string, string>;
     plugins: PluginsContainer;
 }
 export declare const createFormStorageOperations: (params: CreateFormStorageOperationsParams) => FormBuilderFormStorageOperations;

package/operations/form/index.js

@@ -1,42 +1,25 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormStorageOperations = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
-var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 var _filter = require("@webiny/db-dynamodb/utils/filter");
-
 var _sort = require("@webiny/db-dynamodb/utils/sort");
-
 var _utils = require("@webiny/utils");
-
 var _FormDynamoDbFieldPlugin = require("../../plugins/FormDynamoDbFieldPlugin");
-
 var _cursor = require("@webiny/db-dynamodb/utils/cursor");
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
 const createFormStorageOperations = params => {
   const {
     entity,
-    table,
     plugins
   } = params;
   const formDynamoDbFields = plugins.byType(_FormDynamoDbFieldPlugin.FormDynamoDbFieldPlugin.type);
-
   const createFormPartitionKey = params => {
     const {
       tenant,
@@ -44,15 +27,12 @@ const createFormStorageOperations = params => {
     } = params;
     return `T#${tenant}#L#${locale}#FB#F`;
   };
-
   const createFormLatestPartitionKey = params => {
     return `${createFormPartitionKey(params)}#L`;
   };
-
   const createFormLatestPublishedPartitionKey = params => {
     return `${createFormPartitionKey(params)}#LP`;
   };
-
   const createFormGSIPartitionKey = params => {
     const {
       tenant,
@@ -64,13 +44,11 @@ const createFormStorageOperations = params => {
     } = (0, _utils.parseIdentifier)(targetId);
     return `T#${tenant}#L#${locale}#FB#F#${id}`;
   };
-
   const createRevisionSortKey = ({
     id
   }) => {
     return `${id}`;
   };
-
   const createFormLatestSortKey = ({
     id,
     formId
@@ -78,7 +56,6 @@ const createFormStorageOperations = params => {
     const value = (0, _utils.parseIdentifier)(id || formId);
     return value.id;
   };
-
   const createLatestPublishedSortKey = ({
     id,
     formId
@@ -86,51 +63,42 @@ const createFormStorageOperations = params => {
     const value = (0, _utils.parseIdentifier)(id || formId);
     return value.id;
   };
-
   const createGSISortKey = version => {
     return `${version}`;
   };
-
   const createFormType = () => {
     return "fb.form";
   };
-
   const createFormLatestType = () => {
     return "fb.form.latest";
   };
-
   const createFormLatestPublishedType = () => {
     return "fb.form.latestPublished";
   };
-
   const createRevisionKeys = form => {
     return {
       PK: createFormPartitionKey(form),
       SK: createRevisionSortKey(form)
     };
   };
-
   const createLatestKeys = form => {
     return {
       PK: createFormLatestPartitionKey(form),
       SK: createFormLatestSortKey(form)
     };
   };
-
   const createLatestPublishedKeys = form => {
     return {
       PK: createFormLatestPublishedPartitionKey(form),
       SK: createLatestPublishedSortKey(form)
     };
   };
-
   const createGSIKeys = form => {
     return {
       GSI1_PK: createFormGSIPartitionKey(form),
       GSI1_SK: createGSISortKey(form.version)
     };
   };
-
   const createForm = async params => {
     const {
       form
@@ -138,17 +106,21 @@ const createFormStorageOperations = params => {
     const revisionKeys = createRevisionKeys(form);
     const latestKeys = createLatestKeys(form);
     const gsiKeys = createGSIKeys(form);
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), gsiKeys), {}, {
-      TYPE: createFormType()
-    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
-      TYPE: createFormLatestType()
-    }))];
-
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      put: [{
+        ...form,
+        ...revisionKeys,
+        ...gsiKeys,
+        TYPE: createFormType()
+      }, {
+        ...form,
+        ...latestKeys,
+        TYPE: createFormLatestType()
+      }]
+    });
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
     } catch (ex) {
       throw new _error.default(ex.message || "Could not insert form data into table.", ex.code || "CREATE_FORM_ERROR", {
         revisionKeys,
@@ -156,10 +128,8 @@ const createFormStorageOperations = params => {
         form
       });
     }
-
     return form;
   };
-
   const createFormFrom = async params => {
     const {
       form,
@@ -169,17 +139,21 @@ const createFormStorageOperations = params => {
     const revisionKeys = createRevisionKeys(form);
     const latestKeys = createLatestKeys(form);
     const gsiKeys = createGSIKeys(form);
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), gsiKeys), {}, {
-      TYPE: createFormType()
-    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
-      TYPE: createFormLatestType()
-    }))];
-
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      put: [{
+        ...form,
+        ...revisionKeys,
+        ...gsiKeys,
+        TYPE: createFormType()
+      }, {
+        ...form,
+        ...latestKeys,
+        TYPE: createFormLatestType()
+      }]
+    });
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create form data in the table, from existing form.", ex.code || "CREATE_FORM_FROM_ERROR", {
         revisionKeys,
@@ -189,10 +163,8 @@ const createFormStorageOperations = params => {
         latest
       });
     }
-
     return form;
   };
-
   const updateForm = async params => {
     const {
       form,
@@ -215,21 +187,24 @@ const createFormStorageOperations = params => {
       }
     });
     const isLatestForm = latestForm ? latestForm.id === form.id : false;
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), gsiKeys), {}, {
-      TYPE: createFormType()
-    }))];
-
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      put: [{
+        ...form,
+        ...revisionKeys,
+        ...gsiKeys,
+        TYPE: createFormType()
+      }]
+    });
     if (isLatestForm) {
-      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
+      entityBatch.put({
+        ...form,
+        ...latestKeys,
         TYPE: createFormLatestType()
-      })));
+      });
     }
-
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update form data in the table.", ex.code || "UPDATE_FORM_ERROR", {
         revisionKeys,
@@ -239,10 +214,8 @@ const createFormStorageOperations = params => {
         latestForm
       });
     }
-
     return form;
   };
-
   const getForm = async params => {
     const {
       where
@@ -254,14 +227,11 @@ const createFormStorageOperations = params => {
       published,
       version
     } = where;
-
     if (latest && published) {
       throw new _error.default("Cannot have both latest and published params.");
     }
-
     let partitionKey;
     let sortKey;
-
     if (latest) {
       partitionKey = createFormLatestPartitionKey(where);
       sortKey = createFormLatestSortKey(where);
@@ -284,25 +254,21 @@ const createFormStorageOperations = params => {
         where
       });
     }
-
     const keys = {
       PK: partitionKey,
       SK: sortKey
     };
-
     try {
-      const item = await (0, _get.get)({
+      return await (0, _get.getClean)({
         entity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(entity, item);
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get form by keys.", ex.code || "GET_FORM_ERROR", {
         keys
       });
     }
   };
-
   const listForms = async params => {
     const {
       sort,
@@ -318,7 +284,6 @@ const createFormStorageOperations = params => {
       }
     };
     let results;
-
     try {
       results = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
@@ -327,13 +292,13 @@ const createFormStorageOperations = params => {
         partitionKey: queryAllParams.partitionKey
       });
     }
-
     const totalCount = results.length;
-    const where = (0, _objectSpread2.default)({}, initialWhere);
+    const where = {
+      ...initialWhere
+    };
     /**
      * We need to remove conditions so we do not filter by them again.
      */
-
     delete where.tenant;
     delete where.locale;
     const filteredItems = (0, _filter.filterItems)({
@@ -355,7 +320,6 @@ const createFormStorageOperations = params => {
      * Although we do not need a cursor here, we will use it as such to keep it standardized.
      * Number is simply encoded.
      */
-
     const cursor = items.length > 0 ? (0, _cursor.encodeCursor)(start + limit) : null;
     const meta = {
       hasMoreItems,
@@ -367,7 +331,6 @@ const createFormStorageOperations = params => {
       meta
     };
   };
-
   const listFormRevisions = async params => {
     const {
       where: initialWhere,
@@ -392,7 +355,6 @@ const createFormStorageOperations = params => {
       }
     };
     let items = [];
-
     try {
       items = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
@@ -401,12 +363,12 @@ const createFormStorageOperations = params => {
         options: queryAllParams.options
       });
     }
-
-    const where = (0, _objectSpread2.default)({}, initialWhere);
+    const where = {
+      ...initialWhere
+    };
     /**
      * We need to remove conditions so we do not filter by them again.
      */
-
     delete where.id;
     delete where.formId;
     delete where.tenant;
@@ -423,7 +385,6 @@ const createFormStorageOperations = params => {
       fields: formDynamoDbFields
     });
   };
-
   const deleteForm = async params => {
     const {
       form
@@ -432,15 +393,13 @@ const createFormStorageOperations = params => {
     /**
      * This will find all form records.
      */
-
     const queryAllParams = {
       entity,
       partitionKey: createFormPartitionKey(form),
       options: {
-        beginsWith: form.formId
+        beginsWith: form.formId || undefined
       }
     };
-
     try {
       items = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
@@ -449,34 +408,28 @@ const createFormStorageOperations = params => {
         options: queryAllParams.options
       });
     }
-
-    let hasLatestPublishedRecord = false;
-    const deleteItems = items.map(item => {
-      if (!hasLatestPublishedRecord && item.published) {
-        hasLatestPublishedRecord = true;
+    let latestPublishedKeys;
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      delete: [createLatestKeys(form)]
+    });
+    for (const item of items) {
+      if (!latestPublishedKeys && item.published) {
+        latestPublishedKeys = createLatestPublishedKeys(item);
       }
-
-      return entity.deleteBatch({
+      entityBatch.delete({
         PK: item.PK,
         SK: item.SK
       });
-    });
-
-    if (hasLatestPublishedRecord) {
-      deleteItems.push(entity.deleteBatch(createLatestPublishedKeys(items[0])));
     }
-
-    deleteItems.push(entity.deleteBatch(createLatestKeys(items[0])));
-
+    if (latestPublishedKeys) {
+      entityBatch.delete(latestPublishedKeys);
+    }
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items: deleteItems
-      });
+      await entityBatch.execute();
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete form and it's submissions.", ex.code || "DELETE_FORM_AND_SUBMISSIONS_ERROR");
     }
-
     return form;
   };
   /**
@@ -485,8 +438,6 @@ const createFormStorageOperations = params => {
    * - get previously published revision and update the record if it exists or delete if it does not
    * - update latest record if current one is the latest
    */
-
-
   const deleteFormRevision = async params => {
     const {
       form,
@@ -499,8 +450,10 @@ const createFormStorageOperations = params => {
     const latestPublishedForm = revisions.find(rev => rev.published === true);
     const isLatest = latestForm ? latestForm.id === form.id : false;
     const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
-    const items = [entity.deleteBatch(revisionKeys)];
-
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      delete: [revisionKeys]
+    });
     if (isLatest || isLatestPublished) {
       /**
        * Sort out the latest published record.
@@ -509,40 +462,36 @@ const createFormStorageOperations = params => {
         const previouslyPublishedForm = revisions.filter(f => !!f.publishedOn && f.version !== form.version).sort((a, b) => {
           return new Date(b.publishedOn).getTime() - new Date(a.publishedOn).getTime();
         }).shift();
-
         if (previouslyPublishedForm) {
-          items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedForm), createLatestPublishedKeys(previouslyPublishedForm)), {}, {
+          entityBatch.put({
+            ...previouslyPublishedForm,
+            ...createLatestPublishedKeys(previouslyPublishedForm),
             GSI1_PK: null,
             GSI1_SK: null,
             TYPE: createFormLatestPublishedType()
-          })));
+          });
         } else {
-          items.push(entity.deleteBatch(createLatestPublishedKeys(form)));
+          entityBatch.delete(createLatestPublishedKeys(form));
         }
       }
       /**
        * Sort out the latest record.
        */
-
-
       if (isLatest) {
-        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previous), latestKeys), {}, {
+        entityBatch.put({
+          ...previous,
+          ...latestKeys,
           GSI1_PK: null,
           GSI1_SK: null,
           TYPE: createFormLatestType()
-        })));
+        });
       }
     }
     /**
      * Now save the batch data.
      */
-
-
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
       return form;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete form revision from table.", ex.code || "DELETE_FORM_REVISION_ERROR", {
@@ -553,6 +502,7 @@ const createFormStorageOperations = params => {
       });
     }
   };
+
   /**
    * We need to save form in:
    * - regular form record
@@ -560,8 +510,6 @@ const createFormStorageOperations = params => {
    * - latest form record - if form is latest one
    * - elasticsearch latest form record
    */
-
-
   const publishForm = async params => {
     const {
       form,
@@ -591,27 +539,32 @@ const createFormStorageOperations = params => {
     /**
      * Update revision and latest published records
      */
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      put: [{
+        ...form,
+        ...revisionKeys,
+        ...gsiKeys,
+        TYPE: createFormType()
+      }, {
+        ...form,
+        ...latestPublishedKeys,
+        TYPE: createFormLatestPublishedType()
+      }]
+    });
 
-    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), revisionKeys), gsiKeys), {}, {
-      TYPE: createFormType()
-    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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), {}, {
+      entityBatch.put({
+        ...form,
+        ...latestKeys,
         TYPE: createFormLatestType()
-      })));
+      });
     }
-
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
     } catch (ex) {
       throw new _error.default(ex.message || "Could not publish form.", ex.code || "PUBLISH_FORM_ERROR", {
         form,
@@ -622,17 +575,15 @@ const createFormStorageOperations = params => {
         latestPublishedKeys
       });
     }
-
     return form;
   };
+
   /**
    * We need to:
    * - update form revision record
    * - if latest published (LP) is current form, find the previously published record and update LP if there is some previously published, delete otherwise
    * - if is latest update the Elasticsearch record
    */
-
-
   const unpublishForm = async params => {
     const {
       form,
@@ -665,21 +616,26 @@ 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)((0, _objectSpread2.default)({}, form), revisionKeys), gsiKeys), {}, {
-      TYPE: createFormType()
-    }))];
-
+    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
+      entity,
+      put: [{
+        ...form,
+        ...revisionKeys,
+        ...gsiKeys,
+        TYPE: createFormType()
+      }]
+    });
     if (isLatest) {
-      entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), latestKeys), {}, {
+      entityBatch.put({
+        ...form,
+        ...latestKeys,
         TYPE: createFormLatestType()
-      }));
+      });
     }
     /**
      * In case previously published revision exists, replace current one with that one.
      * And if it does not, delete the record.
      */
-
-
     if (isLatestPublished) {
       const revisions = await listFormRevisions({
         where: {
@@ -692,21 +648,18 @@ const createFormStorageOperations = params => {
         sort: ["savedOn_DESC"]
       });
       const previouslyPublishedRevision = revisions.shift();
-
       if (previouslyPublishedRevision) {
-        items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedRevision), latestPublishedKeys), {}, {
+        entityBatch.put({
+          ...previouslyPublishedRevision,
+          ...latestPublishedKeys,
           TYPE: createFormLatestPublishedType()
-        })));
+        });
       } else {
-        items.push(entity.deleteBatch(latestPublishedKeys));
+        entityBatch.delete(latestPublishedKeys);
       }
     }
-
     try {
-      await (0, _batchWrite.batchWriteAll)({
-        table,
-        items
-      });
+      await entityBatch.execute();
       return form;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not unpublish form.", ex.code || "UNPUBLISH_FORM_ERROR", {
@@ -719,7 +672,6 @@ const createFormStorageOperations = params => {
       });
     }
   };
-
   return {
     createForm,
     createFormFrom,
@@ -734,5 +686,6 @@ const createFormStorageOperations = params => {
     createFormPartitionKey
   };
 };
+exports.createFormStorageOperations = createFormStorageOperations;
 
-exports.createFormStorageOperations = createFormStorageOperations;
+//# sourceMappingURL=index.js.map