@webiny/api-headless-cms-ddb-es 6.3.0 → 6.4.0-beta.0

package/operations/entry/index.js

@@ -12,1750 +12,1363 @@ import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
 import { createTransformer } from "./transformations/index.js";
 import { convertEntryKeysFromStorage } from "./transformations/convertEntryKeys.js";
 import { isDeletedEntryMetaField, isEntryLevelEntryMetaField, isRestoredEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
-const convertToStorageEntry = params => {
-  const {
-    model,
-    storageEntry
-  } = params;
-  const values = model.convertValueKeyToStorage({
-    fields: model.fields,
-    values: storageEntry.values
-  });
-  return {
-    ...storageEntry,
-    values
-  };
-};
-export const createEntriesStorageOperations = params => {
-  const {
-    entity,
-    esEntity,
-    elasticsearch,
-    plugins,
-    fieldRegistry,
-    fieldIndexRegistry,
-    compressionHandler,
-    bodyModifiers,
-    sortModifiers,
-    queryModifiers,
-    valueSearchRegistry,
-    fullTextSearches,
-    valuesModifiers,
-    filterRegistry
-  } = params;
-  let storageOperationsCmsModelPlugin;
-  const getStorageOperationsCmsModelPlugin = () => {
-    if (storageOperationsCmsModelPlugin) {
-      return storageOperationsCmsModelPlugin;
-    }
-    storageOperationsCmsModelPlugin = plugins.oneByType(StorageOperationsCmsModelPlugin.type);
-    return storageOperationsCmsModelPlugin;
-  };
-  const getStorageOperationsModel = model => {
-    const plugin = getStorageOperationsCmsModelPlugin();
-    return plugin.getModel(model);
-  };
-  const dataLoaders = new DataLoadersHandler({
-    entity
-  });
-  const create = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const isPublished = initialEntry.status === "published";
-    const locked = isPublished ? true : initialEntry.locked;
-    initialEntry.locked = locked;
-    initialStorageEntry.locked = locked;
-    const transformer = createTransformer({
-      fieldRegistry,
-      fieldIndexRegistry,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      compressionHandler,
-      valuesModifiers
+const convertToStorageEntry = (params)=>{
+    const { model, storageEntry } = params;
+    const values = model.convertValueKeyToStorage({
+        fields: model.fields,
+        values: storageEntry.values
     });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-    const esEntry = transformer.transformToIndex();
-    const {
-      index: esIndex
-    } = configurations.es({
-      model
+    return {
+        ...storageEntry,
+        values
+    };
+};
+const createEntriesStorageOperations = (params)=>{
+    const { entity, esEntity, elasticsearch, plugins, fieldRegistry, fieldIndexRegistry, compressionHandler, bodyModifiers, sortModifiers, queryModifiers, valueSearchRegistry, fullTextSearches, valuesModifiers, filterRegistry } = params;
+    let storageOperationsCmsModelPlugin;
+    const getStorageOperationsCmsModelPlugin = ()=>{
+        if (storageOperationsCmsModelPlugin) return storageOperationsCmsModelPlugin;
+        storageOperationsCmsModelPlugin = plugins.oneByType(StorageOperationsCmsModelPlugin.type);
+        return storageOperationsCmsModelPlugin;
+    };
+    const getStorageOperationsModel = (model)=>{
+        const plugin = getStorageOperationsCmsModelPlugin();
+        return plugin.getModel(model);
+    };
+    const dataLoaders = new DataLoadersHandler({
+        entity
     });
-    const revisionKeys = createEntryRevisionKeys(entry);
-    const latestKeys = createEntryLatestKeys(entry);
-    const publishedKeys = createEntryPublishedKeys(entry);
-    const entityBatch = entity.createEntityWriter({
-      put: [{
-        ...revisionKeys,
-        data: {
-          ...storageEntry,
-          locked
+    const create = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const isPublished = "published" === initialEntry.status;
+        const locked = isPublished ? true : initialEntry.locked;
+        initialEntry.locked = locked;
+        initialStorageEntry.locked = locked;
+        const transformer = createTransformer({
+            fieldRegistry,
+            fieldIndexRegistry,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            compressionHandler,
+            valuesModifiers
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const esEntry = transformer.transformToIndex();
+        const { index: esIndex } = configurations.es({
+            model
+        });
+        const revisionKeys = createEntryRevisionKeys(entry);
+        const latestKeys = createEntryLatestKeys(entry);
+        const publishedKeys = createEntryPublishedKeys(entry);
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...revisionKeys,
+                    data: {
+                        ...storageEntry,
+                        locked
+                    }
+                },
+                {
+                    ...latestKeys,
+                    data: {
+                        ...storageEntry,
+                        locked
+                    }
+                }
+            ]
+        });
+        if (isPublished) entityBatch.put({
+            ...publishedKeys,
+            data: {
+                ...storageEntry,
+                locked
+            }
+        });
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not insert entry data into the DynamoDB table.", ex.code || "CREATE_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
         }
-      }, {
-        ...latestKeys,
-        data: {
-          ...storageEntry,
-          locked
+        const esLatestData = await transformer.getElasticsearchLatestEntryData();
+        const elasticsearchEntityBatch = esEntity.createEntityWriter({
+            put: [
+                {
+                    ...latestKeys,
+                    index: esIndex,
+                    data: esLatestData
+                }
+            ]
+        });
+        if (isPublished) {
+            const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: esPublishedData
+            });
         }
-      }]
-    });
-    if (isPublished) {
-      entityBatch.put({
-        ...publishedKeys,
-        data: {
-          ...storageEntry,
-          locked
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not insert entry data into the Elasticsearch DynamoDB table.", ex.code || "CREATE_ES_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                esEntry
+            });
         }
-      });
-    }
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not insert entry data into the DynamoDB table.", ex.code || "CREATE_ENTRY_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-    const esLatestData = await transformer.getElasticsearchLatestEntryData();
-    const elasticsearchEntityBatch = esEntity.createEntityWriter({
-      put: [{
-        ...latestKeys,
-        index: esIndex,
-        data: esLatestData
-      }]
-    });
-    if (isPublished) {
-      const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-      elasticsearchEntityBatch.put({
-        ...publishedKeys,
-        index: esIndex,
-        data: esPublishedData
-      });
-    }
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not insert entry data into the Elasticsearch DynamoDB table.", ex.code || "CREATE_ES_ENTRY_ERROR", {
-        error: ex,
-        entry,
-        esEntry
-      });
-    }
-    return initialStorageEntry;
-  };
-  const createRevisionFrom = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler,
-      valuesModifiers
-    });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-    const revisionKeys = createEntryRevisionKeys(entry);
-    const latestKeys = createEntryLatestKeys(entry);
-    const publishedKeys = createEntryPublishedKeys(entry);
-
-    // We'll need this flag below.
-    const isPublished = entry.status === "published";
-    const esLatestData = await transformer.getElasticsearchLatestEntryData();
-    const entityBatch = entity.createEntityWriter({
-      put: [{
-        ...revisionKeys,
-        data: storageEntry
-      }, {
-        ...latestKeys,
-        data: storageEntry
-      }]
-    });
-    if (isPublished) {
-      entityBatch.put({
-        ...publishedKeys,
-        data: storageEntry
-      });
-
-      // Unpublish previously published revision (if any).
-      const [publishedRevisionStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
-        model,
-        ids: [entry.id]
-      });
-      if (publishedRevisionStorageEntry) {
-        const publishedRevisionKey = createEntryRevisionKeys(publishedRevisionStorageEntry);
-        entityBatch.put({
-          ...publishedRevisionKey,
-          data: {
-            ...publishedRevisionStorageEntry,
-            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
-          }
-        });
-      }
-    }
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not create revision from given entry in the DynamoDB table.", ex.code || "CREATE_REVISION_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-    const {
-      index: esIndex
-    } = configurations.es({
-      model
-    });
-    const elasticsearchEntityBatch = esEntity.createEntityWriter({
-      put: [{
-        ...latestKeys,
-        index: esIndex,
-        data: esLatestData
-      }]
-    });
-    if (isPublished) {
-      const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-      elasticsearchEntityBatch.put({
-        ...publishedKeys,
-        index: esIndex,
-        data: esPublishedData
-      });
-    }
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not update latest entry in the DynamoDB Elasticsearch table.", ex.code || "CREATE_REVISION_ERROR", {
-        error: ex,
-        entry
-      });
-    }
-    /**
-     * There are no modifications on the entry created so just return the data.
-     */
-    return initialStorageEntry;
-  };
-  const update = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      valuesModifiers,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler
-    });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-    const isPublished = entry.status === "published";
-    const locked = isPublished ? true : entry.locked;
-    const revisionKeys = createEntryRevisionKeys(entry);
-    const latestKeys = createEntryLatestKeys(entry);
-    const publishedKeys = createEntryPublishedKeys(entry);
-
-    /**
-     * We need the latest entry to check if it needs to be updated.
-     */
-    const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    const entityBatch = entity.createEntityWriter({
-      put: [{
-        ...revisionKeys,
-        data: {
-          ...storageEntry,
-          locked
+        return initialStorageEntry;
+    };
+    const createRevisionFrom = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler,
+            valuesModifiers
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const revisionKeys = createEntryRevisionKeys(entry);
+        const latestKeys = createEntryLatestKeys(entry);
+        const publishedKeys = createEntryPublishedKeys(entry);
+        const isPublished = "published" === entry.status;
+        const esLatestData = await transformer.getElasticsearchLatestEntryData();
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...revisionKeys,
+                    data: storageEntry
+                },
+                {
+                    ...latestKeys,
+                    data: storageEntry
+                }
+            ]
+        });
+        if (isPublished) {
+            entityBatch.put({
+                ...publishedKeys,
+                data: storageEntry
+            });
+            const [publishedRevisionStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
+                model,
+                ids: [
+                    entry.id
+                ]
+            });
+            if (publishedRevisionStorageEntry) {
+                const publishedRevisionKey = createEntryRevisionKeys(publishedRevisionStorageEntry);
+                entityBatch.put({
+                    ...publishedRevisionKey,
+                    data: {
+                        ...publishedRevisionStorageEntry,
+                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                    }
+                });
+            }
         }
