@webiny/api-headless-cms-ddb-es 5.33.5 → 5.34.0-beta.0

package/operations/entry/index.js

@@ -1,13 +1,17 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createPublishedType = exports.createLatestType = exports.createEntriesStorageOperations = void 0;
+exports.createEntriesStorageOperations = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
+var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _types = require("@webiny/api-headless-cms/types");
 
@@ -15,12 +19,6 @@ var _helpers = require("../../helpers");
 
 var _configurations = require("../../configurations");
 
-var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-
-var _omit = _interopRequireDefault(require("lodash/omit"));
-
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
 
 var _dataLoaders = require("./dataLoaders");
@@ -37,50 +35,36 @@ var _utils = require("@webiny/utils");
 
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 
-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; }
+var _body = require("./elasticsearch/body");
 
-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; }
+var _recordType = require("./recordType");
 
-const createType = () => {
-  return "cms.entry";
-};
-
-const createLatestType = () => {
-  return `${createType()}.l`;
-};
-
-exports.createLatestType = createLatestType;
-
-const createPublishedType = () => {
-  return `${createType()}.p`;
-};
-
-exports.createPublishedType = createPublishedType;
-
-const getEntryData = entry => {
-  return _objectSpread(_objectSpread({}, (0, _omit.default)(entry, ["PK", "SK", "published", "latest"])), {}, {
-    TYPE: createType(),
-    __type: createType()
-  });
+const getEntryData = input => {
+  const output = (0, _objectSpread2.default)({}, input);
+  delete output["PK"];
+  delete output["SK"];
+  delete output["published"];
+  delete output["latest"];
+  return output;
 };
 
 const getESLatestEntryData = async (plugins, entry) => {
-  return (0, _apiElasticsearch.compress)(plugins, _objectSpread(_objectSpread({}, getEntryData(entry)), {}, {
+  return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     latest: true,
-    TYPE: createLatestType(),
-    __type: createLatestType()
+    TYPE: (0, _recordType.createLatestRecordType)(),
+    __type: (0, _recordType.createLatestRecordType)()
   }));
 };
 
 const getESPublishedEntryData = async (plugins, entry) => {
-  return (0, _apiElasticsearch.compress)(plugins, _objectSpread(_objectSpread({}, getEntryData(entry)), {}, {
+  return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     published: true,
-    TYPE: createPublishedType(),
-    __type: createPublishedType()
+    TYPE: (0, _recordType.createPublishedRecordType)(),
+    __type: (0, _recordType.createPublishedRecordType)()
   }));
 };
 
-const convertToStorageEntry = params => {
+const convertEntryKeysToStorage = params => {
   const {
     model,
     entry
@@ -89,12 +73,12 @@ const convertToStorageEntry = params => {
     fields: model.fields,
     values: entry.values
   });
-  return _objectSpread(_objectSpread({}, entry), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
     values
   });
 };
 
-const convertFromStorageEntry = params => {
+const convertEntryKeysFromStorage = params => {
   const {
     model,
     entry
@@ -103,7 +87,7 @@ const convertFromStorageEntry = params => {
     fields: model.fields,
     values: entry.values
   });
-  return _objectSpread(_objectSpread({}, entry), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
     values
   });
 };
@@ -126,21 +110,21 @@ const createEntriesStorageOperations = params => {
     } = params;
     const isPublished = initialEntry.status === "published";
     const locked = isPublished ? true : initialEntry.locked;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
     const esEntry = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
-      entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
+      entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
         locked
       })),
-      storageEntry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
       }))
     });
