@webiny/api-headless-cms-ddb-es 0.0.0-unstable.40876133bb → 0.0.0-unstable.496cf268ac

package/operations/entry/index.js

@@ -1,82 +1,49 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createPublishedType = exports.createLatestType = exports.createEntriesStorageOperations = void 0;
-
+exports.createEntriesStorageOperations = void 0;
 var _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 _error = _interopRequireDefault(require("@webiny/error"));
-
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-
-var _omit = _interopRequireDefault(require("lodash/omit"));
-
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
-
 var _dataLoaders = require("./dataLoaders");
-
 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");
-
-const createType = () => {
-  return "cms.entry";
-};
-
-const createLatestType = () => {
-  return `${createType()}.l`;
-};
-
-exports.createLatestType = createLatestType;
-
-const createPublishedType = () => {
-  return `${createType()}.p`;
-};
-
-exports.createPublishedType = createPublishedType;
-
-const getEntryData = entry => {
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit.default)(entry, ["PK", "SK", "published", "latest"])), {}, {
-    TYPE: createType(),
-    __type: createType()
-  });
+var _body = require("./elasticsearch/body");
+var _recordType = require("./recordType");
+const getEntryData = input => {
+  const output = (0, _objectSpread2.default)({}, input);
+  delete output["PK"];
+  delete output["SK"];
+  delete output["published"];
+  delete output["latest"];
+  return output;
 };
-
 const getESLatestEntryData = async (plugins, entry) => {
   return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     latest: true,
-    TYPE: createLatestType(),
-    __type: createLatestType()
+    TYPE: (0, _recordType.createLatestRecordType)(),
+    __type: (0, _recordType.createLatestRecordType)()
   }));
 };
-
 const getESPublishedEntryData = async (plugins, entry) => {
   return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
     published: true,
-    TYPE: createPublishedType(),
-    __type: createPublishedType()
+    TYPE: (0, _recordType.createPublishedRecordType)(),
+    __type: (0, _recordType.createPublishedRecordType)()
   }));
 };
-
-const convertToStorageEntry = params => {
+const convertEntryKeysToStorage = params => {
   const {
     model,
     entry
@@ -89,8 +56,7 @@ const convertToStorageEntry = params => {
     values
   });
 };
-
-const convertFromStorageEntry = params => {
+const convertEntryKeysFromStorage = params => {
   const {
     model,
     entry
@@ -103,7 +69,6 @@ const convertFromStorageEntry = params => {
     values
   });
 };
-
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -114,7 +79,6 @@ const createEntriesStorageOperations = params => {
   const dataLoaders = new _dataLoaders.DataLoadersHandler({
     entity
   });
-
   const create = async (model, params) => {
     const {
       entry: initialEntry,
@@ -122,11 +86,11 @@ const createEntriesStorageOperations = params => {
     } = params;
     const isPublished = initialEntry.status === "published";
     const locked = isPublished ? true : initialEntry.locked;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -140,13 +104,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 = {
@@ -176,21 +138,19 @@ const createEntriesStorageOperations = params => {
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, revisionKeys), {}, {
-      TYPE: createType()
+      TYPE: (0, _recordType.createRecordType)()
     })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, latestKeys), {}, {
-      TYPE: createLatestType()
+      TYPE: (0, _recordType.createLatestRecordType)()
     }))];
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
       }, publishedKeys), {}, {
-        TYPE: createPublishedType()
+        TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -206,19 +166,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,
@@ -231,20 +188,18 @@ const createEntriesStorageOperations = params => {
         esEntry
       });
     }
-
     return initialStorageEntry;
   };
-
   const createRevisionFrom = async (model, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -272,17 +227,15 @@ const createEntriesStorageOperations = params => {
     });
     const esLatestData = await getESLatestEntryData(plugins, esEntry);
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
-      TYPE: createType()
+      TYPE: (0, _recordType.createRecordType)()
     }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
-      TYPE: createLatestType()
+      TYPE: (0, _recordType.createLatestRecordType)()
     }, latestKeys))];
-
     const {
       index
     } = _configurations.configurations.es({
       model
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -301,8 +254,6 @@ const createEntriesStorageOperations = params => {
     /**
      * Update the "latest" entry item in the Elasticsearch
      */
-
-
     try {
       await esEntity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index,
@@ -317,21 +268,18 @@ const createEntriesStorageOperations = params => {
     /**
      * There are no modifications on the entry created so just return the data.
      */
-
-
     return initialStorageEntry;
   };
-
   const update = async (model, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -361,10 +309,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]
@@ -376,19 +324,16 @@ const createEntriesStorageOperations = params => {
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked
     }, revisionKeys), {}, {
-      TYPE: createType()
+      TYPE: (0, _recordType.createRecordType)()
     }))];
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked
       }, publishedKeys), {}, {
-        TYPE: createPublishedType()
+        TYPE: (0, _recordType.createPublishedRecordType)()
       })));
     }
-
     const esItems = [];