-      }]
-    });
-    if (isPublished) {
-      entityBatch.put({
-        ...publishedKeys,
-        data: {
-          ...storageEntry,
-          locked
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not create revision from given entry in the DynamoDB table.", ex.code || "CREATE_REVISION_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
         }
-      });
-    }
-    const elasticsearchEntityBatch = esEntity.createEntityWriter();
-    const {
-      index: esIndex
-    } = configurations.es({
-      model
-    });
-
-    /**
-     * If the latest entry is the one being updated, we need to create a new latest entry records.
-     */
-    if (latestStorageEntry) {
-      const updatingLatestRevision = latestStorageEntry.id === entry.id;
-      if (updatingLatestRevision) {
-        /**
-         * First we update the regular DynamoDB table.
-         */
-        entityBatch.put({
-          ...latestKeys,
-          data: storageEntry
+        const { index: esIndex } = configurations.es({
+            model
         });
-
-        /**
-         * And then update the Elasticsearch table to propagate changes to the Elasticsearch
-         */
-        const elasticsearchLatestData = await transformer.getElasticsearchLatestEntryData();
-        elasticsearchEntityBatch.put({
-          ...latestKeys,
-          index: esIndex,
-          data: elasticsearchLatestData
-        });
-      } else {
-        /**
-         * If not updating latest revision, we still want to update the latest revision's
-         * entry-level meta fields to match the current revision's entry-level meta fields.
-         */
-        const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
-        const updatedLatestStorageEntry = {
-          ...latestKeys,
-          data: {
-            ...latestStorageEntry,
-            ...updatedEntryLevelMetaFields
-          }
+        const elasticsearchEntityBatch = esEntity.createEntityWriter({
+            put: [
+                {
+                    ...latestKeys,
+                    index: esIndex,
+                    data: esLatestData
+                }
+            ]
+        });
+        if (isPublished) {
+            const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: esPublishedData
+            });
+        }
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not update latest entry in the DynamoDB Elasticsearch table.", ex.code || "CREATE_REVISION_ERROR", {
+                error: ex,
+                entry
+            });
+        }
+        return initialStorageEntry;
+    };
+    const update = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const isPublished = "published" === entry.status;
+        const locked = isPublished ? true : entry.locked;
+        const revisionKeys = createEntryRevisionKeys(entry);
+        const latestKeys = createEntryLatestKeys(entry);
+        const publishedKeys = createEntryPublishedKeys(entry);
+        const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
+        });
+        const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
+        });
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...revisionKeys,
+                    data: {
+                        ...storageEntry,
+                        locked
+                    }
+                }
+            ]
+        });
+        if (isPublished) entityBatch.put({
+            ...publishedKeys,
+            data: {
+                ...storageEntry,
+                locked
+            }
+        });
+        const elasticsearchEntityBatch = esEntity.createEntityWriter();
+        const { index: esIndex } = configurations.es({
+            model
+        });
+        if (latestStorageEntry) {
+            const updatingLatestRevision = latestStorageEntry.id === entry.id;
+            if (updatingLatestRevision) {
+                entityBatch.put({
+                    ...latestKeys,
+                    data: storageEntry
+                });
+                const elasticsearchLatestData = await transformer.getElasticsearchLatestEntryData();
+                elasticsearchEntityBatch.put({
+                    ...latestKeys,
+                    index: esIndex,
+                    data: elasticsearchLatestData
+                });
+            } else {
+                const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+                const updatedLatestStorageEntry = {
+                    ...latestKeys,
+                    data: {
+                        ...latestStorageEntry,
+                        ...updatedEntryLevelMetaFields
+                    }
+                };
+                entityBatch.put({
+                    ...updatedLatestStorageEntry,
+                    PK: createPartitionKey({
+                        id: latestStorageEntry.id,
+                        tenant: model.tenant
+                    }),
+                    SK: createRevisionSortKey(latestStorageEntry)
+                });
+                entityBatch.put({
+                    ...updatedLatestStorageEntry
+                });
+                const latestEsEntry = await esEntity.getClean(latestKeys);
+                if (latestEsEntry) {
+                    const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
+                    const updatedLatestEntry = await compressionHandler.compress({
+                        ...latestEsEntryDataDecompressed,
+                        ...updatedEntryLevelMetaFields
+                    });
+                    elasticsearchEntityBatch.put({
+                        ...latestKeys,
+                        index: esIndex,
+                        data: updatedLatestEntry
+                    });
+                }
+            }
+        }
+        if (isPublished && publishedStorageEntry?.id === entry.id) {
+            const elasticsearchPublishedData = await transformer.getElasticsearchPublishedEntryData();
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: elasticsearchPublishedData
+            });
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not update entry DynamoDB records.", ex.code || "UPDATE_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
+        }
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not update entry DynamoDB Elasticsearch records.", ex.code || "UPDATE_ES_ENTRY_ERROR", {
+                error: ex,
+                entry
+            });
+        }
+        return initialStorageEntry;
+    };
+    const move = async (initialModel, id, folderId)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const partitionKey = createPartitionKey({
+            id,
+            tenant: model.tenant
+        });
+        const queryAllParams = {
+            partitionKey,
+            options: {
+                gte: " "
+            }
         };
-
-        /**
-         * First we update the regular DynamoDB table. Two updates are needed:
-         * - one for the actual revision record
-         * - one for the latest record
-         */
-        entityBatch.put({
-          ...updatedLatestStorageEntry,
-          PK: createPartitionKey({
-            id: latestStorageEntry.id,
+        const latestSortKey = createLatestSortKey();
+        const publishedSortKey = createPublishedSortKey();
+        const records = await entity.queryAll(queryAllParams);
+        let latestRecord;
+        let publishedRecord;
+        const entityBatch = entity.createEntityWriter();
+        for (const record of records){
+            entityBatch.put({
+                ...record,
+                data: {
+                    ...record.data,
+                    location: {
+                        ...record.data.location,
+                        folderId
+                    }
+                }
+            });
+            if (record.SK === publishedSortKey) publishedRecord = record.data;
+            else if (record.SK === latestSortKey) latestRecord = record.data;
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not move all entry records from in the DynamoDB table.", ex.code || "MOVE_ENTRY_ERROR", {
+                error: ex,
+                id
+            });
+        }
+        const esEntityReader = esEntity.createEntityReader();
+        if (publishedRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: publishedSortKey
+        });
+        if (latestRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: latestSortKey
+        });
+        if (0 === esEntityReader.total) return;
+        const esRecords = await esEntityReader.execute();
+        const esItems = (await Promise.all(esRecords.map(async (record)=>{
+            if (!record) return null;
+            return {
+                ...record,
+                data: await compressionHandler.decompress(record.data)
+            };
+        }))).filter((item)=>!!item);
+        if (0 === esItems.length) return;
+        try {
+            const elasticsearchEntityBatch = esEntity.createEntityWriter({
+                put: await Promise.all(esItems.map(async (item)=>({
+                        ...item,
+                        data: await compressionHandler.compress({
+                            ...item.data,
+                            location: {
+                                ...item.data?.location,
+                                folderId
+                            }
+                        })
+                    })))
+            });
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not move entry DynamoDB Elasticsearch records.", ex.code || "MOVE_ES_ENTRY_ERROR", {
+                error: ex,
+                partitionKey
+            });
+        }
+    };
+    const moveToBin = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const partitionKey = createPartitionKey({
+            id: entry.id,
             tenant: model.tenant
-          }),
-          SK: createRevisionSortKey(latestStorageEntry)
         });
-        entityBatch.put({
-          ...updatedLatestStorageEntry
+        const queryAllParams = {
+            partitionKey,
+            options: {
+                gte: " "
+            }
+        };
+        const latestSortKey = createLatestSortKey();
+        const publishedSortKey = createPublishedSortKey();
+        const records = await entity.queryAll(queryAllParams);
+        const updatedEntryMetaFields = pickEntryMetaFields(entry, isDeletedEntryMetaField);
+        let latestRecord;
+        let publishedRecord;
+        const entityBatch = entity.createEntityWriter();
+        for (const record of records){
+            entityBatch.put({
+                ...record,
+                data: {
+                    ...record.data,
+                    ...updatedEntryMetaFields,
+                    wbyDeleted: storageEntry.wbyDeleted,
+                    location: storageEntry.location,
+                    binOriginalFolderId: storageEntry.binOriginalFolderId
+                }
+            });
+            if (record.SK === publishedSortKey) publishedRecord = record.data;
+            else if (record.SK === latestSortKey) latestRecord = record.data;
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could mark as deleted all entry records from in the DynamoDB table.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
+        }
+        const esEntityReader = esEntity.createEntityReader();
+        if (publishedRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: publishedSortKey
+        });
+        if (latestRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: latestSortKey
         });
