@webiny/api-headless-cms-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.1e66d121db

package/operations/entry/index.js

@@ -1,25 +1,25 @@
 "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;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _types = require("@webiny/api-headless-cms/types");
 
 var _helpers = require("../../helpers");
 
-var _configurations = _interopRequireDefault(require("../../configurations"));
+var _configurations = require("../../configurations");
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var _lodash2 = _interopRequireDefault(require("lodash.omit"));
+var _omit = _interopRequireDefault(require("lodash/omit"));
 
 var _compression = require("@webiny/api-elasticsearch/compression");
 
@@ -41,10 +41,6 @@ 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); if (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; }
-
 const createType = () => {
   return "cms.entry";
 };
@@ -62,14 +58,14 @@ const createPublishedType = () => {
 exports.createPublishedType = createPublishedType;
 
 const getEntryData = entry => {
-  return _objectSpread(_objectSpread({}, (0, _lodash2.default)(entry, ["PK", "SK", "published", "latest"])), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit.default)(entry, ["PK", "SK", "published", "latest"])), {}, {
     TYPE: createType(),
     __type: createType()
   });
 };
 
 const getESLatestEntryData = async (plugins, entry) => {
-  return (0, _compression.compress)(plugins, _objectSpread(_objectSpread({}, getEntryData(entry)), {}, {
+  return (0, _compression.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     latest: true,
     TYPE: createLatestType(),
     __type: createLatestType()
@@ -77,13 +73,41 @@ const getESLatestEntryData = async (plugins, entry) => {
 };
 
 const getESPublishedEntryData = async (plugins, entry) => {
-  return (0, _compression.compress)(plugins, _objectSpread(_objectSpread({}, getEntryData(entry)), {}, {
+  return (0, _compression.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     published: true,
     TYPE: createPublishedType(),
     __type: createPublishedType()
   }));
 };
 
+const convertToStorageEntry = params => {
+  const {
+    model,
+    entry
+  } = params;
+  const values = model.convertValueKeyToStorage({
+    fields: model.fields,
+    values: entry.values
+  });
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+    values
+  });
+};
+
+const convertFromStorageEntry = params => {
+  const {
+    model,
+    entry
+  } = params;
+  const values = model.convertValueKeyFromStorage({
+    fields: model.fields,
+    values: entry.values
+  });
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+    values
+  });
+};
+
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -97,37 +121,80 @@ const createEntriesStorageOperations = params => {
 
   const create = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const isPublished = initialEntry.status === "published";
+    const locked = isPublished ? true : initialEntry.locked;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     const esEntry = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
-      entry: (0, _lodash.default)(entry),
-      storageEntry: (0, _lodash.default)(storageEntry)
+      entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+        locked
+      })),
+      storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked
+      }))
     });
 
     const {
       index: esIndex
-    } = _configurations.default.es({
+    } = _configurations.configurations.es({
       model
     });
 
     const esLatestData = await getESLatestEntryData(plugins, esEntry);
+    const esPublishedData = await getESPublishedEntryData(plugins, esEntry);
     const revisionKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createRevisionSortKey)(entry)
     };
     const latestKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createLatestSortKey)()
     };
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), revisionKeys), {}, {
+    const publishedKeys = {
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
+      SK: (0, _keys.createPublishedSortKey)()
+    };
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked
+    }, revisionKeys), {}, {
       TYPE: createType()
-    })), entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), latestKeys), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked
+    }, latestKeys), {}, {
       TYPE: createLatestType()
     }))];
 
+    if (isPublished) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked
+      }, publishedKeys), {}, {
+        TYPE: createPublishedType()
+      })));
+    }
+
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -144,11 +211,23 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
+    const esItems = [esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
+      index: esIndex,
+      data: esLatestData
+    }))];
+
+    if (isPublished) {
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
-        data: esLatestData
-      }));
+        data: esPublishedData
+      })));
+    }
+
+    try {
+      await (0, _batchWrite.batchWriteAll)({
+        table: esEntity.table,
+        items: esItems
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not insert entry data into the Elasticsearch DynamoDB table.", ex.code || "CREATE_ES_ENTRY_ERROR", {
         error: ex,
@@ -157,39 +236,54 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const createRevisionFrom = async (model, params) => {
     const {
-      originalEntry,
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     const revisionKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createRevisionSortKey)(entry)
     };
     const latestKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createLatestSortKey)()
     };
     const esEntry = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
-      entry: (0, _lodash.default)(entry),
-      storageEntry: (0, _lodash.default)(storageEntry)
+      entry: (0, _cloneDeep.default)(entry),
+      storageEntry: (0, _cloneDeep.default)(storageEntry)
     });
     const esLatestData = await getESLatestEntryData(plugins, esEntry);
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       TYPE: createType()
-    }, revisionKeys)), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       TYPE: createLatestType()
     }, latestKeys))];
 
     const {
       index
-    } = _configurations.default.es({
+    } = _configurations.configurations.es({
       model
     });
 
@@ -204,7 +298,6 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create revision from given entry in the DynamoDB table.", ex.code || "CREATE_REVISION_ERROR", {
         error: ex,
-        originalEntry,
         entry,
         storageEntry
       });
