@webiny/api-headless-cms-ddb-es 5.34.8-beta.1 → 5.35.0-beta.0

package/operations/entry/index.js

@@ -1,44 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEntriesStorageOperations = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _types = require("@webiny/api-headless-cms/types");
-
 var _helpers = require("../../helpers");
-
 var _configurations = require("../../configurations");
-
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
-
 var _dataLoaders = require("./dataLoaders");
-
 var _keys = require("./keys");
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
 var _apiElasticsearch = require("@webiny/api-elasticsearch");
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
 var _utils = require("@webiny/utils");
-
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
 var _body = require("./elasticsearch/body");
-
 var _recordType = require("./recordType");
-
+var _apiHeadlessCms = require("@webiny/api-headless-cms");
 const getEntryData = input => {
   const output = (0, _objectSpread2.default)({}, input);
   delete output["PK"];
@@ -47,7 +30,6 @@ const getEntryData = input => {
   delete output["latest"];
   return output;
 };
-
 const getESLatestEntryData = async (plugins, entry) => {
   return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     latest: true,
@@ -55,7 +37,6 @@ const getESLatestEntryData = async (plugins, entry) => {
     __type: (0, _recordType.createLatestRecordType)()
   }));
 };
-
 const getESPublishedEntryData = async (plugins, entry) => {
   return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     published: true,
@@ -63,7 +44,6 @@ const getESPublishedEntryData = async (plugins, entry) => {
     __type: (0, _recordType.createPublishedRecordType)()
   }));
 };
-
 const convertEntryKeysToStorage = params => {
   const {
     model,
@@ -77,7 +57,6 @@ const convertEntryKeysToStorage = params => {
     values
   });
 };
-
 const convertEntryKeysFromStorage = params => {
   const {
     model,
@@ -91,7 +70,6 @@ const convertEntryKeysFromStorage = params => {
     values
   });
 };
-
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -99,15 +77,27 @@ const createEntriesStorageOperations = params => {
     elasticsearch,
     plugins
   } = params;
+  let storageOperationsCmsModelPlugin;
+  const getStorageOperationsCmsModelPlugin = () => {
+    if (storageOperationsCmsModelPlugin) {
+      return storageOperationsCmsModelPlugin;
+    }
+    storageOperationsCmsModelPlugin = plugins.oneByType(_apiHeadlessCms.StorageOperationsCmsModelPlugin.type);
+    return storageOperationsCmsModelPlugin;
+  };
+  const getStorageOperationsModel = model => {
+    const plugin = getStorageOperationsCmsModelPlugin();
+    return plugin.getModel(model);
+  };
   const dataLoaders = new _dataLoaders.DataLoadersHandler({
     entity
   });
-
-  const create = async (model, params) => {
+  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;
     const entry = convertEntryKeysToStorage({
@@ -128,13 +118,11 @@ const createEntriesStorageOperations = params => {
         locked
       }))
     });
-
     const {
       index: esIndex
     } = _configurations.configurations.es({
       model
     });
-
     const esLatestData = await getESLatestEntryData(plugins, esEntry);
     const esPublishedData = await getESPublishedEntryData(plugins, esEntry);
     const revisionKeys = {
@@ -170,7 +158,6 @@ const createEntriesStorageOperations = params => {
     }, latestKeys), {}, {
       TYPE: (0, _recordType.createLatestRecordType)()
     }))];
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
@@ -178,7 +165,6 @@ const createEntriesStorageOperations = params => {
         TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -194,19 +180,16 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
-
     const esItems = [esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
       index: esIndex,
       data: esLatestData
     }))];
-
     if (isPublished) {
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: esPublishedData
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -219,15 +202,14 @@ const createEntriesStorageOperations = params => {
         esEntry
       });
     }
-
     return initialStorageEntry;
   };
-
-  const createRevisionFrom = async (model, params) => {
+  const createRevisionFrom = async (initialModel, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
@@ -264,13 +246,11 @@ const createEntriesStorageOperations = params => {
     }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       TYPE: (0, _recordType.createLatestRecordType)()
     }, latestKeys))];