-
-        /**
-         * Update the Elasticsearch table to propagate changes to the Elasticsearch.
-         */
-        const latestEsEntry = await esEntity.getClean(latestKeys);
-        if (latestEsEntry) {
-          const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
-          const updatedLatestEntry = await compressionHandler.compress({
-            ...latestEsEntryDataDecompressed,
-            ...updatedEntryLevelMetaFields
-          });
-          elasticsearchEntityBatch.put({
-            ...latestKeys,
-            index: esIndex,
-            data: updatedLatestEntry
-          });
+        if (0 === esEntityReader.total) return;
+        const esRecords = await esEntityReader.execute();
+        const esItems = (await Promise.all(esRecords.map(async (record)=>{
+            if (!record) return null;
+            return {
+                ...record,
+                data: await compressionHandler.decompress(record.data)
+            };
+        }))).filter((item)=>!!item);
+        if (0 === esItems.length) return;
+        const elasticsearchEntityBatch = esEntity.createEntityWriter();
+        for (const item of esItems)elasticsearchEntityBatch.put({
+            ...item,
+            data: await compressionHandler.compress({
+                ...item.data,
+                ...updatedEntryMetaFields,
+                wbyDeleted: entry.wbyDeleted,
+                location: entry.location,
+                binOriginalFolderId: entry.binOriginalFolderId
+            })
+        });
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not mark as deleted entry records from DynamoDB Elasticsearch table.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
         }
-      }
-    }
-    if (isPublished && publishedStorageEntry?.id === entry.id) {
-      const elasticsearchPublishedData = await transformer.getElasticsearchPublishedEntryData();
-      elasticsearchEntityBatch.put({
-        ...publishedKeys,
-        index: esIndex,
-        data: elasticsearchPublishedData
-      });
-    }
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not update entry DynamoDB records.", ex.code || "UPDATE_ENTRY_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not update entry DynamoDB Elasticsearch records.", ex.code || "UPDATE_ES_ENTRY_ERROR", {
-        error: ex,
-        entry
-      });
-    }
-    return initialStorageEntry;
-  };
-  const move = async (initialModel, id, folderId) => {
-    const model = getStorageOperationsModel(initialModel);
-    const partitionKey = createPartitionKey({
-      id,
-      tenant: model.tenant
-    });
-    /**
-     * First we need to fetch all the records in the regular DynamoDB table.
-     */
-    const queryAllParams = {
-      partitionKey,
-      options: {
-        gte: " "
-      }
     };
-    const latestSortKey = createLatestSortKey();
-    const publishedSortKey = createPublishedSortKey();
-    const records = await entity.queryAll(queryAllParams);
-    /**
-     * Then update the folderId in each record and prepare it to be stored.
-     */
-    let latestRecord = undefined;
-    let publishedRecord = undefined;
-    const entityBatch = entity.createEntityWriter();
-    for (const record of records) {
-      entityBatch.put({
-        ...record,
-        data: {
-          ...record.data,
-          location: {
-            ...record.data.location,
-            folderId
-          }
+    const restoreFromBin = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const updatedEntryMetaFields = pickEntryMetaFields(entry, isRestoredEntryMetaField);
+        const partitionKey = createPartitionKey({
+            id: entry.id,
+            tenant: model.tenant
+        });
+        const queryAllParams = {
+            partitionKey,
+            options: {
+                gte: " "
+            }
+        };
+        const latestSortKey = createLatestSortKey();
+        const publishedSortKey = createPublishedSortKey();
+        const records = await entity.queryAll(queryAllParams);
+        let latestRecord;
+        let publishedRecord;
+        const entityBatch = entity.createEntityWriter();
+        for (const record of records){
+            entityBatch.put({
+                ...record,
+                data: {
+                    ...record.data,
+                    ...updatedEntryMetaFields,
+                    wbyDeleted: storageEntry.wbyDeleted,
+                    location: storageEntry.location,
+                    binOriginalFolderId: storageEntry.binOriginalFolderId
+                }
+            });
+            if (record.SK === publishedSortKey) publishedRecord = record.data;
+            else if (record.SK === latestSortKey) latestRecord = record.data;
         }
-      });
-
-      /**
-       * We need to get the published and latest records, so we can update the Elasticsearch.
-       */
-      if (record.SK === publishedSortKey) {
-        publishedRecord = record.data;
-      } else if (record.SK === latestSortKey) {
-        latestRecord = record.data;
-      }
-    }
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not move all entry records from in the DynamoDB table.", ex.code || "MOVE_ENTRY_ERROR", {
-        error: ex,
-        id
-      });
-    }
-    const esEntityReader = esEntity.createEntityReader();
-    if (publishedRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: publishedSortKey
-      });
-    }
-    if (latestRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: latestSortKey
-      });
-    }
-    if (esEntityReader.total === 0) {
-      return;
-    }
-    const esRecords = await esEntityReader.execute();
-    const esItems = (await Promise.all(esRecords.map(async record => {
-      if (!record) {
-        return null;
-      }
-      return {
-        ...record,
-        data: await compressionHandler.decompress(record.data)
-      };
-    }))).filter(item => !!item);
-    if (esItems.length === 0) {
-      return;
-    }
-    try {
-      const elasticsearchEntityBatch = esEntity.createEntityWriter({
-        put: await Promise.all(esItems.map(async item => {
-          return {
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not restore all entry records from in the DynamoDB table.", ex.code || "RESTORE_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
+        }
+        const esEntityReader = esEntity.createEntityReader();
+        if (publishedRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: publishedSortKey
+        });
+        if (latestRecord) esEntityReader.get({
+            PK: partitionKey,
+            SK: latestSortKey
+        });
+        const esRecords = await esEntityReader.execute();
+        const esItems = (await Promise.all(esRecords.map(async (record)=>{
+            if (!record) return null;
+            return {
+                ...record,
+                data: await compressionHandler.decompress(record.data)
+            };
+        }))).filter((item)=>!!item);
+        if (0 === esItems.length) return initialStorageEntry;
+        const elasticsearchEntityBatch = esEntity.createEntityWriter();
+        for (const item of esItems)elasticsearchEntityBatch.put({
             ...item,
             data: await compressionHandler.compress({
-              ...item.data,
-              location: {
-                ...item.data?.location,
-                folderId
-              }
+                ...item.data,
+                ...updatedEntryMetaFields,
+                wbyDeleted: entry.wbyDeleted,
+                location: entry.location,
+                binOriginalFolderId: entry.binOriginalFolderId
             })
-          };
-        }))
-      });
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not move entry DynamoDB Elasticsearch records.", ex.code || "MOVE_ES_ENTRY_ERROR", {
-        error: ex,
-        partitionKey
-      });
-    }
-  };
-  const moveToBin = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      valuesModifiers,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler
-    });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-    const partitionKey = createPartitionKey({
-      id: entry.id,
-      tenant: model.tenant
-    });
-
-    /**
-     * First we need to fetch all the records in the regular DynamoDB table.
-     */
-    const queryAllParams = {
-      partitionKey,
-      options: {
-        gte: " "
-      }
+        });
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not restore entry records from DynamoDB Elasticsearch table.", ex.code || "RESTORE_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
+        }
+        return initialStorageEntry;
     };
-    const latestSortKey = createLatestSortKey();
-    const publishedSortKey = createPublishedSortKey();
-    const records = await entity.queryAll(queryAllParams);
-
-    /**
-     * Let's pick the `deleted` meta fields from the entry.
-     */
-    const updatedEntryMetaFields = pickEntryMetaFields(entry, isDeletedEntryMetaField);
-
-    /**
-     * Then update all the records with data received.
-     */
-    let latestRecord = undefined;
-    let publishedRecord = undefined;
-    const entityBatch = entity.createEntityWriter();
-    for (const record of records) {
-      entityBatch.put({
-        ...record,
-        data: {
-          ...record.data,
-          ...updatedEntryMetaFields,
-          wbyDeleted: storageEntry.wbyDeleted,
-          location: storageEntry.location,
-          binOriginalFolderId: storageEntry.binOriginalFolderId
+    const deleteEntry = async (initialModel, params)=>{
+        const { entry } = params;
+        const id = entry.id || entry.entryId;
+        const model = getStorageOperationsModel(initialModel);
+        const partitionKey = createPartitionKey({
+            id,
+            tenant: model.tenant
+        });
+        const items = await entity.queryAll({
+            partitionKey,
+            options: {
+                gte: " "
+            }
+        });
+        const esItems = await esEntity.queryAll({
+            partitionKey,
+            options: {
+                gte: " "
+            }
+        });
+        const entityBatch = entity.createEntityWriter({
+            delete: items.map((item)=>({
+                    PK: item.PK,
+                    SK: item.SK
+                }))
+        });
+        const elasticsearchEntityBatch = esEntity.createEntityWriter({
+            delete: esItems.map((item)=>({
+                    PK: item.PK,
+                    SK: item.SK
+                }))
+        });
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not destroy entry records from DynamoDB table.", ex.code || "DELETE_ENTRY_ERROR", {
+                error: ex,
+                id
+            });
+        }
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not destroy entry records from DynamoDB Elasticsearch table.", ex.code || "DELETE_ENTRY_ERROR", {
+                error: ex,
+                id
+            });
         }