@@ -177,21 +161,21 @@ const createEntriesStorageOperations = params => {
       }),
       SK: (0, _keys.createPublishedSortKey)()
     };
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, revisionKeys), {}, {
-      TYPE: createType()
-    })), entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      TYPE: (0, _recordType.createRecordType)()
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, latestKeys), {}, {
-      TYPE: createLatestType()
+      TYPE: (0, _recordType.createLatestRecordType)()
     }))];
 
     if (isPublished) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
       }, publishedKeys), {}, {
-        TYPE: createPublishedType()
+        TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
 
@@ -211,13 +195,13 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    const esItems = [esEntity.putBatch(_objectSpread(_objectSpread({}, latestKeys), {}, {
+    const esItems = [esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
       index: esIndex,
       data: esLatestData
     }))];
 
     if (isPublished) {
-      esItems.push(esEntity.putBatch(_objectSpread(_objectSpread({}, publishedKeys), {}, {
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: esPublishedData
       })));
@@ -244,11 +228,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -275,10 +259,10 @@ const createEntriesStorageOperations = params => {
       storageEntry: (0, _cloneDeep.default)(storageEntry)
     });
     const esLatestData = await getESLatestEntryData(plugins, esEntry);
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createType()
-    }, revisionKeys)), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createLatestType()
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      TYPE: (0, _recordType.createRecordType)()
+    }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      TYPE: (0, _recordType.createLatestRecordType)()
     }, latestKeys))];
 
     const {
@@ -308,7 +292,7 @@ const createEntriesStorageOperations = params => {
 
 
     try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
+      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
         data: esLatestData
       }));
@@ -331,11 +315,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -377,17 +361,17 @@ const createEntriesStorageOperations = params => {
       model,
       ids: [entry.id]
     });
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, revisionKeys), {}, {
-      TYPE: createType()
+      TYPE: (0, _recordType.createRecordType)()
     }))];
 
     if (isPublished) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
       }, publishedKeys), {}, {
-        TYPE: createPublishedType()
+        TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
 
@@ -414,7 +398,7 @@ const createEntriesStorageOperations = params => {
       /**
        * First we update the regular DynamoDB table
        */
-      items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), latestKeys), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), latestKeys), {}, {
         TYPE: (0, _keys.createLatestSortKey)()
       })));
       /**
@@ -424,15 +408,15 @@ const createEntriesStorageOperations = params => {
       esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
-        entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
+        entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
           locked
         })),
-        storageEntry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, storageEntry), {}, {
+        storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
           locked
         }))
       });
       elasticsearchLatestData = await getESLatestEntryData(plugins, esEntry);
-      esItems.push(esEntity.putBatch(_objectSpread(_objectSpread({}, latestKeys), {}, {
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index: esIndex,
         data: elasticsearchLatestData
       })));
@@ -449,10 +433,10 @@ const createEntriesStorageOperations = params => {
           esEntry = (0, _helpers.prepareEntryToIndex)({
             plugins,
             model,
-            entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
+            entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
               locked
             })),
-            storageEntry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, storageEntry), {}, {
+            storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
               locked
             }))
           });
@@ -460,15 +444,15 @@ const createEntriesStorageOperations = params => {
 
         elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
       } else {
-        elasticsearchPublishedData = _objectSpread(_objectSpread({}, elasticsearchLatestData), {}, {
+        elasticsearchPublishedData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, elasticsearchLatestData), {}, {
           published: true,
-          TYPE: createPublishedType(),
-          __type: createPublishedType()
+          TYPE: (0, _recordType.createPublishedRecordType)(),
+          __type: (0, _recordType.createPublishedRecordType)()
         });
         delete elasticsearchPublishedData.latest;
       }
 
-      esItems.push(esEntity.putBatch(_objectSpread(_objectSpread({}, publishedKeys), {}, {
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: elasticsearchPublishedData
       })));
@@ -639,10 +623,10 @@ const createEntriesStorageOperations = params => {
        * In the end we need to set the new latest entry
        */
 
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, latestStorageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType()
+        TYPE: (0, _recordType.createLatestRecordType)()
       })));
       esItems.push(esEntity.putBatch({
         PK: partitionKey,
@@ -689,6 +673,8 @@ const createEntriesStorageOperations = params => {
   };
 
   const list = async (model, params) => {
+    var _response, _response$body;
+
     const limit = (0, _apiElasticsearch.createLimit)(params.limit, 50);
 
     const {
@@ -702,7 +688,7 @@ const createEntriesStorageOperations = params => {
         index
       });
 
-      if (!result || !result.body) {
+      if (!(result !== null && result !== void 0 && result.body)) {
         return {
           hasMoreItems: false,
           totalCount: 0,
@@ -717,13 +703,13 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    const body = (0, _helpers.createElasticsearchQueryBody)({
+    const body = (0, _body.createElasticsearchBody)({
       model,
-      args: _objectSpread(_objectSpread({}, params), {}, {
-        limit
+      params: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+        limit,
+        after: (0, _apiElasticsearch.decodeCursor)(params.after)
       }),
-      plugins,
-      parentPath: "values"
+      plugins
     });
     let response;
 
@@ -744,13 +730,13 @@ const createEntriesStorageOperations = params => {
     const {
       hits,
       total
-    } = response.body.hits;
+    } = ((_response = response) === null || _response === void 0 ? void 0 : (_response$body = _response.body) === null || _response$body === void 0 ? void 0 : _response$body.hits) || {};
     const items = (0, _helpers.extractEntriesFromIndex)({
       plugins,
       model,
       entries: hits.map(item => item._source)
     }).map(item => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry: item
       });
@@ -781,7 +767,7 @@ 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
     }));
     return items.shift() || null;
@@ -792,11 +778,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -847,8 +833,8 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), revisionKeys), {}, {
-      TYPE: createType()
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), revisionKeys), {}, {
+      TYPE: (0, _recordType.createRecordType)()
     }))];
     const esItems = [];
 