-
     const {
       index
     } = _configurations.configurations.es({
       model
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -289,8 +269,6 @@ const createEntriesStorageOperations = params => {
     /**
      * Update the "latest" entry item in the Elasticsearch
      */
-
-
     try {
       await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
@@ -305,16 +283,14 @@ const createEntriesStorageOperations = params => {
     /**
      * There are no modifications on the entry created so just return the data.
      */
-
-
     return initialStorageEntry;
   };
-
-  const update = async (model, params) => {
+  const update = async (initialModel, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
@@ -349,10 +325,10 @@ const createEntriesStorageOperations = params => {
       }),
       SK: (0, _keys.createPublishedSortKey)()
     };
+
     /**
      * We need the latest entry to check if it needs to be updated.
      */
-
     const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -366,7 +342,6 @@ const createEntriesStorageOperations = params => {
     }, revisionKeys), {}, {
       TYPE: (0, _recordType.createRecordType)()
     }))];
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
@@ -374,9 +349,7 @@ const createEntriesStorageOperations = params => {
         TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
-
     const esItems = [];
-
     const {
       index: esIndex
     } = _configurations.configurations.es({
@@ -385,15 +358,11 @@ const createEntriesStorageOperations = params => {
     /**
      * Variable for the elasticsearch entry so we do not convert it more than once
      */
-
-
     let esEntry = undefined;
     /**
      * If the latest entry is the one being updated, we need to create a new latest entry records.
      */
-
     let elasticsearchLatestData = null;
-
     if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * First we update the regular DynamoDB table
@@ -404,7 +373,6 @@ const createEntriesStorageOperations = params => {
       /**
        * And then update the Elasticsearch table to propagate changes to the Elasticsearch
        */
-
       esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
@@ -421,9 +389,7 @@ const createEntriesStorageOperations = params => {
         data: elasticsearchLatestData
       })));
     }
-
     let elasticsearchPublishedData = null;
-
     if (isPublished && (publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
       if (!elasticsearchLatestData) {
         /**
@@ -441,7 +407,6 @@ const createEntriesStorageOperations = params => {
             }))
           });
         }
-
         elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
       } else {
         elasticsearchPublishedData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, elasticsearchLatestData), {}, {
@@ -451,13 +416,11 @@ const createEntriesStorageOperations = params => {
         });
         delete elasticsearchPublishedData.latest;
       }
-
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: elasticsearchPublishedData
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -473,11 +436,9 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
-
     if (esItems.length === 0) {
       return initialStorageEntry;
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -489,14 +450,13 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     return initialStorageEntry;
   };
-
-  const deleteEntry = async (model, params) => {
+  const deleteEntry = async (initialModel, params) => {
     const {
       entry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
@@ -528,7 +488,6 @@ const createEntriesStorageOperations = params => {
         SK: item.SK
       });
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -543,7 +502,6 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -556,19 +514,18 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
-  const deleteRevision = async (model, params) => {
+  const deleteRevision = async (initialModel, params) => {
     const {
       entry,
       latestEntry,
       latestStorageEntry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
       tenant: model.tenant
     });
-
     const {
       index
     } = _configurations.configurations.es({
@@ -577,8 +534,6 @@ const createEntriesStorageOperations = params => {
     /**
      * We need published entry to delete it if necessary.
      */
-
-
     const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -586,7 +541,6 @@ const createEntriesStorageOperations = params => {
     /**
      * We need to delete all existing records of the given entry revision.
      */
-
     const items = [
     /**
      * Delete records of given entry revision.
@@ -596,10 +550,10 @@ const createEntriesStorageOperations = params => {
       SK: (0, _keys.createRevisionSortKey)(entry)
     })];
     const esItems = [];
+
     /**
      * If revision we are deleting is the published one as well, we need to delete those records as well.
      */
-
     if ((publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
       items.push(entity.deleteBatch({
         PK: partitionKey,
@@ -610,7 +564,6 @@ const createEntriesStorageOperations = params => {
         SK: (0, _keys.createPublishedSortKey)()
       }));
     }
-
     if (latestEntry && latestStorageEntry) {
       const esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
@@ -622,7 +575,6 @@ const createEntriesStorageOperations = params => {
       /**
        * In the end we need to set the new latest entry
        */
-
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -635,7 +587,6 @@ const createEntriesStorageOperations = params => {
         data: esLatestData
       }));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -652,11 +603,9 @@ const createEntriesStorageOperations = params => {
         latestStorageEntry
       });
     }
-
     if (esItems.length === 0) {
       return;
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -671,23 +620,19 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
-  const list = async (model, params) => {
+  const list = async (initialModel, params) => {
     var _response, _response$body;
-
+    const model = getStorageOperationsModel(initialModel);
     const limit = (0, _apiElasticsearch.createLimit)(params.limit, 50);
-
     const {
       index
     } = _configurations.configurations.es({
       model
     });
-
     try {
       const result = await elasticsearch.indices.exists({
         index
       });
-
       if (!(result !== null && result !== void 0 && result.body)) {
         return {
           hasMoreItems: false,
@@ -702,7 +647,6 @@ const createEntriesStorageOperations = params => {
         index
       });
     }
-
     const body = (0, _body.createElasticsearchBody)({
       model,
       params: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
@@ -712,7 +656,6 @@ const createEntriesStorageOperations = params => {
       plugins
     });
     let response;
-
     try {
       response = await elasticsearch.search({
         index,
@@ -726,7 +669,6 @@ const createEntriesStorageOperations = params => {
         model
       });
     }
-
     const {
       hits,
       total
@@ -742,7 +684,6 @@ const createEntriesStorageOperations = params => {
       });
     });
     const hasMoreItems = items.length > limit;
-
     if (hasMoreItems) {
       /**
        * Remove the last item from results, we don't want to include it.
@@ -753,8 +694,6 @@ const createEntriesStorageOperations = params => {
      * 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
      */
-
-
     const cursor = items.length > 0 ? (0, _apiElasticsearch.encodeCursor)(hits[items.length - 1].sort) || null : null;
     return {
       hasMoreItems,
@@ -763,8 +702,8 @@ const createEntriesStorageOperations = params => {
       items
     };
   };
-
-  const get = async (model, params) => {
+  const get = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const {
       items
     } = await list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
@@ -772,12 +711,12 @@ const createEntriesStorageOperations = params => {
     }));
     return items.shift() || null;
   };
-
-  const publish = async (model, params) => {
+  const publish = async (initialModel, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
@@ -786,10 +725,10 @@ const createEntriesStorageOperations = params => {
       model,
       entry: initialStorageEntry
     });
+
     /**
      * We need currently published entry to check if need to remove it.
      */
-
     const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -819,7 +758,6 @@ const createEntriesStorageOperations = params => {
       SK: (0, _keys.createPublishedSortKey)()
     };
     let latestEsEntry = null;
-
     try {
       latestEsEntry = await (0, _get.get)({
         entity: esEntity,
@@ -832,18 +770,15 @@ const createEntriesStorageOperations = params => {
         publishedKeys: publishedKeys
       });
     }
-
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), revisionKeys), {}, {
       TYPE: (0, _recordType.createRecordType)()
     }))];
     const esItems = [];
-
     const {
       index
     } = _configurations.configurations.es({
       model
     });
-
     if (publishedStorageEntry && publishedStorageEntry.id !== entry.id) {
       /**
        * If there is a `published` entry already, we need to set it to `unpublished`. We need to
@@ -871,28 +806,23 @@ const createEntriesStorageOperations = params => {
     /**
      * Update the helper item in DB with the new published entry
      */
-
-
     items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), publishedKeys), {}, {
       TYPE: (0, _recordType.createPublishedRecordType)()
     })));
+
     /**
      * We need the latest entry to check if it needs to be updated as well in the Elasticsearch.
      */
-
     const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [entry.id]
     });