-      });
-
-      /**
-       * We need to get the published and latest records, so we can update the Elasticsearch.
-       */
-      if (record.SK === publishedSortKey) {
-        publishedRecord = record.data;
-      } else if (record.SK === latestSortKey) {
-        latestRecord = record.data;
-      }
-    }
-
-    /**
-     * We write the records back to the primary DynamoDB table.
-     */
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could mark as deleted all entry records from in the DynamoDB table.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-
-    /**
-     * We need to get the published and latest records from Elasticsearch.
-     */
-    const esEntityReader = esEntity.createEntityReader();
-    if (publishedRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: publishedSortKey
-      });
-    }
-    if (latestRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: latestSortKey
-      });
-    }
-    if (esEntityReader.total === 0) {
-      return;
-    }
-    const esRecords = await esEntityReader.execute();
-    const esItems = (await Promise.all(esRecords.map(async record => {
-      if (!record) {
-        return null;
-      }
-      return {
-        ...record,
-        data: await compressionHandler.decompress(record.data)
-      };
-    }))).filter(item => !!item);
-    if (esItems.length === 0) {
-      return;
-    }
-
-    /**
-     * We update all ES records with data received.
-     */
-    const elasticsearchEntityBatch = esEntity.createEntityWriter();
-    for (const item of esItems) {
-      elasticsearchEntityBatch.put({
-        ...item,
-        data: await compressionHandler.compress({
-          ...item.data,
-          ...updatedEntryMetaFields,
-          wbyDeleted: entry.wbyDeleted,
-          location: entry.location,
-          binOriginalFolderId: entry.binOriginalFolderId
-        })
-      });
-    }
-
-    /**
-     * We write the records back to the primary DynamoDB Elasticsearch table.
-     */
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not mark as deleted entry records from DynamoDB Elasticsearch table.", ex.code || "MOVE_ENTRY_TO_BIN_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-  };
-  const restoreFromBin = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      valuesModifiers,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler
-    });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-
-    /**
-     * Let's pick the `restored` meta fields from the storage entry.
-     */
-    const updatedEntryMetaFields = pickEntryMetaFields(entry, isRestoredEntryMetaField);
-    const partitionKey = createPartitionKey({
-      id: entry.id,
-      tenant: model.tenant
-    });
-
-    /**
-     * First we need to fetch all the records in the regular DynamoDB table.
-     */
-    const queryAllParams = {
-      partitionKey,
-      options: {
-        gte: " "
-      }
     };
