@webiny/api-headless-cms-ddb 0.0.0-mt-3 → 0.0.0-unstable.3386f66516

package/operations/entry/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEntriesStorageOperations = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -15,8 +15,6 @@ var _dataLoaders = require("./dataLoaders");
 
 var _types = require("@webiny/api-headless-cms/types");
 
-var _utils = require("./utils");
-
 var _keys = require("./keys");
 
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
@@ -31,9 +29,9 @@ var _zeroPad = require("@webiny/utils/zeroPad");
 
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _createFields = require("./filtering/createFields");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _filtering = require("./filtering");
 
 const createType = () => {
   return "cms.entry";
@@ -47,6 +45,34 @@ const createPublishedType = () => {
   return `${createType()}.p`;
 };
 
+const convertToStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyToStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+    values
+  });
+};
+
+const convertFromStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyFromStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+    values
+  });
+};
+
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -82,31 +108,57 @@ const createEntriesStorageOperations = params => {
     };
   };
 
-  const create = async (model, args) => {
+  const create = async (model, params) => {
     const {
       entry,
-      storageEntry
-    } = args;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
+      storageEntry: initialStorageEntry
+    } = params;
+    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
+    });
     /**
      * We need to:
      *  - create new main entry item
      *  - create new or update latest entry item
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked,
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked,
       PK: partitionKey,
       SK: (0, _keys.createLatestSortKey)(),
       TYPE: createLatestType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
     }))];
+    /**
+     * We need to create published entry if
+     */
+
+    if (isPublished) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked,
+        PK: partitionKey,
+        SK: (0, _keys.createPublishedSortKey)(),
+        TYPE: createLatestType(),
+        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
+        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+      })));
+    }
 
     try {
       await (0, _batchWrite.batchWriteAll)({
@@ -123,30 +175,36 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const createRevisionFrom = async (model, params) => {
     const {
-      originalEntry,
       entry,
-      storageEntry,
-      latestEntry
+      storageEntry: initialStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(storageEntry);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - create the main entry item
      *  - update the last entry item to a current one
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(storageEntry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createLatestSortKey)(),
       TYPE: createLatestType(),
@@ -165,8 +223,6 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create revision from given entry.", ex.code || "CREATE_REVISION_ERROR", {
         error: ex,
-        originalEntry,
-        latestEntry,
         entry,
         storageEntry
       });
@@ -176,38 +232,61 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const update = async (model, params) => {
     const {
-      originalEntry,
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(originalEntry);
+    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 items = [];
+    const storageEntry = convertToStorageEntry({
+      model,
+      storageEntry: initialStorageEntry
+    });
     /**
      * We need to:
      *  - update the current entry
      *  - update the latest entry if the current entry is the latest one
      */
 
-    items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked,
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(storageEntry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
     })));
+
+    if (isPublished) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked,
+        PK: partitionKey,
+        SK: (0, _keys.createPublishedSortKey)(),
+        TYPE: createPublishedType(),
+        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
+        GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
+      })));
+    }
     /**
      * We need the latest entry to update it as well if neccessary.
      */
 
+
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
     if (latestStorageEntry && latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked,
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -224,11 +303,10 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return storageEntry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update entry.", ex.code || "UPDATE_ERROR", {
         error: ex,
-        originalEntry,
         entry,
         latestStorageEntry
       });