@@ -869,20 +855,15 @@ const createEntriesStorageOperations = params => {
       const [previouslyPublishedEntry] = await dataLoaders.getRevisionById({
         model,
         ids: [publishedStorageEntry.id]
-      }); //
-      // const previouslyPublishedEntry = convertToStorageEntry({
-      //     model,
-      //     entry: initialPreviouslyPublishedEntry
-      // });
-
+      });
       items.push(
       /**
        * Update currently published entry (unpublish it)
        */
-      entity.putBatch(_objectSpread(_objectSpread({}, previouslyPublishedEntry), {}, {
+      entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedEntry), {}, {
         status: _types.CONTENT_ENTRY_STATUS.UNPUBLISHED,
         savedOn: entry.savedOn,
-        TYPE: createType(),
+        TYPE: (0, _recordType.createRecordType)(),
         PK: (0, _keys.createPartitionKey)(publishedStorageEntry),
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry)
       })));
@@ -892,8 +873,8 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), publishedKeys), {}, {
-      TYPE: createPublishedType()
+    items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), publishedKeys), {}, {
+      TYPE: (0, _recordType.createPublishedRecordType)()
     })));
     /**
      * We need the latest entry to check if it needs to be updated as well in the Elasticsearch.
@@ -905,7 +886,7 @@ const createEntriesStorageOperations = params => {
     });
 
     if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), latestKeys)));
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), latestKeys)));
     }
     /**
      * If we are publishing the latest revision, let's also update the latest revision's status in ES.
@@ -923,7 +904,7 @@ const createEntriesStorageOperations = params => {
         index,
         PK: (0, _keys.createPartitionKey)(latestEsEntryDataDecompressed),
         SK: (0, _keys.createLatestSortKey)(),
-        data: await getESLatestEntryData(plugins, _objectSpread(_objectSpread({}, latestEsEntryDataDecompressed), {}, {
+        data: await getESLatestEntryData(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
           status: _types.CONTENT_ENTRY_STATUS.PUBLISHED,
           locked: true,
           savedOn: entry.savedOn,
@@ -943,7 +924,7 @@ const createEntriesStorageOperations = params => {
      */
 
     const esPublishedData = await getESPublishedEntryData(plugins, preparedEntryData);
-    esItems.push(esEntity.putBatch(_objectSpread(_objectSpread({}, publishedKeys), {}, {
+    esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
       index,
       data: esPublishedData
     })));