-
     if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), latestKeys)));
     }
     /**
      * If we are publishing the latest revision, let's also update the latest revision's status in ES.
      */
-
-
     if (latestEsEntry && (latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * Need to decompress the data from Elasticsearch DynamoDB table.
@@ -912,7 +842,6 @@ const createEntriesStorageOperations = params => {
         }))
       }));
     }
-
     const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
@@ -922,16 +851,15 @@ const createEntriesStorageOperations = params => {
     /**
      * Update the published revision entry in ES.
      */
-
     const esPublishedData = await getESPublishedEntryData(plugins, preparedEntryData);
     esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
       index,
       data: esPublishedData
     })));
+
     /**
      * Finally, execute regular table batch.
      */
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -951,8 +879,6 @@ const createEntriesStorageOperations = params => {
     /**
      * And Elasticsearch table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -966,15 +892,14 @@ const createEntriesStorageOperations = params => {
         publishedStorageEntry
       });
     }
-
     return initialStorageEntry;
   };
-
-  const unpublish = async (model, params) => {
+  const unpublish = async (initialModel, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
+    const model = getStorageOperationsModel(initialModel);
     const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
@@ -983,10 +908,10 @@ const createEntriesStorageOperations = params => {
       model,
       entry: initialStorageEntry
     });
+
     /**
      * We need the latest entry to check if it needs to be updated.
      */
-
     const [latestStorageEntry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -1011,14 +936,12 @@ const createEntriesStorageOperations = params => {
     /**
      * If we are unpublishing the latest revision, let's also update the latest revision entry's status in ES.
      */
-
     if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       const {
         index
       } = _configurations.configurations.es({
         model
       });
-
       const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
@@ -1033,11 +956,10 @@ const createEntriesStorageOperations = params => {
         data: esLatestData
       }));
     }