@@ -215,14 +308,13 @@ const createEntriesStorageOperations = params => {
 
 
     try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
+      await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
         data: esLatestData
       }));
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update latest entry in the DynamoDB Elasticsearch table.", ex.code || "CREATE_REVISION_ERROR", {
         error: ex,
-        originalEntry,
         entry
       });
     }
@@ -231,58 +323,155 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const update = async (model, params) => {
     const {
-      originalEntry,
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
+    const isPublished = entry.status === "published";
+    const locked = isPublished ? true : entry.locked;
     const revisionKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createRevisionSortKey)(entry)
     };
     const latestKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createLatestSortKey)()
     };
+    const publishedKeys = {
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
+      SK: (0, _keys.createPublishedSortKey)()
+    };
     /**
      * We need the latest entry to check if it needs to be updated.
      */
 
     const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
-      ids: [originalEntry.id]
+      ids: [entry.id]
+    });
+    const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
+      model,
+      ids: [entry.id]
     });
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), revisionKeys), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+      locked
+    }, revisionKeys), {}, {
       TYPE: createType()
     }))];
+
+    if (isPublished) {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+        locked
+      }, publishedKeys), {}, {
+        TYPE: createPublishedType()
+      })));
+    }
+
+    const esItems = [];
+
+    const {
+      index: esIndex
+    } = _configurations.configurations.es({
+      model
+    });
+    /**
+     * Variable for the elasticsearch entry so we do not convert it more than once
+     */
+
+
+    let esEntry = undefined;
     /**
      * If the latest entry is the one being updated, we need to create a new latest entry records.
      */
 
     let elasticsearchLatestData = null;
 
-    if (latestStorageEntry.id === originalEntry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * 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)()
       })));
       /**
        * And then update the Elasticsearch table to propagate changes to the Elasticsearch
        */
 
-      const esEntry = (0, _helpers.prepareEntryToIndex)({
+      esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
-        entry: (0, _lodash.default)(entry),
-        storageEntry: (0, _lodash.default)(storageEntry)
+        entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+          locked
+        })),
+        storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+          locked
+        }))
       });
       elasticsearchLatestData = await getESLatestEntryData(plugins, esEntry);
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
+        index: esIndex,
+        data: elasticsearchLatestData
+      })));
+    }
+
+    let elasticsearchPublishedData = null;
+
+    if (isPublished && (publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
+      if (!elasticsearchLatestData) {
+        /**
+         * And then update the Elasticsearch table to propagate changes to the Elasticsearch
+         */
+        if (!esEntry) {
+          esEntry = (0, _helpers.prepareEntryToIndex)({
+            plugins,
+            model,
+            entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+              locked
+            })),
+            storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
+              locked
+            }))
+          });
+        }
+
+        elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
+      } else {
+        elasticsearchPublishedData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, elasticsearchLatestData), {}, {
+          published: true,
+          TYPE: createPublishedType(),
+          __type: createPublishedType()
+        });
+        delete elasticsearchPublishedData.latest;
+      }
+
+      esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
+        index: esIndex,
+        data: elasticsearchPublishedData
+      })));
     }
 
     try {
@@ -296,43 +485,39 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update entry DynamoDB records.", ex.code || "UPDATE_ENTRY_ERROR", {
         error: ex,
-        originalEntry,
         entry,
         storageEntry
       });
     }
 