@@ -241,7 +319,11 @@ const createEntriesStorageOperations = params => {
     } = params;
     const queryAllParams = {
       entity,
-      partitionKey: (0, _keys.createPartitionKey)(entry),
+      partitionKey: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       options: {
         gte: " "
       }
@@ -283,34 +365,42 @@ const createEntriesStorageOperations = params => {
 
   const deleteRevision = async (model, params) => {
     const {
-      entryToDelete,
-      entryToSetAsLatest,
-      storageEntryToSetAsLatest
+      entry,
+      latestEntry,
+      latestStorageEntry: initialLatestStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entryToDelete);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
     const items = [entity.deleteBatch({
       PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entryToDelete)
+      SK: (0, _keys.createRevisionSortKey)(entry)
     })];
-    const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entryToDelete);
+    const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
     /**
      * If revision we are deleting is the published one as well, we need to delete those records as well.
      */
 
-    if (publishedStorageEntry && entryToDelete.id === publishedStorageEntry.id) {
+    if (publishedStorageEntry && entry.id === publishedStorageEntry.id) {
       items.push(entity.deleteBatch({
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)()
       }));
     }
 
-    if (storageEntryToSetAsLatest) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntryToSetAsLatest), {}, {
+    if (initialLatestStorageEntry) {
+      const latestStorageEntry = convertToStorageEntry({
+        storageEntry: initialLatestStorageEntry,
+        model
+      });
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
         GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(storageEntryToSetAsLatest)
+        GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
       })));
     }
 
@@ -325,91 +415,116 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message, ex.code, {
         error: ex,
-        entryToDelete,
-        entryToSetAsLatest
+        entry,
+        latestEntry
       });
     }
   };
 
