@webiny/api-headless-cms-ddb 0.0.0-mt-3 → 0.0.0-unstable.8c4d9f045a

package/operations/entry/index.js

@@ -31,9 +31,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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-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; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const createType = () => {
   return "cms.entry";
@@ -47,6 +47,34 @@ const createPublishedType = () => {
   return `${createType()}.p`;
 };
 
+const convertToStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyToStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+    values
+  });
+};
+
+const convertFromStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyFromStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+    values
+  });
+};
+
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -82,12 +110,22 @@ 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
@@ -95,18 +133,34 @@ const createEntriesStorageOperations = params => {
      */
 
     const items = [entity.putBatch(_objectSpread(_objectSpread({}, 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), {}, {
+      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(_objectSpread(_objectSpread({}, 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,17 +177,23 @@ 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
@@ -165,8 +225,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,17 +234,26 @@ 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
@@ -194,20 +261,34 @@ const createEntriesStorageOperations = params => {
      */
 
     items.push(entity.putBatch(_objectSpread(_objectSpread({}, 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(_objectSpread(_objectSpread({}, 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), {}, {
+        locked,
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -224,11 +305,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 +321,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 +367,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(_objectSpread(_objectSpread({}, 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 +417,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 +534,8 @@ const createEntriesStorageOperations = params => {
     const queryParams = {
       entity,
       partitionKey: (0, _keys.createPartitionKey)({
-        tenant,
-        locale,
+        tenant: model.tenant,
+        locale: model.locale,
         id: entryId
       }),
       options: {
@@ -440,7 +557,16 @@ 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), {}, {
         error: ex,
@@ -454,12 +580,14 @@ const createEntriesStorageOperations = params => {
   const list = async (model, params) => {
     const {
       limit: initialLimit = 10,
-      where: originalWhere,
+      where: initialWhere,
       after,
-      sort
+      sort,
+      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),
@@ -489,12 +617,10 @@ const createEntriesStorageOperations = params => {
       };
     }
 
-    const where = _objectSpread({}, originalWhere);
+    const where = _objectSpread({}, initialWhere);
 
     delete where["published"];
     delete where["latest"];
-    delete where["locale"];
-    delete where["tenant"];
     /**
      * We need a object containing field, transformers and paths.
      * Just build it here and pass on into other methods that require it to avoid mapping multiple times.
@@ -510,11 +636,20 @@ const createEntriesStorageOperations = params => {
      */
 
     const filteredItems = await (0, _utils.filterItems)({
-      items: records,
+      items: records.map(record => {
+        return convertFromStorageEntry({
+          storageEntry: record,
+          model
+        });
+      }),
       where,
       plugins,
       fields: modelFields,
-      fromStorage: createStorageTransformCallable(model)
+      fromStorage: createStorageTransformCallable(model),
+      fullTextSearch: {
+        term: search,
+        fields: fields || []
+      }
     });
     const totalCount = filteredItems.length;
     /**
@@ -527,7 +662,7 @@ const createEntriesStorageOperations = params => {
       sort,
       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 +671,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,
@@ -551,21 +686,23 @@ const createEntriesStorageOperations = params => {
     } = await list(model, _objectSpread(_objectSpread({}, params), {}, {
       limit: 1
     }));
-
-    if (items.length === 0) {
-      return null;
-    }
-
-    return items.shift();
+    return items.shift() || null;
   };
 
   const requestChanges = async (model, params) => {
     const {
       entry,
-      storageEntry,
-      originalEntry
+      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:
      *  - update the existing entry
@@ -585,7 +722,7 @@ const createEntriesStorageOperations = params => {
 
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
-    if (latestStorageEntry.id === entry.id) {
+    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -605,8 +742,7 @@ const createEntriesStorageOperations = params => {
       });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute the request changes batch.", ex.code || "REQUEST_CHANGES_ERROR", {
-        entry,
-        originalEntry
+        entry
       });
     }
 
@@ -616,10 +752,17 @@ const createEntriesStorageOperations = params => {
   const requestReview = async (model, params) => {
     const {
       entry,
-      storageEntry,
-      originalEntry
+      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:
      *  - update existing entry
@@ -639,7 +782,7 @@ const createEntriesStorageOperations = params => {
 
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
-    if (latestStorageEntry.id === entry.id) {
+    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -657,12 +800,11 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return entry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute request review batch.", ex.code || "REQUEST_REVIEW_ERROR", {
         entry,
-        storageEntry,
-        originalEntry
+        storageEntry
       });
     }
   };
@@ -670,15 +812,23 @@ const createEntriesStorageOperations = params => {
   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
@@ -701,7 +851,7 @@ const createEntriesStorageOperations = params => {
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
     }))];
 
-    if (entry.id === latestStorageEntry.id) {
+    if (initialLatestStorageEntry && entry.id === initialLatestStorageEntry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -711,7 +861,11 @@ const createEntriesStorageOperations = params => {
       })));
     }
 
-    if (publishedStorageEntry) {
+    if (initialPublishedStorageEntry && initialPublishedStorageEntry.id !== entry.id) {
+      const publishedStorageEntry = convertToStorageEntry({
+        storageEntry: initialPublishedStorageEntry,
+        model
+      });
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, publishedStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
@@ -730,12 +884,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 +897,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
@@ -769,7 +931,7 @@ const createEntriesStorageOperations = params => {
 
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
-    if (entry.id === latestStorageEntry.id) {
+    if (latestStorageEntry && entry.id === latestStorageEntry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -787,7 +949,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,7 +970,6 @@ const createEntriesStorageOperations = params => {
     getByIds,
     getRevisionById,
     getPublishedRevisionByEntryId,
-    getAllRevisionsByIds,
     getLatestRevisionByEntryId,
     get,
     getRevisions,