-    const latestSortKey = createLatestSortKey();
-    const publishedSortKey = createPublishedSortKey();
-    const records = await entity.queryAll(queryAllParams);
-
-    /**
-     * Then update all the records with data received.
-     */
-    let latestRecord = undefined;
-    let publishedRecord = undefined;
-    const entityBatch = entity.createEntityWriter();
-    for (const record of records) {
-      entityBatch.put({
-        ...record,
-        data: {
-          ...record.data,
-          ...updatedEntryMetaFields,
-          wbyDeleted: storageEntry.wbyDeleted,
-          location: storageEntry.location,
-          binOriginalFolderId: storageEntry.binOriginalFolderId
+    const deleteRevision = async (initialModel, params)=>{
+        const { entry, latestEntry, latestStorageEntry: initialLatestStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const partitionKey = createPartitionKey({
+            id: entry.id,
+            tenant: model.tenant
+        });
+        const { index } = configurations.es({
+            model
+        });
+        const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
+        });
+        const entityBatch = entity.createEntityWriter({
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry)
+                }
+            ]
+        });
+        const elasticsearchEntityBatch = esEntity.createEntityWriter();
+        if (publishedStorageEntry?.id === entry.id) {
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
+            elasticsearchEntityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
         }
-      });
-
-      /**
-       * We need to get the published and latest records, so we can update the Elasticsearch.
-       */
-      if (record.SK === publishedSortKey) {
-        publishedRecord = record.data;
-      } else if (record.SK === latestSortKey) {
-        latestRecord = record.data;
-      }
-    }
-
-    /**
-     * We write the records back to the primary DynamoDB table.
-     */
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not restore all entry records from in the DynamoDB table.", ex.code || "RESTORE_ENTRY_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-
-    /**
-     * We need to get the published and latest records from Elasticsearch.
-     */
-    const esEntityReader = esEntity.createEntityReader();
-    if (publishedRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: publishedSortKey
-      });
-    }
-    if (latestRecord) {
-      esEntityReader.get({
-        PK: partitionKey,
-        SK: latestSortKey
-      });
-    }
-    const esRecords = await esEntityReader.execute();
-    const esItems = (await Promise.all(esRecords.map(async record => {
-      if (!record) {
-        return null;
-      }
-      return {
-        ...record,
-        data: await compressionHandler.decompress(record.data)
-      };
-    }))).filter(item => !!item);
-    if (esItems.length === 0) {
-      return initialStorageEntry;
-    }
-
-    /**
-     * We update all ES records with data received.
-     */
-    const elasticsearchEntityBatch = esEntity.createEntityWriter();
-    for (const item of esItems) {
-      elasticsearchEntityBatch.put({
-        ...item,
-        data: await compressionHandler.compress({
-          ...item.data,
-          ...updatedEntryMetaFields,
-          wbyDeleted: entry.wbyDeleted,
-          location: entry.location,
-          binOriginalFolderId: entry.binOriginalFolderId
-        })
-      });
-    }
-
-    /**
-     * We write the records back to the primary DynamoDB Elasticsearch table.
-     */
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not restore entry records from DynamoDB Elasticsearch table.", ex.code || "RESTORE_ENTRY_ERROR", {
-        error: ex,
-        entry,
-        storageEntry
-      });
-    }
-    return initialStorageEntry;
-  };
-  const deleteEntry = async (initialModel, params) => {
-    const {
-      entry
-    } = params;
-    const id = entry.id || entry.entryId;
-    const model = getStorageOperationsModel(initialModel);
-    const partitionKey = createPartitionKey({
-      id,
-      tenant: model.tenant
-    });
-    const items = await entity.queryAll({
-      partitionKey,
-      options: {
-        gte: " "
-      }
-    });
-    const esItems = await esEntity.queryAll({
-      partitionKey,
-      options: {
-        gte: " "
-      }
-    });
-    const entityBatch = entity.createEntityWriter({
-      delete: items.map(item => {
-        return {
-          PK: item.PK,
-          SK: item.SK
-        };
-      })
-    });
-    const elasticsearchEntityBatch = esEntity.createEntityWriter({
-      delete: esItems.map(item => {
-        return {
-          PK: item.PK,
-          SK: item.SK
-        };
-      })
-    });
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not destroy entry records from DynamoDB table.", ex.code || "DELETE_ENTRY_ERROR", {
-        error: ex,
-        id
-      });
-    }
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not destroy entry records from DynamoDB Elasticsearch table.", ex.code || "DELETE_ENTRY_ERROR", {
-        error: ex,
-        id
-      });
-    }
-  };
-  const deleteRevision = async (initialModel, params) => {
-    const {
-      entry,
-      latestEntry,
-      latestStorageEntry: initialLatestStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const partitionKey = createPartitionKey({
-      id: entry.id,
-      tenant: model.tenant
-    });
-    const {
-      index
-    } = configurations.es({
-      model
-    });
-    /**
-     * We need published entry to delete it if necessary.
-     */
-    const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    /**
-     * We need to delete all existing records of the given entry revision.
-     */
-    const entityBatch = entity.createEntityWriter({
-      delete: [{
-        PK: partitionKey,
-        SK: createRevisionSortKey(entry)
-      }]
-    });
-    const elasticsearchEntityBatch = esEntity.createEntityWriter();
-
-    /**
-     * If revision we are deleting is the published one as well, we need to delete those records as well.
-     */
-    if (publishedStorageEntry?.id === entry.id) {
-      entityBatch.delete({
-        PK: partitionKey,
-        SK: createPublishedSortKey()
-      });
-      elasticsearchEntityBatch.delete({
-        PK: partitionKey,
-        SK: createPublishedSortKey()
-      });
-    }
-    if (latestEntry && initialLatestStorageEntry) {
-      const latestStorageEntry = convertToStorageEntry({
-        storageEntry: initialLatestStorageEntry,
-        model
-      });
-
-      /**
-       * In the end we need to set the new latest entry.
-       */
-      const latestStorageEntryLatestKey = createEntryLatestKeys(latestStorageEntry);
-      entityBatch.put({
-        ...latestStorageEntryLatestKey,
-        data: latestStorageEntry
-      });
-
-      /**
-       * Also perform an update on the actual revision. This is needed
-       * because of updates on the entry-level meta fields.
-       */
-      const actualRevisionEntryKey = createEntryRevisionKeys(initialLatestStorageEntry);
-      entityBatch.put({
-        ...actualRevisionEntryKey,
-        data: latestStorageEntry
-      });
-      const latestTransformer = createTransformer({
-        valuesModifiers,
-        model,
-        entry: latestEntry,
-        storageEntry: initialLatestStorageEntry,
-        fieldRegistry,
-        fieldIndexRegistry,
-        compressionHandler
-      });
-      const esLatestData = await latestTransformer.getElasticsearchLatestEntryData();
-      const esLatestKeys = createEntryLatestKeys(latestEntry);
-      elasticsearchEntityBatch.put({
-        ...esLatestKeys,
-        index,
-        data: esLatestData
-      });
-    }
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not batch write entry records to DynamoDB table.", ex.code || "DELETE_REVISION_ERROR", {
-        error: ex,
-        entry,
-        latestEntry,
-        initialLatestStorageEntry
-      });
-    }
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not batch write entry records to DynamoDB Elasticsearch table.", ex.code || "DELETE_REVISION_ERROR", {
-        error: ex,
-        entry,
-        latestEntry,
-        initialLatestStorageEntry
-      });
-    }
-  };
-  const deleteMultipleEntries = async (initialModel, params) => {
-    const {
-      entries
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    /**
-     * First we need all the revisions of the entries we want to delete.
-     */
-    const revisions = await dataLoaders.getAllEntryRevisions({
-      model,
-      ids: entries
-    });
-    /**
-     * Then we need to construct the queries for all the revisions and entries.
-     */
-
-    const entityBatch = entity.createEntityWriter();
-    const elasticsearchEntityBatch = esEntity.createEntityWriter();
-    for (const id of entries) {
-      /**
-       * Latest item.
-       */
-      entityBatch.delete({
-        PK: createPartitionKey({
-          id,
-          tenant: model.tenant
-        }),
-        SK: "L"
-      });
-      elasticsearchEntityBatch.delete({
-        PK: createPartitionKey({
-          id,
-          tenant: model.tenant
-        }),
-        SK: "L"
-      });
-
-      /**
-       * Published item.
-       */
-      entityBatch.delete({
-        PK: createPartitionKey({
-          id,
-          tenant: model.tenant
-        }),
-        SK: "P"
-      });
-      elasticsearchEntityBatch.delete({
-        PK: createPartitionKey({
-          id,
-          tenant: model.tenant
-        }),
-        SK: "P"
-      });
-    }
-    /**
-     * Exact revisions of all the entries
-     */
-    for (const revision of revisions) {
-      entityBatch.delete({
-        PK: createPartitionKey({
-          id: revision.id,
-          tenant: model.tenant
-        }),
-        SK: createRevisionSortKey({
-          version: revision.version
-        })
-      });
-    }
-    await entityBatch.execute();
-    await elasticsearchEntityBatch.execute();
-  };
-  const list = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const limit = createLimit(params.limit, 50);
-    const {
-      index
-    } = configurations.es({
-      model
-    });
-    const body = createElasticsearchBody({
-      model,
-      fieldRegistry,
-      fieldIndexRegistry,
-      bodyModifiers,
-      sortModifiers,
-      queryModifiers,
-      valueSearchRegistry,
-      fullTextSearches,
-      filterRegistry,
-      params: {
-        ...params,
-        limit,
-        after: decodeCursor(params.after)
-      },
-      plugins
-    });
-    let response;
-    try {
-      response = await elasticsearch.search({
-        index,
-        body
-      });
-    } catch (error) {
-      /**
-       * We will silently ignore the `index_not_found_exception` error and return an empty result set.
-       * This is because the index might not exist yet, and we don't want to throw an error.
-       */
-      if (shouldIgnoreEsResponseError(error)) {
+        if (latestEntry && initialLatestStorageEntry) {
+            const latestStorageEntry = convertToStorageEntry({
+                storageEntry: initialLatestStorageEntry,
+                model
+            });
+            const latestStorageEntryLatestKey = createEntryLatestKeys(latestStorageEntry);
+            entityBatch.put({
+                ...latestStorageEntryLatestKey,
+                data: latestStorageEntry
+            });
+            const actualRevisionEntryKey = createEntryRevisionKeys(initialLatestStorageEntry);
+            entityBatch.put({
+                ...actualRevisionEntryKey,
+                data: latestStorageEntry
+            });
+            const latestTransformer = createTransformer({
+                valuesModifiers,
+                model,
+                entry: latestEntry,
+                storageEntry: initialLatestStorageEntry,
+                fieldRegistry,
+                fieldIndexRegistry,
+                compressionHandler
+            });
+            const esLatestData = await latestTransformer.getElasticsearchLatestEntryData();
+            const esLatestKeys = createEntryLatestKeys(latestEntry);
+            elasticsearchEntityBatch.put({
+                ...esLatestKeys,
+                index,
+                data: esLatestData
+            });
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not batch write entry records to DynamoDB table.", ex.code || "DELETE_REVISION_ERROR", {
+                error: ex,
+                entry,
+                latestEntry,
+                initialLatestStorageEntry
+            });
+        }
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not batch write entry records to DynamoDB Elasticsearch table.", ex.code || "DELETE_REVISION_ERROR", {
+                error: ex,
+                entry,
+                latestEntry,
+                initialLatestStorageEntry
+            });
+        }
+    };
+    const deleteMultipleEntries = async (initialModel, params)=>{
+        const { entries } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const revisions = await dataLoaders.getAllEntryRevisions({
+            model,
+            ids: entries
+        });
+        const entityBatch = entity.createEntityWriter();
+        const elasticsearchEntityBatch = esEntity.createEntityWriter();
+        for (const id of entries){
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    tenant: model.tenant
+                }),
+                SK: "L"
+            });
+            elasticsearchEntityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    tenant: model.tenant
+                }),
+                SK: "L"
+            });
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    tenant: model.tenant
+                }),
+                SK: "P"
+            });
+            elasticsearchEntityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    tenant: model.tenant
+                }),
+                SK: "P"
+            });
+        }
+        for (const revision of revisions)entityBatch.delete({
+            PK: createPartitionKey({
+                id: revision.id,
+                tenant: model.tenant
+            }),
+            SK: createRevisionSortKey({
+                version: revision.version
+            })
+        });
+        await entityBatch.execute();
+        await elasticsearchEntityBatch.execute();
+    };
+    const list = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const limit = createLimit(params.limit, 50);
+        const { index } = configurations.es({
+            model
+        });
+        const body = createElasticsearchBody({
+            model,
+            fieldRegistry,
+            fieldIndexRegistry,
+            bodyModifiers,
+            sortModifiers,
+            queryModifiers,
+            valueSearchRegistry,
+            fullTextSearches,
+            filterRegistry,
+            params: {
+                ...params,
+                limit,
+                after: decodeCursor(params.after)
+            },
+            plugins
+        });
+        let response;
+        try {
+            response = await elasticsearch.search({
+                index,
+                body
+            });
+        } catch (error) {
+            if (shouldIgnoreEsResponseError(error)) return {
+                hasMoreItems: false,
+                totalCount: 0,
+                cursor: null,
+                items: []
+            };
+            throw new WebinyError(error.message, error.code || "OPENSEARCH_ERROR", {
+                error,
+                index,
+                body,
+                model
+            });
+        }
+        const { hits, total } = response.body.hits;
+        const items = extractEntriesFromIndex({
+            fieldRegistry,
+            fieldIndexRegistry,
+            model,
+            entries: hits.map((item)=>item._source)
+        }).map((item)=>convertEntryKeysFromStorage({
+                model,
+                entry: item
+            }));
+        const hasMoreItems = items.length > limit;
+        if (hasMoreItems) items.pop();
+        const cursor = items.length > 0 ? encodeCursor(hits[items.length - 1].sort) || null : null;
         return {
-          hasMoreItems: false,
-          totalCount: 0,
-          cursor: null,
-          items: []
+            hasMoreItems,
+            totalCount: getTotalCount(total),
+            cursor,
+            items
         };
-      }
-      throw new WebinyError(error.message, error.code || "OPENSEARCH_ERROR", {
-        error,
-        index,
-        body,
-        model
-      });
-    }
-    const {
-      hits,
-      total
-    } = response.body.hits;
-    const items = extractEntriesFromIndex({
-      fieldRegistry,
-      fieldIndexRegistry,
-      model,
-      entries: hits.map(item => {
-        return item._source;
-      })
-    }).map(item => {
-      return convertEntryKeysFromStorage({
-        model,
-        entry: item
-      });
-    });
-    const hasMoreItems = items.length > limit;
-    if (hasMoreItems) {
-      /**
-       * Remove the last item from results, we don't want to include it.
-       */
-      items.pop();
-    }
-    /**
-     * Cursor is the `sort` value of the last item in the array.
-     * https://www.elastic.co/guide/en/elasticsearch/reference/current/paginate-search-results.html#search-after
-     */
-    /**
-     * TODO expect errors over hit properties is required due to opensearch library narrowing types too much because of the _source: false. At least what Claude says, didnt go into it too much.
-     * Properties are there, but types are not correct.
-     */
-    // @ts-expect-error
-    const cursor = items.length > 0 ? encodeCursor(hits[items.length - 1].sort) || null : null;
-    return {
-      hasMoreItems,
-      totalCount: getTotalCount(total),
-      cursor,
-      items
     };