-  const getAllRevisionsByIds = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
-      model,
-      ids: params.ids
-    });
-  };
-
   const getLatestRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getLatestRevisionByEntryId({
+    const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
+    const item = items.shift() || null;
 
-    if (result.length === 0) {
+    if (!item) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getPublishedRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getPublishedRevisionByEntryId({
+    const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
+    const item = items.shift() || null;
 
-    if (result.length === 0) {
+    if (!item) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getRevisionById = async (model, params) => {
-    const result = await dataLoaders.getRevisionById({
+    const items = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
+    const item = items.shift() || null;
 
-    if (result.length === 0) {
+    if (!item) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getRevisions = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
+    const items = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getByIds = async (model, params) => {
-    return dataLoaders.getRevisionById({
+    const items = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getLatestByIds = async (model, params) => {
-    return dataLoaders.getLatestRevisionByEntryId({
+    const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getPublishedByIds = async (model, params) => {
-    return dataLoaders.getPublishedRevisionByEntryId({
+    const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getPreviousRevision = async (model, params) => {
-    const {
-      tenant,
-      locale
-    } = model;
     const {
       entryId,
       version
@@ -417,8 +532,8 @@ const createEntriesStorageOperations = params => {
     const queryParams = {
       entity,
       partitionKey: (0, _keys.createPartitionKey)({
-        tenant,
-        locale,
+        tenant: model.tenant,
+        locale: model.locale,
         id: entryId
       }),
       options: {
@@ -440,9 +555,18 @@ const createEntriesStorageOperations = params => {
 
     try {
       const result = await (0, _query.queryOne)(queryParams);
-      return (0, _cleanup.cleanupItem)(entity, result);
+      const storageEntry = (0, _cleanup.cleanupItem)(entity, result);
+
+      if (!storageEntry) {
+        return null;
+      }
+
+      return convertFromStorageEntry({
+        storageEntry,
+        model
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", _objectSpread(_objectSpread({}, params), {}, {
+      throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
         error: ex,
         partitionKey: queryParams.partitionKey,
         options: queryParams.options,
@@ -454,12 +578,14 @@ const createEntriesStorageOperations = params => {
   const list = async (model, params) => {
     const {
       limit: initialLimit = 10,
-      where: originalWhere,
+      where: initialWhere,
       after,
-      sort
+      sort: sortBy,
+      fields,
+      search
     } = params;
-    const limit = initialLimit <= 0 || initialLimit >= 100 ? 100 : initialLimit;
-    const type = originalWhere.published ? "P" : "L";
+    const limit = initialLimit <= 0 || initialLimit >= 10000 ? 10000 : initialLimit;
+    const type = initialWhere.published ? "P" : "L";
     const queryAllParams = {
       entity,
       partitionKey: (0, _keys.createGSIPartitionKey)(model, type),
@@ -468,10 +594,10 @@ const createEntriesStorageOperations = params => {
         gte: " "
       }
     };
-    let records = [];
+    let storageEntries = [];
 
     try {
-      records = await (0, _query.queryAll)(queryAllParams);
+      storageEntries = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
       throw new _error.default(ex.message, "QUERY_ENTRIES_ERROR", {
         error: ex,
@@ -480,7 +606,7 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    if (records.length === 0) {
+    if (storageEntries.length === 0) {
       return {
         hasMoreItems: false,
         totalCount: 0,
@@ -489,32 +615,51 @@ const createEntriesStorageOperations = params => {
       };
     }
 
-    const where = _objectSpread({}, originalWhere);
-
+    const where = (0, _objectSpread2.default)({}, initialWhere);
     delete where["published"];
     delete where["latest"];
-    delete where["locale"];
-    delete where["tenant"];
     /**
-     * We need a object containing field, transformers and paths.
+     * 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, _utils.buildModelFields)({
+    const modelFields = (0, _createFields.createFields)({
       plugins,
-      model
+      fields: model.fields
     });
+    const fromStorage = createStorageTransformCallable(model);
+    /**
+     * Let's transform records from storage ones to regular ones, so we do not need to do it later.
+     *
+     * This is always being done, but at least its in parallel.
+     */
+
+    const records = await Promise.all(storageEntries.map(async storageEntry => {
+      const entry = convertFromStorageEntry({
+        storageEntry,
+        model
+      });
+
+      for (const field of model.fields) {
+        entry.values[field.fieldId] = await fromStorage(field, entry.values[field.fieldId]);
+      }
+
+      return entry;
+    }));
     /**
      * 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 = await (0, _utils.filterItems)({
+    const filteredItems = (0, _filtering.filter)({
       items: records,
       where,
       plugins,
       fields: modelFields,
-      fromStorage: createStorageTransformCallable(model)
+      fullTextSearch: {
+        term: search,
+        fields: fields || []
+      }
     });
     const totalCount = filteredItems.length;
     /**
@@ -522,12 +667,14 @@ const createEntriesStorageOperations = params => {
      * It takes the sort input and sorts by it via the lodash sortBy method.
      */
 
-    const sortedItems = (0, _utils.sortEntryItems)({
+    const sortedItems = (0, _filtering.sort)({
+      model,
+      plugins,
       items: filteredItems,
-      sort,
+      sort: sortBy,
       fields: modelFields
     });
-    const start = (0, _cursor.decodeCursor)(after) || 0;
+    const start = parseInt((0, _cursor.decodeCursor)(after) || "0") || 0;
     const hasMoreItems = totalCount > start + limit;
     const end = limit > totalCount + start + limit ? undefined : start + limit;
     const slicedItems = sortedItems.slice(start, end);
@@ -536,7 +683,7 @@ const createEntriesStorageOperations = params => {
      * Number is simply encoded.
      */
 
-    const cursor = totalCount > start + limit ? (0, _cursor.encodeCursor)(start + limit) : null;
+    const cursor = totalCount > start + limit ? (0, _cursor.encodeCursor)(`${start + limit}`) : null;
     return {
       hasMoreItems,
       totalCount,
@@ -548,137 +695,32 @@ const createEntriesStorageOperations = params => {
   const get = async (model, params) => {
     const {
       items
-    } = await list(model, _objectSpread(_objectSpread({}, params), {}, {
+    } = await list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
       limit: 1
     }));
-
-    if (items.length === 0) {
-      return null;
-    }
-
-    return items.shift();
-  };
-
-  const requestChanges = async (model, params) => {
-    const {
-      entry,
-      storageEntry,
-      originalEntry
-    } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
-    /**
-     * We need to:
-     *  - update the existing entry
-     *  - update latest version - if existing entry is the latest version
-     */
-
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createType(),
-      PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entry),
-      GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-      GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    }))];
-    /**
-     * We need the latest entry to see if something needs to be updated along side the request changes one.
-     */
-
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
-    if (latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
-      })));
-    }
-
-    try {
-      await (0, _batchWrite.batchWriteAll)({
-        table: entity.table,
-        items
-      });
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute the request changes batch.", ex.code || "REQUEST_CHANGES_ERROR", {
-        entry,
-        originalEntry
-      });
-    }
-
-    return entry;
-  };
-
-  const requestReview = async (model, params) => {
-    const {
-      entry,
-      storageEntry,
-      originalEntry
-    } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
-    /**
-     * We need to:
-     *  - update existing entry
-     *  - update latest entry - if existing entry is the latest entry
-     */
-
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createType(),
-      PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entry),
-      GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-      GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    }))];
-    /**
-     * We need the latest entry to see if something needs to be updated along side the request review one.
-     */
-
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
-    if (latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
-      })));
-    }
-
-    try {
-      await (0, _batchWrite.batchWriteAll)({
-        table: entity.table,
-        items
-      });
-      dataLoaders.clearAll({
-        model
-      });
-      return entry;
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute request review batch.", ex.code || "REQUEST_REVIEW_ERROR", {
-        entry,
-        storageEntry,
-        originalEntry
-      });
-    }
+    return items.shift() || null;
   };
 
   const publish = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
+    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 along side the publishing one.
      */
 
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-    const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
+    const initialLatestStorageEntry = await getLatestRevisionByEntryId(model, entry);
+    const initialPublishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
+    const storageEntry = convertToStorageEntry({
+      model,
+      storageEntry: initialStorageEntry
+    });
     /**
      * We need to update:
      *  - current entry revision sort key
@@ -687,13 +729,13 @@ const createEntriesStorageOperations = params => {
      *  - previous published entry to unpublished status - if any previously published entry
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createPublishedSortKey)(),
       TYPE: createPublishedType(),
@@ -701,8 +743,8 @@ const createEntriesStorageOperations = params => {
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
     }))];
 
-    if (entry.id === latestStorageEntry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    if (initialLatestStorageEntry && entry.id === initialLatestStorageEntry.id) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -711,8 +753,12 @@ const createEntriesStorageOperations = params => {
       })));
     }
 
-    if (publishedStorageEntry) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, publishedStorageEntry), {}, {
+    if (initialPublishedStorageEntry && initialPublishedStorageEntry.id !== entry.id) {
+      const publishedStorageEntry = convertToStorageEntry({
+        storageEntry: initialPublishedStorageEntry,
+        model
+      });
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
         TYPE: createType(),
@@ -730,12 +776,12 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return entry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute the publishing batch.", ex.code || "PUBLISH_ERROR", {
         entry,
-        latestStorageEntry,
-        publishedStorageEntry
+        latestStorageEntry: initialLatestStorageEntry,
+        publishedStorageEntry: initialPublishedStorageEntry
       });
     }
   };
@@ -743,9 +789,17 @@ const createEntriesStorageOperations = params => {
   const unpublish = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - delete currently published entry
@@ -756,7 +810,7 @@ const createEntriesStorageOperations = params => {
     const items = [entity.deleteBatch({
       PK: partitionKey,
       SK: (0, _keys.createPublishedSortKey)()
-    }), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    }), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
@@ -769,8 +823,8 @@ const createEntriesStorageOperations = params => {
 
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
-    if (entry.id === latestStorageEntry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    if (latestStorageEntry && entry.id === latestStorageEntry.id) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -787,7 +841,7 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return storageEntry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute unpublish batch.", ex.code || "UNPUBLISH_ERROR", {
         entry,
@@ -808,12 +862,9 @@ const createEntriesStorageOperations = params => {
     getByIds,
     getRevisionById,
     getPublishedRevisionByEntryId,
-    getAllRevisionsByIds,
     getLatestRevisionByEntryId,
     get,
     getRevisions,
-    requestChanges,
-    requestReview,
     publish,
     list,
     unpublish