-    if (!elasticsearchLatestData) {
-      return storageEntry;
+    if (esItems.length === 0) {
+      return initialStorageEntry;
     }
 
-    const {
-      index: esIndex
-    } = _configurations.default.es({
-      model
-    });
-
     try {
-      await esEntity.put(_objectSpread(_objectSpread({}, latestKeys), {}, {
-        index: esIndex,
-        data: elasticsearchLatestData
-      }));
+      await (0, _batchWrite.batchWriteAll)({
+        table: esEntity.table,
+        items: esItems
+      });
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not update entry DynamoDB Elasticsearch record.", ex.code || "UPDATE_ES_ENTRY_ERROR", {
+      throw new _error.default(ex.message || "Could not update entry DynamoDB Elasticsearch records.", ex.code || "UPDATE_ES_ENTRY_ERROR", {
         error: ex,
-        originalEntry,
         entry
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const deleteEntry = async (model, params) => {
     const {
       entry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
     const items = await (0, _query.queryAll)({
       entity,
       partitionKey,
@@ -390,15 +575,19 @@ const createEntriesStorageOperations = params => {
 
   const deleteRevision = async (model, params) => {
     const {
-      entryToDelete,
-      entryToSetAsLatest,
-      storageEntryToSetAsLatest
+      entry,
+      latestEntry,
+      latestStorageEntry
     } = params;
-    const partitionKey = (0, _keys.createPartitionKey)(entryToDelete);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
 
     const {
       index
-    } = _configurations.default.es({
+    } = _configurations.configurations.es({
       model
     });
     /**
@@ -408,7 +597,7 @@ const createEntriesStorageOperations = params => {
 
     const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
-      ids: [entryToDelete.id]
+      ids: [entry.id]
     });
     /**
      * We need to delete all existing records of the given entry revision.
@@ -420,14 +609,14 @@ const createEntriesStorageOperations = params => {
      */
     entity.deleteBatch({
       PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entryToDelete)
+      SK: (0, _keys.createRevisionSortKey)(entry)
     })];
     const esItems = [];
     /**
      * 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 === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
       items.push(entity.deleteBatch({
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)()
@@ -438,19 +627,19 @@ const createEntriesStorageOperations = params => {
       }));
     }
 
-    if (entryToSetAsLatest) {
+    if (latestEntry && latestStorageEntry) {
       const esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
-        entry: (0, _lodash.default)(entryToSetAsLatest),
-        storageEntry: (0, _lodash.default)(storageEntryToSetAsLatest)
+        entry: (0, _cloneDeep.default)(latestEntry),
+        storageEntry: (0, _cloneDeep.default)(latestStorageEntry)
       });
       const esLatestData = await getESLatestEntryData(plugins, esEntry);
       /**
        * In the end we need to set the new latest entry
        */
 
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntryToSetAsLatest), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType()
@@ -474,9 +663,9 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message || "Could not batch write entry records to DynamoDB table.", ex.code || "DELETE_REVISION_ERROR", {
         error: ex,
-        entryToDelete,
-        entryToSetAsLatest,
-        storageEntryToSetAsLatest
+        entry,
+        latestEntry,
+        latestStorageEntry
       });
     }
 
@@ -492,18 +681,45 @@ const createEntriesStorageOperations = params => {
     } catch (ex) {
       throw new _error.default(ex.message || "Could not batch write entry records to DynamoDB Elasticsearch table.", ex.code || "DELETE_REVISION_ERROR", {
         error: ex,
-        entryToDelete,
-        entryToSetAsLatest,
-        storageEntryToSetAsLatest
+        entry,
+        latestEntry,
+        latestStorageEntry
       });
     }
   };
 
   const list = async (model, params) => {
     const limit = (0, _limit.createLimit)(params.limit, 50);
+
+    const {
+      index
+    } = _configurations.configurations.es({
+      model
+    });
+
+    try {
+      const result = await elasticsearch.indices.exists({
+        index
+      });
+
+      if (!result || !result.body) {
+        return {
+          hasMoreItems: false,
+          totalCount: 0,
+          cursor: null,
+          items: []
+        };
+      }
+    } catch (ex) {
+      throw new _error.default("Could not determine if Elasticsearch index exists.", "ELASTICSEARCH_INDEX_CHECK_ERROR", {
+        error: ex,
+        index
+      });
+    }
+
     const body = (0, _helpers.createElasticsearchQueryBody)({
       model,
-      args: _objectSpread(_objectSpread({}, params), {}, {
+      args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
         limit
       }),
       plugins,
@@ -511,12 +727,6 @@ const createEntriesStorageOperations = params => {
     });
     let response;
 
-    const {
-      index
-    } = _configurations.default.es({
-      model
-    });
-
     try {
       response = await elasticsearch.search({
         index,
@@ -526,7 +736,8 @@ const createEntriesStorageOperations = params => {
       throw new _error.default(ex.message, ex.code || "ELASTICSEARCH_ERROR", {
         error: ex,
         index,
-        body
+        body,
+        model
       });
     }
 
@@ -538,6 +749,11 @@ const createEntriesStorageOperations = params => {
       plugins,
       model,
       entries: hits.map(item => item._source)
+    }).map(item => {
+      return convertFromStorageEntry({
+        model,
+        entry: item
+      });
     });
     const hasMoreItems = items.length > limit;
 
@@ -553,7 +769,7 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    const cursor = items.length > 0 ? (0, _cursors.encodeCursor)(hits[items.length - 1].sort) : null;
+    const cursor = items.length > 0 ? (0, _cursors.encodeCursor)(hits[items.length - 1].sort) || null : null;
     return {
       hasMoreItems,
       totalCount: total.value,
@@ -565,22 +781,25 @@ 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();
+    return items.shift() || null;
   };
 
   const publish = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     /**
      * We need currently published entry to check if need to remove it.
      */
@@ -590,15 +809,27 @@ const createEntriesStorageOperations = params => {
       ids: [entry.id]
     });
     const revisionKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createRevisionSortKey)(entry)
     };
     const latestKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createLatestSortKey)()
     };
     const publishedKeys = {
-      PK: (0, _keys.createPartitionKey)(entry),
+      PK: (0, _keys.createPartitionKey)({
+        id: entry.id,
+        locale: model.locale,
+        tenant: model.tenant
+      }),
       SK: (0, _keys.createPublishedSortKey)()
     };
     let latestEsEntry = null;
@@ -616,18 +847,18 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), revisionKeys), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), revisionKeys), {}, {
       TYPE: createType()
     }))];
     const esItems = [];
 
     const {
       index
-    } = _configurations.default.es({
+    } = _configurations.configurations.es({
       model
     });
 
-    if (publishedStorageEntry) {
+    if (publishedStorageEntry && publishedStorageEntry.id !== entry.id) {
       /**
        * If there is a `published` entry already, we need to set it to `unpublished`. We need to
        * execute two updates: update the previously published entry's status and the published entry record.
@@ -638,12 +869,17 @@ 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(),
@@ -656,31 +892,38 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    items.push(entity.putBatch(_objectSpread(_objectSpread(_objectSpread({}, storageEntry), publishedKeys), {}, {
+    items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), publishedKeys), {}, {
       TYPE: createPublishedType()
     })));
     /**
-     * We need the latest entry to check if it neds to be updated as well in the Elasticsearch.
+     * We need the latest entry to check if it needs to be updated as well in the Elasticsearch.
      */
 
     const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [entry.id]
     });
+
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
+      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.
      */
 
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
+
+    if (latestEsEntry && (latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * Need to decompress the data from Elasticsearch DynamoDB table.
+       *
+       * No need to transform it for the storage because it was fetched directly from the Elasticsearch table, where it sits transformed.
        */
       const latestEsEntryDataDecompressed = await (0, _compression.decompress)(plugins, latestEsEntry.data);
       esItems.push(esEntity.putBatch({
         index,
         PK: (0, _keys.createPartitionKey)(latestEsEntryDataDecompressed),
         SK: (0, _keys.createLatestSortKey)(),
-        data: _objectSpread(_objectSpread({}, latestEsEntryDataDecompressed), {}, {
+        data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
           status: _types.CONTENT_ENTRY_STATUS.PUBLISHED,
           locked: true,
           savedOn: entry.savedOn,
@@ -692,15 +935,15 @@ const createEntriesStorageOperations = params => {
     const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
-      entry: (0, _lodash.default)(entry),
-      storageEntry: (0, _lodash.default)(storageEntry)
+      entry: (0, _cloneDeep.default)(entry),
+      storageEntry: (0, _cloneDeep.default)(storageEntry)
     });
     /**
      * Update the published revision entry in ES.
      */
 
     const esLatestData = await getESPublishedEntryData(plugins, preparedEntryData);
-    esItems.push(esEntity.putBatch(_objectSpread(_objectSpread({}, publishedKeys), {}, {
+    esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
       index,
       data: esLatestData
     })));
@@ -743,14 +986,22 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const unpublish = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      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.
      */
@@ -759,11 +1010,15 @@ const createEntriesStorageOperations = params => {
       model,
       ids: [entry.id]
     });
-    const partitionKey = (0, _keys.createPartitionKey)(entry);
+    const partitionKey = (0, _keys.createPartitionKey)({
+      id: entry.id,
+      locale: model.locale,
+      tenant: model.tenant
+    });
     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()
@@ -776,18 +1031,18 @@ const createEntriesStorageOperations = params => {
      * If we are unpublishing the latest revision, let's also update the latest revision entry's status in ES.
      */
 
-    if (latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       const {
         index
-      } = _configurations.default.es({
+      } = _configurations.configurations.es({
         model
       });
 
       const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
-        entry: (0, _lodash.default)(entry),
-        storageEntry: (0, _lodash.default)(storageEntry)
+        entry: (0, _cloneDeep.default)(entry),
+        storageEntry: (0, _cloneDeep.default)(storageEntry)
       });
       const esLatestData = await getESLatestEntryData(plugins, preparedEntryData);
       esItems.push(esEntity.putBatch({
@@ -833,250 +1088,107 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
-  };
-
-  const requestReview = async (model, params) => {
-    const {
-      entry,
-      storageEntry,
-      originalEntry
-    } = params;
-    /**
-     * 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)(entry);
-    /**
-     * If we updated the latest version, then make sure the changes are propagated to ES too.
-     */
-
-    let esLatestData = null;
-
-    const {
-      index
-    } = _configurations.default.es({
-      model
-    });
-
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
-      const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
-        plugins,
-        model,
-        entry: (0, _lodash.default)(entry),
-        storageEntry: (0, _lodash.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,
-        latestStorageEntry,
-        originalEntry
-      });
-    }
-    /**
-     * No need to proceed further if nothing to put into Elasticsearch.
-     */
-
-
-    if (!esLatestData) {
-      return storageEntry;
-    }
-
-    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,
-        latestStorageEntry,
-        originalEntry
-      });
-    }
-
-    return storageEntry;
-  };
-
-  const requestChanges = async (model, params) => {
-    const {
-      entry,
-      storageEntry,
-      originalEntry
-    } = params;
-    /**
-     * 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)(entry);
-    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.default.es({
-      model
-    });
-
-    let esLatestData = null;
-
-    if (latestStorageEntry && 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, _lodash.default)(entry),
-        storageEntry: (0, _lodash.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,
-        originalEntry
-      });
-    }
-    /**
-     * No need to proceed further if nothing to put into Elasticsearch.
-     */
-
-
-    if (!esLatestData) {
-      return storageEntry;
-    }
-
-    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,
-        originalEntry
-      });
-    }
-
-    return storageEntry;
-  };
-
-  const getAllRevisionsByIds = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
-      model,
-      ids: params.ids
-    });
+    return initialStorageEntry;
   };
 
   const getLatestRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getLatestRevisionByEntryId({
+    const [entry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
 
-    if (result.length === 0) {
+    if (!entry) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getPublishedRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getPublishedRevisionByEntryId({
+    const [entry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
 
-    if (result.length === 0) {
+    if (!entry) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getRevisionById = async (model, params) => {
-    const result = await dataLoaders.getRevisionById({
+    const [entry] = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
 
-    if (result.length === 0) {
+    if (!entry) {
       return null;
     }
 
-    return result.shift();
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getRevisions = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
+    const entries = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getByIds = async (model, params) => {
-    return dataLoaders.getRevisionById({
+    const entries = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getLatestByIds = async (model, params) => {
-    return dataLoaders.getLatestRevisionByEntryId({
+    const entries = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getPublishedByIds = async (model, params) => {
-    return dataLoaders.getPublishedRevisionByEntryId({
+    const entries = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getPreviousRevision = async (model, params) => {
@@ -1114,9 +1226,18 @@ const createEntriesStorageOperations = params => {
 
     try {
       const result = await (0, _query.queryOne)(queryParams);
-      return (0, _cleanup.cleanupItem)(entity, result);
+      const entry = (0, _cleanup.cleanupItem)(entity, result);
+
+      if (!entry) {
+        return null;
+      }
+
+      return convertFromStorageEntry({
+        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,
@@ -1134,10 +1255,7 @@ const createEntriesStorageOperations = params => {
     get,
     publish,
     unpublish,
-    requestReview,
-    requestChanges,
     list,
-    getAllRevisionsByIds,
     getLatestRevisionByEntryId,
     getPublishedRevisionByEntryId,
     getRevisionById,