@webiny/api-headless-cms-ddb 0.0.0-unstable.e53eceafb5 → 0.0.0-unstable.e6f0dc8ca7

package/operations/entry/index.js

@@ -1,30 +1,14 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createEntriesStorageOperations = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _dataLoaders = require("./dataLoaders");
-var _types = require("@webiny/api-headless-cms/types");
-var _keys = require("./keys");
-var _dbDynamodb = require("@webiny/db-dynamodb");
-var _cursor = require("@webiny/utils/cursor");
-var _zeroPad = require("@webiny/utils/zeroPad");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
-var _createFields = require("./filtering/createFields");
-var _filtering = require("./filtering");
-var _constants = require("@webiny/api-headless-cms/constants");
-const createType = () => {
-  return "cms.entry";
-};
-const createLatestType = () => {
-  return `${createType()}.l`;
-};
-const createPublishedType = () => {
-  return `${createType()}.p`;
-};
+import WebinyError from "@webiny/error";
+import { DataLoadersHandler } from "./dataLoaders.js";
+import { CONTENT_ENTRY_STATUS } from "@webiny/api-headless-cms/types/index.js";
+import { createEntryLatestKeys, createEntryPublishedKeys, createEntryRevisionKeys, createGSIPartitionKey, createPartitionKey, createPublishedSortKey, createRevisionSortKey } from "./keys.js";
+import { decodeCursor, encodeCursor } from "@webiny/utils";
+import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
+import { createFields } from "./filtering/createFields.js";
+import { filter, sort } from "./filtering/index.js";
+import { isDeletedEntryMetaField, isEntryLevelEntryMetaField, isRestoredEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
+import { StorageTransformRegistry } from "@webiny/api-headless-cms/exports/api/cms/storage.js";
 const convertToStorageEntry = params => {
   const {
     model,
@@ -54,45 +38,42 @@ const convertFromStorageEntry = params => {
   };
 };
 const MAX_LIST_LIMIT = 1000000;
-const createEntriesStorageOperations = params => {
+export const createEntriesStorageOperations = params => {
   const {
     entity,
+    container,
     plugins
   } = params;
+  const storageTransformRegistry = container.resolve(StorageTransformRegistry);
   let storageOperationsCmsModelPlugin;
   const getStorageOperationsCmsModelPlugin = () => {
     if (storageOperationsCmsModelPlugin) {
       return storageOperationsCmsModelPlugin;
     }
-    storageOperationsCmsModelPlugin = plugins.oneByType(_apiHeadlessCms.StorageOperationsCmsModelPlugin.type);
+    storageOperationsCmsModelPlugin = plugins.oneByType(StorageOperationsCmsModelPlugin.type);
     return storageOperationsCmsModelPlugin;
   };
   const getStorageOperationsModel = model => {
     const plugin = getStorageOperationsCmsModelPlugin();
     return plugin.getModel(model);
   };
-  const dataLoaders = new _dataLoaders.DataLoadersHandler({
+  const dataLoaders = new DataLoadersHandler({
     entity
   });
   const createStorageTransformCallable = model => {
-    // Cache StorageTransformPlugin to optimize execution.
-    const storageTransformPlugins = plugins.byType(_apiHeadlessCms.StorageTransformPlugin.type).reduce((collection, plugin) => {
-      collection[plugin.fieldType] = plugin;
-      return collection;
-    }, {});
     return (field, value) => {
-      const plugin = storageTransformPlugins[field.type];
-      if (!plugin) {
+      const fieldType = getBaseFieldType(field);
+      const storageTransform = storageTransformRegistry.get(fieldType);
+      if (!storageTransform) {
         return value;
       }
-      return plugin.fromStorage({
+      return storageTransform.fromStorage({
         model,
         field,
         value,
-        getStoragePlugin(fieldType) {
-          return storageTransformPlugins[fieldType] || storageTransformPlugins["*"];
-        },
-        plugins
+        getStorageTransform(fieldType) {
+          return storageTransformRegistry.get(fieldType) || storageTransformRegistry.get("*");
+        }
       });
     };
   };
@@ -102,40 +83,32 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
     const storageEntry = convertToStorageEntry({
       model,
       storageEntry: initialStorageEntry
     });
+    const storageEntryRevisionKeys = createEntryRevisionKeys(entry);
+    const storageEntryLatestKeys = createEntryLatestKeys(entry);
     /**
      * We need to:
      *  - create new main entry item
      *  - create new or update the latest entry item
      */
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: [{
-        ...storageEntry,
-        locked,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(entry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...storageEntryRevisionKeys,
+        data: {
+          ...storageEntry,
+          locked
+        }
       }, {
-        ...storageEntry,
-        locked,
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...storageEntryLatestKeys,
+        data: {
+          ...storageEntry,
+          locked
+        }
       }]
     });
 
@@ -143,14 +116,13 @@ const createEntriesStorageOperations = params => {
      * We need to create published entry if
      */
     if (isPublished) {
+      const storageEntryPublishedKeys = createEntryPublishedKeys(storageEntry);
       entityBatch.put({
-        ...storageEntry,
-        locked,
-        PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...storageEntryPublishedKeys,
+        data: {
+          ...storageEntry,
+          locked
+        }
       });
     }
     try {
@@ -159,7 +131,7 @@ const createEntriesStorageOperations = params => {
         model
       });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not insert data into the DynamoDB.", ex.code || "CREATE_ENTRY_ERROR", {
+      throw new WebinyError(ex.message || "Could not insert data into the DynamoDB.", ex.code || "CREATE_ENTRY_ERROR", {
         error: ex,
         entry
       });
@@ -172,11 +144,6 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
     const storageEntry = convertToStorageEntry({
       storageEntry: initialStorageEntry,
       model
@@ -190,33 +157,26 @@ const createEntriesStorageOperations = params => {
      *      - update the published entry item to the current one
      *      - unpublish previously published revision (if any)
      */
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: [{
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(storageEntry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...createEntryRevisionKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       }, {
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...createEntryLatestKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       }]
     });
     const isPublished = entry.status === "published";
     if (isPublished) {
       entityBatch.put({
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)(),
-        TYPE: createPublishedType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...createEntryPublishedKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       });
 
       // Unpublish previously published revision (if any).
@@ -226,13 +186,11 @@ const createEntriesStorageOperations = params => {
       });
       if (publishedRevisionStorageEntry) {
         entityBatch.put({
-          ...publishedRevisionStorageEntry,
-          PK: partitionKey,
-          SK: (0, _keys.createRevisionSortKey)(publishedRevisionStorageEntry),
-          TYPE: createType(),
-          status: _types.CONTENT_ENTRY_STATUS.UNPUBLISHED,
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-          GSI1_SK: (0, _keys.createGSISortKey)(publishedRevisionStorageEntry)
+          ...createEntryRevisionKeys(publishedRevisionStorageEntry),
+          data: {
+            ...publishedRevisionStorageEntry,
+            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+          }
         });
       }
     }
@@ -242,7 +200,7 @@ const createEntriesStorageOperations = params => {
         model
       });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not create revision from given entry.", ex.code || "CREATE_REVISION_ERROR", {
+      throw new WebinyError(ex.message || "Could not create revision from given entry.", ex.code || "CREATE_REVISION_ERROR", {
         error: ex,
         entry,
         storageEntry
@@ -259,11 +217,6 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
     const storageEntry = convertToStorageEntry({
@@ -276,27 +229,22 @@ const createEntriesStorageOperations = params => {
      *  - update the latest entry if the current entry is the latest one
      */
 
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: [{
-        ...storageEntry,
-        locked,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(storageEntry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...createEntryRevisionKeys(storageEntry),
+        data: {
+          ...storageEntry,
+          locked
+        }
       }]
     });
     if (isPublished) {
       entityBatch.put({
-        ...storageEntry,
-        locked,
-        PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)(),
-        TYPE: createPublishedType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+        ...createEntryPublishedKeys(storageEntry),
+        data: {
+          ...storageEntry,
+          locked
+        }
       });
     }
 
@@ -308,20 +256,18 @@ const createEntriesStorageOperations = params => {
       const updatingLatestRevision = latestStorageEntry.id === entry.id;
       if (updatingLatestRevision) {
         entityBatch.put({
-          ...storageEntry,
-          locked,
-          PK: partitionKey,
-          SK: (0, _keys.createLatestSortKey)(),
-          TYPE: createLatestType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-          GSI1_SK: (0, _keys.createGSISortKey)(entry)
+          ...createEntryLatestKeys(storageEntry),
+          data: {
+            ...storageEntry,
+            locked
+          }
         });
       } else {
         /**
          * If not updating latest revision, we still want to update the latest revision's
          * entry-level meta fields to match the current revision's entry-level meta fields.
          */
-        const updatedEntryLevelMetaFields = (0, _constants.pickEntryMetaFields)(entry, _constants.isEntryLevelEntryMetaField);
+        const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
 
         /**
          * First we update the regular DynamoDB table. Two updates are needed:
@@ -329,22 +275,18 @@ const createEntriesStorageOperations = params => {
          * - one for the latest record
          */
         entityBatch.put({
-          ...latestStorageEntry,
-          ...updatedEntryLevelMetaFields,
-          PK: partitionKey,
-          SK: (0, _keys.createRevisionSortKey)(latestStorageEntry),
-          TYPE: createType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-          GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+          ...createEntryRevisionKeys(latestStorageEntry),
+          data: {
+            ...latestStorageEntry,
+            ...updatedEntryLevelMetaFields
+          }
         });
         entityBatch.put({
-          ...latestStorageEntry,
-          ...updatedEntryLevelMetaFields,
-          PK: partitionKey,
-          SK: (0, _keys.createLatestSortKey)(),
-          TYPE: createLatestType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-          GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+          ...createEntryLatestKeys(latestStorageEntry),
+          data: {
+            ...latestStorageEntry,
+            ...updatedEntryLevelMetaFields
+          }
         });
       }
     }
@@ -355,7 +297,7 @@ const createEntriesStorageOperations = params => {
       });
       return initialStorageEntry;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not update entry.", ex.code || "UPDATE_ERROR", {
+      throw new WebinyError(ex.message || "Could not update entry.", ex.code || "UPDATE_ERROR", {
         error: ex,
         entry,
         latestStorageEntry
@@ -372,29 +314,29 @@ const createEntriesStorageOperations = params => {
     /**
      * First we need to load all the revisions and published / latest entry.
      */
-    const queryAllParams = {
-      entity,
-      partitionKey: (0, _keys.createPartitionKey)({
-        id,
-        locale: model.locale,
-        tenant: model.tenant
-      }),
+    const partitionKey = createPartitionKey({
+      id,
+      tenant: model.tenant
+    });
+    const records = await entity.queryAll({
+      partitionKey,
       options: {
         gte: " "
       }
-    };
-    const records = await (0, _dbDynamodb.queryAll)(queryAllParams);
+    });
     /**
      * Then create the batch writes for the DynamoDB, with the updated folderId.
      */
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: records.map(item => {
         return {
           ...item,
-          location: {
-            ...item.location,
-            folderId
+          data: {
+            ...item.data,
+            location: {
+              ...item.data.location,
+              folderId
+            }
           }
         };
       })
@@ -406,7 +348,7 @@ const createEntriesStorageOperations = params => {
     try {
       await entityBatch.execute();
     } catch (ex) {
-      throw _error.default.from(ex, {
+      throw WebinyError.from(ex, {
         message: "Could not move records to a new folder.",
         data: {
           id,
@@ -425,22 +367,20 @@ const createEntriesStorageOperations = params => {
     /**
      * First we need to load all the revisions and published / latest entries.
      */
-    const queryAllParams = {
-      entity,
-      partitionKey: (0, _keys.createPartitionKey)({
-        id: entry.id,
-        locale: model.locale,
-        tenant: model.tenant
-      }),
-      options: {
-        gte: " "
-      }
-    };
+
     let records = [];
     try {
-      records = await (0, _dbDynamodb.queryAll)(queryAllParams);
+      records = await entity.queryAll({
+        partitionKey: createPartitionKey({
+          id: entry.id,
+          tenant: model.tenant
+        }),
+        options: {
+          gte: " "
+        }
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
+      throw new WebinyError(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
         error: ex,
         id: entry.id
       });
@@ -456,20 +396,22 @@ const createEntriesStorageOperations = params => {
     /**
      * Let's pick the `deleted` meta fields from the storage entry.
      */
-    const updatedDeletedMetaFields = (0, _constants.pickEntryMetaFields)(storageEntry, _constants.isDeletedEntryMetaField);
+    const updatedDeletedMetaFields = pickEntryMetaFields(storageEntry, isDeletedEntryMetaField);
 
     /**
      * Then create the batch writes for the DynamoDB, with the updated data.
      */
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: records.map(record => {
         return {
           ...record,
-          ...updatedDeletedMetaFields,
-          wbyDeleted: storageEntry.wbyDeleted,
-          location: storageEntry.location,
-          binOriginalFolderId: storageEntry.binOriginalFolderId
+          data: {
+            ...record.data,
+            ...updatedDeletedMetaFields,
+            wbyDeleted: storageEntry.wbyDeleted,
+            location: storageEntry.location,
+            binOriginalFolderId: storageEntry.binOriginalFolderId
+          }
         };
       })
     });
@@ -478,8 +420,11 @@ const createEntriesStorageOperations = params => {
      */
     try {
       await entityBatch.execute();
+      dataLoaders.clearAll({
+        model
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not move the entry to the bin.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
+      throw new WebinyError(ex.message || "Could not move the entry to the bin.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
         error: ex,
         entry,
         storageEntry
@@ -492,28 +437,25 @@ const createEntriesStorageOperations = params => {
     } = params;
     const id = entry.id || entry.entryId;
     const model = getStorageOperationsModel(initialModel);
-    const queryAllParams = {
-      entity,
-      partitionKey: (0, _keys.createPartitionKey)({
-        id,
-        locale: model.locale,
-        tenant: model.tenant
-      }),
-      options: {
-        gte: " "
-      }
-    };
+    const partitionKey = createPartitionKey({
+      id,
+      tenant: model.tenant
+    });
     let records = [];
     try {
-      records = await (0, _dbDynamodb.queryAll)(queryAllParams);
+      records = await entity.queryAll({
+        partitionKey,
+        options: {
+          gte: " "
+        }
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
+      throw new WebinyError(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
         error: ex,
         id
       });
     }
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       delete: records.map(item => {
         return {
           PK: item.PK,
@@ -527,9 +469,9 @@ const createEntriesStorageOperations = params => {
         model
       });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not delete the entry.", ex.code || "DELETE_ENTRY_ERROR", {
+      throw new WebinyError(ex.message || "Could not delete the entry.", ex.code || "DELETE_ENTRY_ERROR", {
         error: ex,
-        partitionKey: queryAllParams.partitionKey,
+        partitionKey,
         id
       });
     }
@@ -544,22 +486,19 @@ const createEntriesStorageOperations = params => {
     /**
      * First we need to load all the revisions and published / latest entries.
      */
-    const queryAllParams = {
-      entity,
-      partitionKey: (0, _keys.createPartitionKey)({
-        id: entry.id,
-        locale: model.locale,
-        tenant: model.tenant
-      }),
-      options: {
-        gte: " "
-      }
-    };
     let records = [];
     try {
-      records = await (0, _dbDynamodb.queryAll)(queryAllParams);
+      records = await entity.queryAll({
+        partitionKey: createPartitionKey({
+          id: entry.id,
+          tenant: model.tenant
+        }),
+        options: {
+          gte: " "
+        }
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
+      throw new WebinyError(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
         error: ex,
         id: entry.id
       });
@@ -575,16 +514,18 @@ const createEntriesStorageOperations = params => {
     /**
      * Let's pick the `restored` meta fields from the storage entry.
      */
-    const updatedRestoredMetaFields = (0, _constants.pickEntryMetaFields)(storageEntry, _constants.isRestoredEntryMetaField);
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const updatedRestoredMetaFields = pickEntryMetaFields(storageEntry, isRestoredEntryMetaField);
+    const entityBatch = entity.createEntityWriter({
       put: records.map(record => {
         return {
           ...record,
-          ...updatedRestoredMetaFields,
-          wbyDeleted: storageEntry.wbyDeleted,
-          location: storageEntry.location,
-          binOriginalFolderId: storageEntry.binOriginalFolderId
+          data: {
+            ...record.data,
+            ...updatedRestoredMetaFields,
+            wbyDeleted: storageEntry.wbyDeleted,
+            location: storageEntry.location,
+            binOriginalFolderId: storageEntry.binOriginalFolderId
+          }
         };
       })
     });
@@ -599,7 +540,7 @@ const createEntriesStorageOperations = params => {
       });
       return initialStorageEntry;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not restore the entry from the bin.", ex.code || "RESTORE_ENTRY_ERROR", {
+      throw new WebinyError(ex.message || "Could not restore the entry from the bin.", ex.code || "RESTORE_ENTRY_ERROR", {
         error: ex,
         entry,
         storageEntry
@@ -613,16 +554,14 @@ const createEntriesStorageOperations = params => {
       latestStorageEntry: initialLatestStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
+    const partitionKey = createPartitionKey({
       id: entry.id,
-      locale: model.locale,
       tenant: model.tenant
     });
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       delete: [{
         PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(entry)
+        SK: createRevisionSortKey(entry)
       }]
     });
     const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
@@ -633,7 +572,7 @@ const createEntriesStorageOperations = params => {
     if (publishedStorageEntry && entry.id === publishedStorageEntry.id) {
       entityBatch.delete({
         PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)()
+        SK: createPublishedSortKey()
       });
     }
     if (initialLatestStorageEntry) {
@@ -642,32 +581,28 @@ const createEntriesStorageOperations = params => {
         model
       });
       entityBatch.put({
-        ...latestStorageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+        ...createEntryLatestKeys(latestStorageEntry),
+        data: {
+          ...latestStorageEntry
+        }
       });
 
       // Do an update on the latest revision. We need to update the latest revision's
       // entry-level meta fields to match the previous revision's entry-level meta fields.
       entityBatch.put({
-        ...latestStorageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(initialLatestStorageEntry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(initialLatestStorageEntry)
+        ...createEntryRevisionKeys(latestStorageEntry),
+        data: {
+          ...latestStorageEntry
+        }
       });
     }
     try {
-      entityBatch.execute();
+      await entityBatch.execute();
       dataLoaders.clearAll({
         model
       });
     } catch (ex) {
-      throw new _error.default(ex.message, ex.code, {
+      throw new WebinyError(ex.message, ex.code, {
         error: ex,
         entry,
         latestEntry
@@ -690,13 +625,10 @@ const createEntriesStorageOperations = params => {
      * Then we need to construct the queries for all the revisions and entries.
      */
 
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity
-    });
+    const entityBatch = entity.createEntityWriter();
     for (const id of entries) {
-      const partitionKey = (0, _keys.createPartitionKey)({
+      const partitionKey = createPartitionKey({
         id,
-        locale: model.locale,
         tenant: model.tenant
       });
       entityBatch.delete({
@@ -713,12 +645,11 @@ const createEntriesStorageOperations = params => {
      */
     for (const revision of revisions) {
       entityBatch.delete({
-        PK: (0, _keys.createPartitionKey)({
+        PK: createPartitionKey({
           id: revision.id,
-          locale: model.locale,
           tenant: model.tenant
         }),
-        SK: (0, _keys.createRevisionSortKey)({
+        SK: createRevisionSortKey({
           version: revision.version
         })
       });
@@ -828,44 +759,34 @@ const createEntriesStorageOperations = params => {
       entryId,
       version
     } = params;
-    const queryParams = {
-      entity,
-      partitionKey: (0, _keys.createPartitionKey)({
-        tenant: model.tenant,
-        locale: model.locale,
-        id: entryId
-      }),
+    const partitionKey = createPartitionKey({
+      tenant: model.tenant,
+      id: entryId
+    });
+    const unfilteredRevisions = await entity.queryAll({
+      partitionKey,
       options: {
-        lt: `REV#${(0, _zeroPad.zeroPad)(version)}`,
-        /**
-         * We need to have extra checks because DynamoDB will return published or latest record if there is no REV# record.
-         */
-        filters: [{
-          attr: "TYPE",
-          eq: createType()
-        }, {
-          attr: "version",
-          lt: version
-        }],
+        beginsWith: `REV#`,
         reverse: true
       }
-    };
+    });
+    const filteredRevisions = unfilteredRevisions.filter(item => {
+      return item.data.version < version;
+    });
+    const storageEntry = filteredRevisions[0];
+    if (!storageEntry) {
+      return null;
+    }
     try {
-      const result = await (0, _dbDynamodb.queryOne)(queryParams);
-      const storageEntry = (0, _dbDynamodb.cleanupItem)(entity, result);
-      if (!storageEntry) {
-        return null;
-      }
       return convertFromStorageEntry({
-        storageEntry,
+        storageEntry: storageEntry.data,
         model
       });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", {
+      throw new WebinyError(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", {
         ...params,
         error: ex,
-        partitionKey: queryParams.partitionKey,
-        options: queryParams.options,
+        partitionKey,
         model
       });
     }
@@ -882,22 +803,22 @@ const createEntriesStorageOperations = params => {
     } = params;
     const limit = initialLimit <= 0 || initialLimit >= MAX_LIST_LIMIT ? MAX_LIST_LIMIT : initialLimit;
     const type = initialWhere.published ? "P" : "L";
-    const queryAllParams = {
-      entity,
-      partitionKey: (0, _keys.createGSIPartitionKey)(model, type),
-      options: {
-        index: "GSI1",
-        gte: " "
-      }
+    const partitionKey = createGSIPartitionKey(model, type);
+    const options = {
+      index: "GSI1",
+      gte: " "
     };
     let storageEntries = [];
     try {
-      storageEntries = await (0, _dbDynamodb.queryAll)(queryAllParams);
+      storageEntries = await entity.queryAll({
+        partitionKey,
+        options
+      });
     } catch (ex) {
-      throw new _error.default(ex.message, "QUERY_ENTRIES_ERROR", {
+      throw new WebinyError(ex.message, "QUERY_ENTRIES_ERROR", {
         error: ex,
-        partitionKey: queryAllParams.partitionKey,
-        options: queryAllParams.options
+        partitionKey,
+        options
       });
     }
     if (storageEntries.length === 0) {
@@ -917,7 +838,7 @@ const createEntriesStorageOperations = params => {
      * We need an object containing field, transformers and paths.
      * Just build it here and pass on into other methods that require it to avoid mapping multiple times.
      */
-    const modelFields = (0, _createFields.createFields)({
+    const modelFields = createFields({
       plugins,
       fields: model.fields
     });
@@ -929,7 +850,7 @@ const createEntriesStorageOperations = params => {
      */
     const records = await Promise.all(storageEntries.map(async storageEntry => {
       const entry = convertFromStorageEntry({
-        storageEntry,
+        storageEntry: storageEntry.data,
         model
       });
       for (const field of model.fields) {
@@ -941,7 +862,7 @@ const createEntriesStorageOperations = params => {
      * Filter the read items via the code.
      * It will build the filters out of the where input and transform the values it is using.
      */
-    const filteredItems = (0, _filtering.filter)({
+    const filteredItems = filter({
       items: records,
       where,
       plugins,
@@ -949,7 +870,8 @@ const createEntriesStorageOperations = params => {
       fullTextSearch: {
         term: search,
         fields: fields || []
-      }
+      },
+      container
     });
     const totalCount = filteredItems.length;
 
@@ -957,14 +879,14 @@ const createEntriesStorageOperations = params => {
      * Sorting is also done via the code.
      * It takes the sort input and sorts by it via the lodash sortBy method.
      */
-    const sortedItems = (0, _filtering.sort)({
+    const sortedItems = sort({
       model,
       plugins,
       items: filteredItems,
       sort: sortBy,
       fields: modelFields
     });
-    const start = parseInt((0, _cursor.decodeCursor)(after) || "0") || 0;
+    const start = parseInt(decodeCursor(after) || "0") || 0;
     const hasMoreItems = totalCount > start + limit;
     const end = limit > totalCount + start + limit ? undefined : start + limit;
     const slicedItems = sortedItems.slice(start, end);
@@ -972,12 +894,12 @@ const createEntriesStorageOperations = 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 = (0, _cursor.encodeCursor)(`${start + limit}`);
+    const cursor = encodeCursor(`${start + limit}`);
     return {
       hasMoreItems,
       totalCount,
       cursor,
-      items: (0, _dbDynamodb.cleanupItems)(entity, slicedItems)
+      items: slicedItems
     };
   };
   const get = async (initialModel, params) => {
@@ -996,18 +918,13 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
 
     /**
      * We need the latest and published entries to see if something needs to be updated alongside the publishing one.
      */
     const initialLatestStorageEntry = await getLatestRevisionByEntryId(model, entry);
     if (!initialLatestStorageEntry) {
-      throw new _error.default(`Could not publish entry. Could not load latest ("L") record.`, "PUBLISH_ERROR", {
+      throw new WebinyError(`Could not publish entry. Could not load latest ("L") record.`, "PUBLISH_ERROR", {
         entry
       });
     }
@@ -1018,22 +935,17 @@ const createEntriesStorageOperations = params => {
     });
 
     // 1. Update REV# and P records with new data.
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       put: [{
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(entry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
+        ...createEntryRevisionKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       }, {
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)(),
-        TYPE: createPublishedType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
+        ...createEntryPublishedKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       }]
     });
 
@@ -1044,12 +956,10 @@ const createEntriesStorageOperations = params => {
     if (publishingLatestRevision) {
       // 2.1 If we're publishing the latest revision, we first need to update the L record.
       entityBatch.put({
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
+        ...createEntryLatestKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       });
 
       // 2.2 Additionally, if we have a previously published entry, we need to mark it as unpublished.
@@ -1059,20 +969,18 @@ const createEntriesStorageOperations = params => {
           model
         });
         entityBatch.put({
-          ...publishedStorageEntry,
-          PK: partitionKey,
-          SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
-          TYPE: createType(),
-          status: _types.CONTENT_ENTRY_STATUS.UNPUBLISHED,
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-          GSI1_SK: (0, _keys.createGSISortKey)(publishedStorageEntry)
+          ...createEntryRevisionKeys(publishedStorageEntry),
+          data: {
+            ...publishedStorageEntry,
+            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+          }
         });
       }
     } else {
       // 2.3 If the published revision is not the latest one, the situation is a bit
       // more complex. We first need to update the L and REV# records with the new
       // values of *only entry-level* meta fields.
-      const updatedEntryLevelMetaFields = (0, _constants.pickEntryMetaFields)(entry, _constants.isEntryLevelEntryMetaField);
+      const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
       const latestStorageEntry = convertToStorageEntry({
         storageEntry: initialLatestStorageEntry,
         model
@@ -1081,8 +989,8 @@ const createEntriesStorageOperations = params => {
       // 2.3.1 Update L record. Apart from updating the entry-level meta fields, we also need
       //    to change the status from "published" to "unpublished" (if the status is set to "published").
       let latestRevisionStatus = latestStorageEntry.status;
-      if (latestRevisionStatus === _types.CONTENT_ENTRY_STATUS.PUBLISHED) {
-        latestRevisionStatus = _types.CONTENT_ENTRY_STATUS.UNPUBLISHED;
+      if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) {
+        latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
       }
       const latestStorageEntryFields = {
         ...latestStorageEntry,
@@ -1090,22 +998,18 @@ const createEntriesStorageOperations = params => {
         status: latestRevisionStatus
       };
       entityBatch.put({
-        ...latestStorageEntryFields,
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+        ...createEntryLatestKeys(latestStorageEntryFields),
+        data: {
+          ...latestStorageEntryFields
+        }
       });
 
       // 2.3.2 Update REV# record.
       entityBatch.put({
-        ...latestStorageEntryFields,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(latestStorageEntry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+        ...createEntryRevisionKeys(latestStorageEntryFields),
+        data: {
+          ...latestStorageEntryFields
+        }
       });
 
       // 2.3.3 Finally, if we got a published entry, but it wasn't the latest one, we need to take
@@ -1117,13 +1021,11 @@ const createEntriesStorageOperations = params => {
           model
         });
         entityBatch.put({
-          ...publishedStorageEntry,
-          PK: partitionKey,
-          SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
-          TYPE: createType(),
-          status: _types.CONTENT_ENTRY_STATUS.UNPUBLISHED,
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-          GSI1_SK: (0, _keys.createGSISortKey)(publishedStorageEntry)
+          ...createEntryRevisionKeys(publishedStorageEntry),
+          data: {
+            ...publishedStorageEntry,
+            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+          }
         });
       }
     }
@@ -1134,7 +1036,7 @@ const createEntriesStorageOperations = params => {
       });
       return initialStorageEntry;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute the publishing batch.", ex.code || "PUBLISH_ERROR", {
+      throw new WebinyError(ex.message || "Could not execute the publishing batch.", ex.code || "PUBLISH_ERROR", {
         entry,
         latestStorageEntry: initialLatestStorageEntry,
         publishedStorageEntry: initialPublishedStorageEntry
@@ -1147,9 +1049,8 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const partitionKey = (0, _keys.createPartitionKey)({
+    const partitionKey = createPartitionKey({
       id: entry.id,
-      locale: model.locale,
       tenant: model.tenant
     });
     const storageEntry = convertToStorageEntry({
@@ -1162,19 +1063,16 @@ const createEntriesStorageOperations = params => {
      *  - update current entry revision with new data
      *  - update the latest entry status - if entry being unpublished is latest
      */
-    const entityBatch = (0, _dbDynamodb.createEntityWriteBatch)({
-      entity,
+    const entityBatch = entity.createEntityWriter({
       delete: [{
         PK: partitionKey,
-        SK: (0, _keys.createPublishedSortKey)()
+        SK: createPublishedSortKey()
       }],
       put: [{
-        ...storageEntry,
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(entry),
-        TYPE: createType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
+        ...createEntryRevisionKeys(storageEntry),
+        data: {
+          ...storageEntry
+        }
       }]
     });
 
@@ -1186,12 +1084,10 @@ const createEntriesStorageOperations = params => {
       const unpublishingLatestRevision = entry.id === initialLatestStorageEntry.id;
       if (unpublishingLatestRevision) {
         entityBatch.put({
-          ...storageEntry,
-          PK: partitionKey,
-          SK: (0, _keys.createLatestSortKey)(),
-          TYPE: createLatestType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-          GSI1_SK: (0, _keys.createGSISortKey)(entry)
+          ...createEntryLatestKeys(storageEntry),
+          data: {
+            ...storageEntry
+          }
         });
       } else {
         const latestStorageEntry = convertToStorageEntry({
@@ -1201,28 +1097,24 @@ const createEntriesStorageOperations = params => {
 
         // If the unpublished revision is not the latest one, we still need to
         // update the latest record with the new values of entry-level meta fields.
-        const updatedEntryLevelMetaFields = (0, _constants.pickEntryMetaFields)(entry, _constants.isEntryLevelEntryMetaField);
+        const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
 
         // 1. Update actual revision record.
         entityBatch.put({
-          ...latestStorageEntry,
-          ...updatedEntryLevelMetaFields,
-          PK: partitionKey,
-          SK: (0, _keys.createRevisionSortKey)(latestStorageEntry),
-          TYPE: createType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-          GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+          ...createEntryRevisionKeys(latestStorageEntry),
+          data: {
+            ...latestStorageEntry,
+            ...updatedEntryLevelMetaFields
+          }
         });
 
         // 2. Update latest record.
         entityBatch.put({
-          ...latestStorageEntry,
-          ...updatedEntryLevelMetaFields,
-          PK: partitionKey,
-          SK: (0, _keys.createLatestSortKey)(),
-          TYPE: createLatestType(),
-          GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-          GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
+          ...createEntryLatestKeys(latestStorageEntry),
+          data: {
+            ...latestStorageEntry,
+            ...updatedEntryLevelMetaFields
+          }
         });
       }
     }
@@ -1233,7 +1125,7 @@ const createEntriesStorageOperations = params => {
       });
       return initialStorageEntry;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute unpublish batch.", ex.code || "UNPUBLISH_ERROR", {
+      throw new WebinyError(ex.message || "Could not execute unpublish batch.", ex.code || "UNPUBLISH_ERROR", {
         entry,
         storageEntry
       });
@@ -1246,7 +1138,7 @@ const createEntriesStorageOperations = params => {
     } = params;
     const field = model.fields.find(f => f.fieldId === fieldId);
     if (!field) {
-      throw new _error.default(`Could not find field with given "fieldId" value.`, "FIELD_NOT_FOUND", {
+      throw new WebinyError(`Could not find field with given "fieldId" value.`, "FIELD_NOT_FOUND", {
         fieldId
       });
     }
@@ -1301,6 +1193,5 @@ const createEntriesStorageOperations = params => {
     getUniqueFieldValues
   };
 };
-exports.createEntriesStorageOperations = createEntriesStorageOperations;
 
 //# sourceMappingURL=index.js.map