+
     /**
      * Finally, execute regular table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -1055,8 +977,6 @@ const createEntriesStorageOperations = params => {
     /**
      * And Elasticsearch table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -1068,59 +988,52 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
-
     return initialStorageEntry;
   };
-
-  const getLatestRevisionByEntryId = async (model, params) => {
+  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 (model, params) => {
+  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 (model, params) => {
+  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 (model, params) => {
+  const getRevisions = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const entries = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
@@ -1132,8 +1045,8 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
-  const getByIds = async (model, params) => {
+  const getByIds = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const entries = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
@@ -1145,8 +1058,8 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
-  const getLatestByIds = async (model, params) => {
+  const getLatestByIds = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const entries = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
@@ -1158,8 +1071,8 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
-  const getPublishedByIds = async (model, params) => {
+  const getPublishedByIds = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const entries = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
@@ -1171,8 +1084,8 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
-  const getPreviousRevision = async (model, params) => {
+  const getPreviousRevision = async (initialModel, params) => {
+    const model = getStorageOperationsModel(initialModel);
     const {
       tenant,
       locale
@@ -1190,7 +1103,6 @@ const createEntriesStorageOperations = params => {
       }),
       options: {
         lt: `REV#${(0, _utils.zeroPad)(version)}`,
-
         /**
          * We need to have extra checks because DynamoDB will return published or latest record if there is no REV# record.
          */
@@ -1204,15 +1116,12 @@ const createEntriesStorageOperations = params => {
         reverse: true
       }
     };
-
     try {
       const result = await (0, _query.queryOne)(queryParams);
       const entry = (0, _cleanup.cleanupItem)(entity, result);
-
       if (!entry) {
         return null;
       }
-
       return convertEntryKeysFromStorage({
         entry,
         model
@@ -1226,7 +1135,6 @@ const createEntriesStorageOperations = params => {
       }));
     }
   };
-
   return {
     create,
     createRevisionFrom,
@@ -1247,5 +1155,4 @@ const createEntriesStorageOperations = params => {
     getPreviousRevision
   };
 };
-
 exports.createEntriesStorageOperations = createEntriesStorageOperations;