@@ -994,11 +975,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -1018,10 +999,10 @@ 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()
+      TYPE: (0, _recordType.createRecordType)()
     }))];
     const esItems = [esEntity.deleteBatch({
       PK: partitionKey,
@@ -1091,195 +1072,6 @@ const createEntriesStorageOperations = params => {
     return initialStorageEntry;
   };
 
-  const requestReview = async (model, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const entry = convertToStorageEntry({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertToStorageEntry({
-      model,
-      entry: initialStorageEntry
-    });
-    /**
-     * We need the latest entry to check if it needs to be updated.
-     */
-
-    const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
-    /**
-     * If we updated the latest version, then make sure the changes are propagated to ES too.
-     */
-
-    let esLatestData = null;
-
-    const {
-      index
-    } = _configurations.configurations.es({
-      model
-    });
-
-    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
-      const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
-        plugins,
-        model,
-        entry: (0, _cloneDeep.default)(entry),
-        storageEntry: (0, _cloneDeep.default)(storageEntry)
-      });
-      esLatestData = await getESLatestEntryData(plugins, preparedEntryData);
-    }
-
-    try {
-      await entity.put(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createRevisionSortKey)(entry),
-        TYPE: createType()
-      }));
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not store request review entry record into DynamoDB table.", ex.code || "REQUEST_REVIEW_ERROR", {
-        entry,
-        storageEntry,
-        latestStorageEntry
-      });
-    }
-    /**
-     * No need to proceed further if nothing to put into Elasticsearch.
-     */
-
-
-    if (!esLatestData) {
-      return initialStorageEntry;
-    }
-
-    try {
-      await esEntity.put({
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        index,
-        data: esLatestData
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not store request review entry record into DynamoDB Elasticsearch table.", ex.code || "REQUEST_REVIEW_ERROR", {
-        entry,
-        storageEntry,
-        latestStorageEntry
-      });
-    }
-
-    return initialStorageEntry;
-  };
-
-  const requestChanges = async (model, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const entry = convertToStorageEntry({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertToStorageEntry({
-      model,
-      entry: initialStorageEntry
-    });
-    /**
-     * We need the latest entry to check if it needs to be updated.
-     */
-
-    const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entry),
-      TYPE: createType()
-    }))];
-    /**
-     * If we updated the latest version, then make sure the changes are propagated to ES too.
-     */
-
-    const {
-      index
-    } = _configurations.configurations.es({
-      model
-    });
-
-    let esLatestData = null;
-
-    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType()
-      })));
-      const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
-        plugins,
-        model,
-        entry: (0, _cloneDeep.default)(entry),
-        storageEntry: (0, _cloneDeep.default)(storageEntry)
-      });
-      esLatestData = await getESLatestEntryData(plugins, preparedEntryData);
-    }
-
-    try {
-      await (0, _batchWrite.batchWriteAll)({
-        table: entity.table,
-        items
-      });
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not store request changes entry record into DynamoDB table.", ex.code || "REQUEST_CHANGES_ERROR", {
-        entry,
-        latestStorageEntry
-      });
-    }
-    /**
-     * No need to proceed further if nothing to put into Elasticsearch.
-     */
-
-
-    if (!esLatestData) {
-      return initialStorageEntry;
-    }
-
-    try {
-      await esEntity.put({
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        index,
-        data: esLatestData
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not store request changes entry record into DynamoDB Elasticsearch table.", ex.code || "REQUEST_CHANGES_ERROR", {
-        entry,
-        latestStorageEntry
-      });
-    }
-
-    return initialStorageEntry;
-  };
-
   const getLatestRevisionByEntryId = async (model, params) => {
     const [entry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
@@ -1290,7 +1082,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1306,7 +1098,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1322,7 +1114,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1334,7 +1126,7 @@ const createEntriesStorageOperations = params => {
       ids: [params.id]
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1347,7 +1139,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1360,7 +1152,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1373,7 +1165,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1404,7 +1196,7 @@ const createEntriesStorageOperations = params => {
          */
         filters: [{
           attr: "TYPE",
-          eq: createType()
+          eq: (0, _recordType.createRecordType)()
         }, {
           attr: "version",
           lt: version
@@ -1421,12 +1213,12 @@ const createEntriesStorageOperations = params => {
         return null;
       }
 
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         entry,
         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,
@@ -1444,8 +1236,6 @@ const createEntriesStorageOperations = params => {
     get,
     publish,
     unpublish,
-    requestReview,
-    requestChanges,
     list,
     getLatestRevisionByEntryId,
     getPublishedRevisionByEntryId,