-
     const {
       index: esIndex
     } = _configurations.configurations.es({
@@ -397,15 +342,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
@@ -416,7 +357,6 @@ const createEntriesStorageOperations = params => {
       /**
        * And then update the Elasticsearch table to propagate changes to the Elasticsearch
        */
-
       esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
@@ -433,9 +373,7 @@ const createEntriesStorageOperations = params => {
         data: elasticsearchLatestData
       })));
     }
-
     let elasticsearchPublishedData = null;
-
     if (isPublished && (publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
       if (!elasticsearchLatestData) {
         /**
@@ -453,23 +391,20 @@ const createEntriesStorageOperations = params => {
             }))
           });
         }
-
         elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
       } else {
         elasticsearchPublishedData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, elasticsearchLatestData), {}, {
           published: true,
-          TYPE: createPublishedType(),
-          __type: createPublishedType()
+          TYPE: (0, _recordType.createPublishedRecordType)(),
+          __type: (0, _recordType.createPublishedRecordType)()
         });
         delete elasticsearchPublishedData.latest;
       }
-
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: elasticsearchPublishedData
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -485,11 +420,9 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
-
     if (esItems.length === 0) {
       return initialStorageEntry;
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -501,10 +434,8 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     return initialStorageEntry;
   };
-
   const deleteEntry = async (model, params) => {
     const {
       entry
@@ -540,7 +471,6 @@ const createEntriesStorageOperations = params => {
         SK: item.SK
       });
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -555,7 +485,6 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -568,7 +497,6 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const deleteRevision = async (model, params) => {
     const {
       entry,
@@ -580,7 +508,6 @@ const createEntriesStorageOperations = params => {
       locale: model.locale,
       tenant: model.tenant
     });
-
     const {
       index
     } = _configurations.configurations.es({
@@ -589,8 +516,6 @@ const createEntriesStorageOperations = params => {
     /**
      * We need published entry to delete it if necessary.
      */
-
-
     const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -598,7 +523,6 @@ const createEntriesStorageOperations = params => {
     /**
      * We need to delete all existing records of the given entry revision.
      */
-
     const items = [
     /**
      * Delete records of given entry revision.
@@ -608,10 +532,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,
@@ -622,7 +546,6 @@ const createEntriesStorageOperations = params => {
         SK: (0, _keys.createPublishedSortKey)()
       }));
     }
-
     if (latestEntry && latestStorageEntry) {
       const esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
@@ -634,11 +557,10 @@ 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)(),
-        TYPE: createLatestType()
+        TYPE: (0, _recordType.createLatestRecordType)()
       })));
       esItems.push(esEntity.putBatch({
         PK: partitionKey,
@@ -647,7 +569,6 @@ const createEntriesStorageOperations = params => {
         data: esLatestData
       }));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -664,11 +585,9 @@ const createEntriesStorageOperations = params => {
         latestStorageEntry
       });
     }
-
     if (esItems.length === 0) {
       return;
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -683,22 +602,19 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const list = async (model, params) => {
+    var _response, _response$body;
     const limit = (0, _apiElasticsearch.createLimit)(params.limit, 50);
-
     const {
       index
     } = _configurations.configurations.es({
       model
     });
-
     try {
       const result = await elasticsearch.indices.exists({
         index
       });
-
-      if (!result || !result.body) {
+      if (!(result !== null && result !== void 0 && result.body)) {
         return {
           hasMoreItems: false,
           totalCount: 0,
@@ -712,17 +628,15 @@ const createEntriesStorageOperations = params => {
         index
       });
     }
-
-    const body = (0, _helpers.createElasticsearchQueryBody)({
+    const body = (0, _body.createElasticsearchBody)({
       model,
-      args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-        limit
+      params: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+        limit,
+        after: (0, _apiElasticsearch.decodeCursor)(params.after)
       }),
-      plugins,
-      parentPath: "values"
+      plugins
     });
     let response;
-
     try {
       response = await elasticsearch.search({
         index,
@@ -736,23 +650,21 @@ const createEntriesStorageOperations = params => {
         model
       });
     }
-
     const {
       hits,
       total
-    } = response.body.hits;
+    } = ((_response = response) === null || _response === void 0 ? void 0 : (_response$body = _response.body) === null || _response$body === void 0 ? void 0 : _response$body.hits) || {};
     const items = (0, _helpers.extractEntriesFromIndex)({
       plugins,
       model,
       entries: hits.map(item => item._source)
     }).map(item => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry: item
       });
     });
     const hasMoreItems = items.length > limit;
-
     if (hasMoreItems) {
       /**
        * Remove the last item from results, we don't want to include it.
@@ -763,8 +675,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,
@@ -773,7 +683,6 @@ const createEntriesStorageOperations = params => {
       items
     };
   };
-
   const get = async (model, params) => {
     const {
       items
@@ -782,24 +691,23 @@ const createEntriesStorageOperations = params => {
     }));
     return items.shift() || null;
   };
-
   const publish = async (model, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
+
     /**
      * We need currently published entry to check if need to remove it.
      */
-
     const [publishedStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [entry.id]
@@ -829,7 +737,6 @@ const createEntriesStorageOperations = params => {
       SK: (0, _keys.createPublishedSortKey)()
     };
     let latestEsEntry = null;
-
     try {
       latestEsEntry = await (0, _get.get)({
         entity: esEntity,
@@ -842,18 +749,15 @@ const createEntriesStorageOperations = params => {
         publishedKeys: publishedKeys
       });
     }
-
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), revisionKeys), {}, {
-      TYPE: createType()
+      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
@@ -865,12 +769,7 @@ const createEntriesStorageOperations = params => {
       const [previouslyPublishedEntry] = await dataLoaders.getRevisionById({
         model,
         ids: [publishedStorageEntry.id]
-      }); //
-      // const previouslyPublishedEntry = convertToStorageEntry({
-      //     model,
-      //     entry: initialPreviouslyPublishedEntry
-      // });
-
+      });
       items.push(
       /**
        * Update currently published entry (unpublish it)
@@ -878,7 +777,7 @@ const createEntriesStorageOperations = params => {
       entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, previouslyPublishedEntry), {}, {
         status: _types.CONTENT_ENTRY_STATUS.UNPUBLISHED,
         savedOn: entry.savedOn,
-        TYPE: createType(),
+        TYPE: (0, _recordType.createRecordType)(),
         PK: (0, _keys.createPartitionKey)(publishedStorageEntry),
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry)
       })));
@@ -886,28 +785,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: createPublishedType()
+      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.
@@ -919,15 +813,14 @@ const createEntriesStorageOperations = params => {
         index,
         PK: (0, _keys.createPartitionKey)(latestEsEntryDataDecompressed),
         SK: (0, _keys.createLatestSortKey)(),
-        data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
+        data: await getESLatestEntryData(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
           status: _types.CONTENT_ENTRY_STATUS.PUBLISHED,
           locked: true,
           savedOn: entry.savedOn,
           publishedOn: entry.publishedOn
-        })
+        }))
       }));
     }
-
     const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
@@ -937,16 +830,15 @@ const createEntriesStorageOperations = params => {
     /**
      * Update the published revision entry in ES.
      */
-
-    const esLatestData = await getESPublishedEntryData(plugins, preparedEntryData);
+    const esPublishedData = await getESPublishedEntryData(plugins, preparedEntryData);
     esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
       index,
-      data: esLatestData
+      data: esPublishedData
     })));
+
     /**
      * Finally, execute regular table batch.
      */
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -966,8 +858,6 @@ const createEntriesStorageOperations = params => {
     /**
      * And Elasticsearch table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -981,27 +871,25 @@ const createEntriesStorageOperations = params => {
         publishedStorageEntry
       });
     }
-
     return initialStorageEntry;
   };
-
   const unpublish = async (model, params) => {
     const {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       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]
@@ -1017,7 +905,7 @@ const createEntriesStorageOperations = params => {
     }), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
-      TYPE: createType()
+      TYPE: (0, _recordType.createRecordType)()
     }))];
     const esItems = [esEntity.deleteBatch({
       PK: partitionKey,
@@ -1026,14 +914,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,
@@ -1048,11 +934,10 @@ const createEntriesStorageOperations = params => {
         data: esLatestData
       }));
     }
+
     /**
      * Finally, execute regular table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -1070,8 +955,6 @@ const createEntriesStorageOperations = params => {
     /**
      * And Elasticsearch table batch.
      */
-
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: esEntity.table,
@@ -1083,110 +966,95 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
-
     return initialStorageEntry;
   };
-
   const getLatestRevisionByEntryId = async (model, params) => {
     const [entry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
-
     if (!entry) {
       return null;
     }
-
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
   };
-
   const getPublishedRevisionByEntryId = async (model, params) => {
     const [entry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
-
     if (!entry) {
       return null;
     }
-
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
   };
-
   const getRevisionById = async (model, params) => {
     const [entry] = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
-
     if (!entry) {
       return null;
     }
-
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
   };
-
   const getRevisions = async (model, params) => {
     const entries = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
     });
   };
-
   const getByIds = async (model, params) => {
     const entries = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
     });
   };
-
   const getLatestByIds = async (model, params) => {
     const entries = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
     });
   };
-
   const getPublishedByIds = async (model, params) => {
     const entries = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
     });
   };
-
   const getPreviousRevision = async (model, params) => {
     const {
       tenant,
@@ -1205,13 +1073,12 @@ 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.
          */
         filters: [{
           attr: "TYPE",
-          eq: createType()
+          eq: (0, _recordType.createRecordType)()
         }, {
           attr: "version",
           lt: version
@@ -1219,16 +1086,13 @@ 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 convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         entry,
         model
       });
@@ -1241,7 +1105,6 @@ const createEntriesStorageOperations = params => {
       }));
     }
   };
-
   return {
     create,
     createRevisionFrom,
@@ -1262,5 +1125,4 @@ const createEntriesStorageOperations = params => {
     getPreviousRevision
   };
 };
-
 exports.createEntriesStorageOperations = createEntriesStorageOperations;