-  };
-  const get = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const {
-      items
-    } = await list(model, {
-      ...params,
-      limit: 1
-    });
-    return items.shift() || null;
-  };
-  const publish = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      valuesModifiers,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler
-    });
-    const {
-      entry,
-      storageEntry
-    } = transformer.transformEntryKeys();
-    const revisionKeys = createEntryRevisionKeys(entry);
-    const latestKeys = createEntryLatestKeys(entry);
-    const publishedKeys = createEntryPublishedKeys(entry);
-    let latestEsEntry = null;
-    try {
-      latestEsEntry = await esEntity.getClean(latestKeys);
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not read Elasticsearch latest data.", ex.code || "PUBLISH_LATEST_READ", {
-        error: ex,
-        latestKeys: latestKeys,
-        publishedKeys: publishedKeys
-      });
-    }
-    if (!latestEsEntry) {
-      throw new WebinyError(`Could not publish entry. Could not load latest ("L") record (ES table).`, "PUBLISH_ERROR", {
-        entry
-      });
-    }
-
-    /**
-     * 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) {
-      throw new WebinyError(`Could not publish entry. Could not load latest ("L") record.`, "PUBLISH_ERROR", {
-        entry
-      });
-    }
-
-    /**
-     * We need currently published entry to check if need to remove it.
-     */
-    const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-
-    // 1. Update REV# and P records with new data.
-    const entityBatch = entity.createEntityWriter({
-      put: [{
-        ...revisionKeys,
-        data: storageEntry
-      }, {
-        ...publishedKeys,
-        data: storageEntry
-      }]
-    });
-    const elasticsearchEntityWriter = esEntity.createEntityWriter();
-    const {
-      index: esIndex
-    } = configurations.es({
-      model
-    });
-
-    // 2. When it comes to the latest record, we need to perform a couple of different
-    // updates, based on whether the entry being published is the latest revision or not.
-    const publishedRevisionId = publishedStorageEntry?.id;
-    const publishingLatestRevision = latestStorageEntry?.id === entry.id;
-    if (publishingLatestRevision) {
-      // 2.1 If we're publishing the latest revision, we first need to update the L record.
-      entityBatch.put({
-        ...latestKeys,
-        data: storageEntry
-      });
-
-      // 2.2 Additionally, if we have a previously published entry, we need to mark it as unpublished.
-      //     Note that we need to take re-publishing into account (same published revision being
-      //     published again), in which case the below code does not apply. This is because the
-      //     required updates were already applied above.
-      if (publishedStorageEntry) {
-        const isRepublishing = publishedStorageEntry.id === entry.id;
-        if (!isRepublishing) {
-          /**
-           * Update currently published entry (unpublish it)
-           */
-          const publishedStorageEntryKeys = createEntryRevisionKeys(publishedStorageEntry);
-          entityBatch.put({
-            ...publishedStorageEntryKeys,
-            data: {
-              ...publishedStorageEntry,
-              status: CONTENT_ENTRY_STATUS.UNPUBLISHED
-            }
-          });
+    const get = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const { items } = await list(model, {
+            ...params,
+            limit: 1
+        });
+        return items.shift() || null;
+    };
+    const publish = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler
+        });
+        const { entry, storageEntry } = transformer.transformEntryKeys();
+        const revisionKeys = createEntryRevisionKeys(entry);
+        const latestKeys = createEntryLatestKeys(entry);
+        const publishedKeys = createEntryPublishedKeys(entry);
+        let latestEsEntry = null;
+        try {
+            latestEsEntry = await esEntity.getClean(latestKeys);
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not read Elasticsearch latest data.", ex.code || "PUBLISH_LATEST_READ", {
+                error: ex,
+                latestKeys: latestKeys,
+                publishedKeys: publishedKeys
+            });
         }
-      }
-    } else {
-      // 2.3 If the published revision is not the latest one, the situation is a bit
-      // more complex. We first need to update the L and REV# records with the new
-      // values of *only entry-level* meta fields.
-      const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
-
-      // 2.4 Update L record. Apart from updating the entry-level meta fields, we also need
-      //    to change the status from "published" to "unpublished" (if the status is set to "published").
-      let latestRevisionStatus = latestStorageEntry.status;
-      if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) {
-        latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
-      }
-      const latestStorageEntryFields = {
-        ...latestStorageEntry,
-        ...updatedEntryLevelMetaFields,
-        status: latestRevisionStatus
-      };
-      const latestStorageEntryLatestKeys = createEntryLatestKeys(latestStorageEntry);
-      entityBatch.put({
-        ...latestStorageEntryLatestKeys,
-        data: latestStorageEntryFields
-      });
-
-      // 2.5 Update REV# record.
-      const latestStorageEntryRevisionKeys = createEntryRevisionKeys(latestStorageEntry);
-      entityBatch.put({
-        ...latestStorageEntryRevisionKeys,
-        data: latestStorageEntryFields
-      });
-
-      // 2.6 Additionally, if we have a previously published entry, we need to mark it as unpublished.
-      //     Note that we need to take re-publishing into account (same published revision being
-      //     published again), in which case the below code does not apply. This is because the
-      //     required updates were already applied above.
-      if (publishedStorageEntry) {
-        const isRepublishing = publishedStorageEntry.id === entry.id;
-        const publishedRevisionDifferentFromLatest = publishedRevisionId !== latestStorageEntry.id;
-        if (!isRepublishing && publishedRevisionDifferentFromLatest) {
-          const publishedStorageEntryRevisionKeys = createEntryRevisionKeys(publishedStorageEntry);
-          entityBatch.put({
-            ...publishedStorageEntryRevisionKeys,
-            data: {
-              ...publishedStorageEntry,
-              status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+        if (!latestEsEntry) throw new WebinyError('Could not publish entry. Could not load latest ("L") record (ES table).', "PUBLISH_ERROR", {
+            entry
+        });
+        const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
+        });
+        if (!latestStorageEntry) throw new WebinyError('Could not publish entry. Could not load latest ("L") record.', "PUBLISH_ERROR", {
+            entry
+        });
+        const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
+        });
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...revisionKeys,
+                    data: storageEntry
+                },
+                {
+                    ...publishedKeys,
+                    data: storageEntry
+                }
+            ]
+        });
+        const elasticsearchEntityWriter = esEntity.createEntityWriter();
+        const { index: esIndex } = configurations.es({
+            model
+        });
+        const publishedRevisionId = publishedStorageEntry?.id;
+        const publishingLatestRevision = latestStorageEntry?.id === entry.id;
+        if (publishingLatestRevision) {
+            entityBatch.put({
+                ...latestKeys,
+                data: storageEntry
+            });
+            if (publishedStorageEntry) {
+                const isRepublishing = publishedStorageEntry.id === entry.id;
+                if (!isRepublishing) {
+                    const publishedStorageEntryKeys = createEntryRevisionKeys(publishedStorageEntry);
+                    entityBatch.put({
+                        ...publishedStorageEntryKeys,
+                        data: {
+                            ...publishedStorageEntry,
+                            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                        }
+                    });
+                }
+            }
+        } else {
+            const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+            let latestRevisionStatus = latestStorageEntry.status;
+            if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
+            const latestStorageEntryFields = {
+                ...latestStorageEntry,
+                ...updatedEntryLevelMetaFields,
+                status: latestRevisionStatus
+            };
+            const latestStorageEntryLatestKeys = createEntryLatestKeys(latestStorageEntry);
+            entityBatch.put({
+                ...latestStorageEntryLatestKeys,
+                data: latestStorageEntryFields
+            });
+            const latestStorageEntryRevisionKeys = createEntryRevisionKeys(latestStorageEntry);
+            entityBatch.put({
+                ...latestStorageEntryRevisionKeys,
+                data: latestStorageEntryFields
+            });
+            if (publishedStorageEntry) {
+                const isRepublishing = publishedStorageEntry.id === entry.id;
+                const publishedRevisionDifferentFromLatest = publishedRevisionId !== latestStorageEntry.id;
+                if (!isRepublishing && publishedRevisionDifferentFromLatest) {
+                    const publishedStorageEntryRevisionKeys = createEntryRevisionKeys(publishedStorageEntry);
+                    entityBatch.put({
+                        ...publishedStorageEntryRevisionKeys,
+                        data: {
+                            ...publishedStorageEntry,
+                            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                        }
+                    });
+                }
             }
-          });
         }
-      }
-    }
-
-    // 3. Update records in ES -> DDB table.
-
-    /**
-     * Update the published revision entry in ES.
-     */
-    const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-    elasticsearchEntityWriter.put({
-      ...publishedKeys,
-      index: esIndex,
-      data: esPublishedData
-    });
-
-    /**
-     * 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 compressionHandler.decompress(latestEsEntry.data);
-    if (publishingLatestRevision) {
-      const updatedMetaFields = pickEntryMetaFields(entry);
-      const latestTransformer = createTransformer({
-        valuesModifiers,
-        model,
-        transformedToIndex: {
-          ...latestEsEntryDataDecompressed,
-          status: CONTENT_ENTRY_STATUS.PUBLISHED,
-          locked: true,
-          ...updatedMetaFields
-        },
-        fieldRegistry,
-        fieldIndexRegistry,
-        compressionHandler
-      });
-      const esEntryLatestKeys = createEntryLatestKeys(latestEsEntryDataDecompressed);
-      elasticsearchEntityWriter.put({
-        index: esIndex,
-        data: await latestTransformer.getElasticsearchLatestEntryData(),
-        ...esEntryLatestKeys
-      });
-    } else {
-      const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
-
-      /**
-       * Update the Elasticsearch table to propagate changes to the Elasticsearch.
-       */
-      const latestEsEntry = await esEntity.getClean(latestKeys);
-      if (latestEsEntry) {
+        const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
+        elasticsearchEntityWriter.put({
+            ...publishedKeys,
+            index: esIndex,
+            data: esPublishedData
+        });
         const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
-        let latestRevisionStatus = latestEsEntryDataDecompressed.status;
-        if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) {
-          latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
+        if (publishingLatestRevision) {
+            const updatedMetaFields = pickEntryMetaFields(entry);
+            const latestTransformer = createTransformer({
+                valuesModifiers,
+                model,
+                transformedToIndex: {
+                    ...latestEsEntryDataDecompressed,
+                    status: CONTENT_ENTRY_STATUS.PUBLISHED,
+                    locked: true,
+                    ...updatedMetaFields
+                },
+                fieldRegistry,
+                fieldIndexRegistry,
+                compressionHandler
+            });
+            const esEntryLatestKeys = createEntryLatestKeys(latestEsEntryDataDecompressed);
+            elasticsearchEntityWriter.put({
+                index: esIndex,
+                data: await latestTransformer.getElasticsearchLatestEntryData(),
+                ...esEntryLatestKeys
+            });
+        } else {
+            const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+            const latestEsEntry = await esEntity.getClean(latestKeys);
+            if (latestEsEntry) {
+                const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
+                let latestRevisionStatus = latestEsEntryDataDecompressed.status;
+                if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
+                const updatedLatestEntry = await compressionHandler.compress({
+                    ...latestEsEntryDataDecompressed,
+                    ...updatedEntryLevelMetaFields,
+                    status: latestRevisionStatus
+                });
+                elasticsearchEntityWriter.put({
+                    ...latestKeys,
+                    index: esIndex,
+                    data: updatedLatestEntry
+                });
+            }
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not store publish entry records in DynamoDB table.", ex.code || "PUBLISH_ERROR", {
+                error: ex,
+                entry,
+                latestStorageEntry,
+                publishedStorageEntry
+            });
+        }
+        try {
+            await elasticsearchEntityWriter.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not store publish entry records in DynamoDB Elasticsearch table.", ex.code || "PUBLISH_ES_ERROR", {
+                error: ex,
+                entry,
+                latestStorageEntry,
+                publishedStorageEntry
+            });
         }
-        const updatedLatestEntry = await compressionHandler.compress({
-          ...latestEsEntryDataDecompressed,
-          ...updatedEntryLevelMetaFields,
-          status: latestRevisionStatus
+        return initialStorageEntry;
+    };
+    const unpublish = async (initialModel, params)=>{
+        const { entry: initialEntry, storageEntry: initialStorageEntry } = params;
+        const model = getStorageOperationsModel(initialModel);
+        const transformer = createTransformer({
+            valuesModifiers,
+            model,
+            entry: initialEntry,
+            storageEntry: initialStorageEntry,
+            fieldRegistry,
+            fieldIndexRegistry,
+            compressionHandler
         });
-        elasticsearchEntityWriter.put({
-          ...latestKeys,
-          index: esIndex,
-          data: updatedLatestEntry
+        const { entry, storageEntry } = await transformer.transformEntryKeys();
+        const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                entry.id
+            ]
         });
-      }
-    }
-
-    /**
-     * Finally, execute regular table batch.
-     */
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not store publish entry records in DynamoDB table.", ex.code || "PUBLISH_ERROR", {
-        error: ex,
-        entry,
-        latestStorageEntry,
-        publishedStorageEntry
-      });
-    }
-    /**
-     * And Elasticsearch table batch.
-     */
-    try {
-      await elasticsearchEntityWriter.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not store publish entry records in DynamoDB Elasticsearch table.", ex.code || "PUBLISH_ES_ERROR", {
-        error: ex,
-        entry,
-        latestStorageEntry,
-        publishedStorageEntry
-      });
-    }
-    return initialStorageEntry;
-  };
-  const unpublish = async (initialModel, params) => {
-    const {
-      entry: initialEntry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const model = getStorageOperationsModel(initialModel);
-    const transformer = createTransformer({
-      valuesModifiers,
-      model,
-      entry: initialEntry,
-      storageEntry: initialStorageEntry,
-      fieldRegistry,
-      fieldIndexRegistry,
-      compressionHandler
-    });
-    const {
-      entry,
-      storageEntry
-    } = await transformer.transformEntryKeys();
-
-    /**
-     * We need the latest entry to check if it needs to be updated.
-     */
-    const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: [entry.id]
-    });
-    const partitionKey = createPartitionKey({
-      id: entry.id,
-      tenant: model.tenant
-    });
-    const entryRevisionKeys = createEntryRevisionKeys(entry);
-    const entityBatch = entity.createEntityWriter({
-      put: [{
-        ...entryRevisionKeys,
-        data: storageEntry
-      }],
-      delete: [{
-        PK: partitionKey,
-        SK: createPublishedSortKey()
-      }]
-    });
-    const elasticsearchEntityBatch = esEntity.createEntityWriter({
-      delete: [{
-        PK: partitionKey,
-        SK: createPublishedSortKey()
-      }]
-    });
-
-    /**
-     * If we are unpublishing the latest revision, let's also update the latest revision entry's status in both DynamoDB tables.
-     */
-    if (latestStorageEntry?.id === entry.id) {
-      const {
-        index
-      } = configurations.es({
-        model
-      });
-      const entryLatestKeys = createEntryLatestKeys(storageEntry);
-      entityBatch.put({
-        ...entryLatestKeys,
-        data: storageEntry
-      });
-      const esLatestData = await transformer.getElasticsearchLatestEntryData();
-      elasticsearchEntityBatch.put({
-        index,
-        data: esLatestData,
-        ...entryLatestKeys
-      });
-    }
-
-    /**
-     * Finally, execute regular table batch.
-     */
-    try {
-      await entityBatch.execute();
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not store unpublished entry records in DynamoDB table.", ex.code || "UNPUBLISH_ERROR", {
-        entry,
-        storageEntry
-      });
-    }
-    /**
-     * And Elasticsearch table batch.
-     */
-    try {
-      await elasticsearchEntityBatch.execute();
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not store unpublished entry records in DynamoDB Elasticsearch table.", ex.code || "UNPUBLISH_ERROR", {
-        entry,
-        storageEntry
-      });
-    }
-    return initialStorageEntry;
-  };
-  const getLatestRevisionByEntryId = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const [entry] = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: [params.id]
-    });
-    if (!entry) {
-      return null;
-    }
-    return convertEntryKeysFromStorage({
-      model,
-      entry
-    });
-  };
-  const getPublishedRevisionByEntryId = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const [entry] = await dataLoaders.getPublishedRevisionByEntryId({
-      model,
-      ids: [params.id]
-    });
-    if (!entry) {
-      return null;
-    }
-    return convertEntryKeysFromStorage({
-      model,
-      entry
-    });
-  };
-  const getRevisionById = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const [entry] = await dataLoaders.getRevisionById({
-      model,
-      ids: [params.id]
-    });
-    if (!entry) {
-      return null;
-    }
-    return convertEntryKeysFromStorage({
-      model,
-      entry
-    });
-  };
-  const getRevisions = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const entries = await dataLoaders.getAllEntryRevisions({
-      model,
-      ids: [params.id]
-    });
-    return entries.map(entry => {
-      return convertEntryKeysFromStorage({
-        model,
-        entry
-      });
-    });
-  };
-  const getByIds = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const entries = await dataLoaders.getRevisionById({
-      model,
-      ids: params.ids
-    });
-    return entries.map(entry => {
-      return convertEntryKeysFromStorage({
-        model,
-        entry
-      });
-    });
-  };
-  const getLatestByIds = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const entries = await dataLoaders.getLatestRevisionByEntryId({
-      model,
-      ids: params.ids
-    });
-    return entries.map(entry => {
-      return convertEntryKeysFromStorage({
-        model,
-        entry
-      });
-    });
-  };
-  const getPublishedByIds = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const entries = await dataLoaders.getPublishedRevisionByEntryId({
-      model,
-      ids: params.ids
-    });
-    return entries.map(entry => {
-      return convertEntryKeysFromStorage({
-        model,
-        entry
-      });
-    });
-  };
-  const getPreviousRevision = async (initialModel, params) => {
-    const model = getStorageOperationsModel(initialModel);
-    const {
-      tenant
-    } = model;
-    const {
-      entryId,
-      version
-    } = params;
-    const partitionKey = createPartitionKey({
-      tenant,
-      id: entryId
-    });
-    const options = {
-      beginsWith: `REV#`,
-      reverse: true
+        const partitionKey = createPartitionKey({
+            id: entry.id,
+            tenant: model.tenant
+        });
+        const entryRevisionKeys = createEntryRevisionKeys(entry);
+        const entityBatch = entity.createEntityWriter({
+            put: [
+                {
+                    ...entryRevisionKeys,
+                    data: storageEntry
+                }
+            ],
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ]
+        });
+        const elasticsearchEntityBatch = esEntity.createEntityWriter({
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ]
+        });
+        if (latestStorageEntry?.id === entry.id) {
+            const { index } = configurations.es({
+                model
+            });
+            const entryLatestKeys = createEntryLatestKeys(storageEntry);
+            entityBatch.put({
+                ...entryLatestKeys,
+                data: storageEntry
+            });
+            const esLatestData = await transformer.getElasticsearchLatestEntryData();
+            elasticsearchEntityBatch.put({
+                index,
+                data: esLatestData,
+                ...entryLatestKeys
+            });
+        }
+        try {
+            await entityBatch.execute();
+            dataLoaders.clearAll({
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not store unpublished entry records in DynamoDB table.", ex.code || "UNPUBLISH_ERROR", {
+                entry,
+                storageEntry
+            });
+        }
+        try {
+            await elasticsearchEntityBatch.execute();
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not store unpublished entry records in DynamoDB Elasticsearch table.", ex.code || "UNPUBLISH_ERROR", {
+                entry,
+                storageEntry
+            });
+        }
+        return initialStorageEntry;
     };
-    try {
-      const unfilteredEntries = (await entity.queryAll({
-        partitionKey,
-        options
-      })).map(item => {
-        return item.data;
-      });
-      const entries = unfilteredEntries.filter(item => {
-        return item.version < version;
-      });
-      const entry = entries[0];
-      if (!entry) {
-        return null;
-      }
-      return convertEntryKeysFromStorage({
-        entry,
-        model
-      });
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", {
-        ...params,
-        error: ex,
-        partitionKey,
-        options,
-        model
-      });
-    }
-  };
-  const getUniqueFieldValues = async (model, params) => {
-    const {
-      where,
-      fieldId
-    } = params;
-    const {
-      index
-    } = configurations.es({
-      model
-    });
-    const initialBody = createElasticsearchBody({
-      model,
-      fieldRegistry,
-      fieldIndexRegistry,
-      bodyModifiers,
-      sortModifiers,
-      queryModifiers,
-      valueSearchRegistry,
-      fullTextSearches,
-      filterRegistry,
-      params: {
-        limit: 1,
-        where
-      },
-      plugins
-    });
-    const field = model.fields.find(f => f.fieldId === fieldId);
-    if (!field) {
-      throw new WebinyError(`Could not find field with given "fieldId" value.`, "FIELD_NOT_FOUND", {
-        fieldId
-      });
-    }
-    const body = {
-      ...initialBody,
-      /**
-       * We do not need any hits returned, we only need the aggregations.
-       */
-      size: 0,
-      aggregations: {
-        getUniqueFieldValues: {
-          terms: {
-            field: `values.${field.storageId}.keyword`,
-            size: 1000000
-          }
+    const getLatestRevisionByEntryId = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const [entry] = await dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        if (!entry) return null;
+        return convertEntryKeysFromStorage({
+            model,
+            entry
+        });
+    };
+    const getPublishedRevisionByEntryId = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const [entry] = await dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        if (!entry) return null;
+        return convertEntryKeysFromStorage({
+            model,
+            entry
+        });
+    };
+    const getRevisionById = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const [entry] = await dataLoaders.getRevisionById({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        if (!entry) return null;
+        return convertEntryKeysFromStorage({
+            model,
+            entry
+        });
+    };
+    const getRevisions = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const entries = await dataLoaders.getAllEntryRevisions({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        return entries.map((entry)=>convertEntryKeysFromStorage({
+                model,
+                entry
+            }));
+    };
+    const getByIds = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const entries = await dataLoaders.getRevisionById({
+            model,
+            ids: params.ids
+        });
+        return entries.map((entry)=>convertEntryKeysFromStorage({
+                model,
+                entry
+            }));
+    };
+    const getLatestByIds = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const entries = await dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: params.ids
+        });
+        return entries.map((entry)=>convertEntryKeysFromStorage({
+                model,
+                entry
+            }));
+    };
+    const getPublishedByIds = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const entries = await dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: params.ids
+        });
+        return entries.map((entry)=>convertEntryKeysFromStorage({
+                model,
+                entry
+            }));
+    };
+    const getPreviousRevision = async (initialModel, params)=>{
+        const model = getStorageOperationsModel(initialModel);
+        const { tenant } = model;
+        const { entryId, version } = params;
+        const partitionKey = createPartitionKey({
+            tenant,
+            id: entryId
+        });
+        const options = {
+            beginsWith: "REV#",
+            reverse: true
+        };
+        try {
+            const unfilteredEntries = (await entity.queryAll({
+                partitionKey,
+                options
+            })).map((item)=>item.data);
+            const entries = unfilteredEntries.filter((item)=>item.version < version);
+            const entry = entries[0];
+            if (!entry) return null;
+            return convertEntryKeysFromStorage({
+                entry,
+                model
+            });
+        } catch (ex) {
+            throw new WebinyError(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", {
+                ...params,
+                error: ex,
+                partitionKey,
+                options,
+                model
+            });
         }
-      }
     };
-    let response = undefined;
-    try {
-      response = await elasticsearch.search({
-        index,
-        body
-      });
-    } catch (error) {
-      if (shouldIgnoreEsResponseError(error)) {
-        return [];
-      }
-      throw new WebinyError(error.message || "Error in the Elasticsearch query.", error.code || "OPENSEARCH_ERROR", {
-        error,
-        index,
-        model,
-        body
-      });
-    }
-    const aggregations = response.body.aggregations || {};
-    const agg = aggregations["getUniqueFieldValues"];
-    const buckets = agg && "buckets" in agg && Array.isArray(agg.buckets) ? agg.buckets : [];
-    return buckets.map(bucket => {
-      return {
-        value: bucket.key,
-        count: bucket.doc_count
-      };
-    });
-  };
-  return {
-    create,
-    createRevisionFrom,
-    update,
-    move,
-    delete: deleteEntry,
-    moveToBin,
-    restoreFromBin,
-    deleteRevision,
-    deleteMultipleEntries,
-    get,
-    publish,
-    unpublish,
-    list,
-    getLatestRevisionByEntryId,
-    getPublishedRevisionByEntryId,
-    getRevisionById,
-    getRevisions,
-    getByIds,
-    getLatestByIds,
-    getPublishedByIds,
-    getPreviousRevision,
-    getUniqueFieldValues,
-    dataLoaders
-  };
+    const getUniqueFieldValues = async (model, params)=>{
+        const { where, fieldId } = params;
+        const { index } = configurations.es({
+            model
+        });
+        const initialBody = createElasticsearchBody({
+            model,
+            fieldRegistry,
+            fieldIndexRegistry,
+            bodyModifiers,
+            sortModifiers,
+            queryModifiers,
+            valueSearchRegistry,
+            fullTextSearches,
+            filterRegistry,
+            params: {
+                limit: 1,
+                where
+            },
+            plugins
+        });
+        const field = model.fields.find((f)=>f.fieldId === fieldId);
+        if (!field) throw new WebinyError('Could not find field with given "fieldId" value.', "FIELD_NOT_FOUND", {
+            fieldId
+        });
+        const body = {
+            ...initialBody,
+            size: 0,
+            aggregations: {
+                getUniqueFieldValues: {
+                    terms: {
+                        field: `values.${field.storageId}.keyword`,
+                        size: 1000000
+                    }
+                }
+            }
+        };
+        let response;
+        try {
+            response = await elasticsearch.search({
+                index,
+                body
+            });
+        } catch (error) {
+            if (shouldIgnoreEsResponseError(error)) return [];
+            throw new WebinyError(error.message || "Error in the Elasticsearch query.", error.code || "OPENSEARCH_ERROR", {
+                error,
+                index,
+                model,
+                body
+            });
+        }
+        const aggregations = response.body.aggregations || {};
+        const agg = aggregations["getUniqueFieldValues"];
+        const buckets = agg && "buckets" in agg && Array.isArray(agg.buckets) ? agg.buckets : [];
+        return buckets.map((bucket)=>({
+                value: bucket.key,
+                count: bucket.doc_count
+            }));
+    };
+    return {
+        create,
+        createRevisionFrom,
+        update,
+        move,
+        delete: deleteEntry,
+        moveToBin,
+        restoreFromBin,
+        deleteRevision,
+        deleteMultipleEntries,
+        get,
+        publish,
+        unpublish,
+        list,
+        getLatestRevisionByEntryId,
+        getPublishedRevisionByEntryId,
+        getRevisionById,
+        getRevisions,
+        getByIds,
+        getLatestByIds,
+        getPublishedByIds,
+        getPreviousRevision,
+        getUniqueFieldValues,
+        dataLoaders
+    };
 };
+export { createEntriesStorageOperations };
 
 //# sourceMappingURL=index.js.map