@webiny/api-headless-cms-ddb-es 5.37.8 → 5.38.0-beta.1

package/operations/entry/index.js

@@ -4,9 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getESPublishedEntryData = exports.getESLatestEntryData = 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");
@@ -23,56 +22,8 @@ var _body = require("./elasticsearch/body");
 var _recordType = require("./recordType");
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
 var _dbDynamodb = require("@webiny/db-dynamodb");
-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: (0, _recordType.createLatestRecordType)(),
-    __type: (0, _recordType.createLatestRecordType)()
-  }));
-};
-exports.getESLatestEntryData = getESLatestEntryData;
-const getESPublishedEntryData = async (plugins, entry) => {
-  return (0, _apiElasticsearch.compress)(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, getEntryData(entry)), {}, {
-    published: true,
-    TYPE: (0, _recordType.createPublishedRecordType)(),
-    __type: (0, _recordType.createPublishedRecordType)()
-  }));
-};
-exports.getESPublishedEntryData = getESPublishedEntryData;
-const convertEntryKeysToStorage = params => {
-  const {
-    model,
-    entry
-  } = params;
-  const values = model.convertValueKeyToStorage({
-    fields: model.fields,
-    values: entry.values
-  });
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
-    values
-  });
-};
-const convertEntryKeysFromStorage = params => {
-  const {
-    model,
-    entry
-  } = params;
-  const values = model.convertValueKeyFromStorage({
-    fields: model.fields,
-    values: entry.values
-  });
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
-    values
-  });
-};
+var _transformations = require("./transformations");
+var _convertEntryKeys = require("./transformations/convertEntryKeys");
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -103,31 +54,24 @@ const createEntriesStorageOperations = params => {
     const model = getStorageOperationsModel(initialModel);
     const isPublished = initialEntry.status === "published";
     const locked = isPublished ? true : initialEntry.locked;
-    const entry = convertEntryKeysToStorage({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertEntryKeysToStorage({
-      model,
-      entry: initialStorageEntry
-    });
-    const esEntry = (0, _helpers.prepareEntryToIndex)({
+    initialEntry.locked = locked;
+    initialStorageEntry.locked = locked;
+    const transformer = (0, _transformations.createTransformer)({
       plugins,
       model,
-      entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
-        locked
-      })),
-      storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
-        locked
-      }))
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     });
+    const {
+      entry,
+      storageEntry
+    } = transformer.transformEntryKeys();
+    const esEntry = transformer.transformToIndex();
     const {
       index: esIndex
     } = _configurations.configurations.es({
       model
     });
-    const esLatestData = await getESLatestEntryData(plugins, esEntry);
-    const esPublishedData = await getESPublishedEntryData(plugins, esEntry);
     const revisionKeys = {
       PK: (0, _keys.createPartitionKey)({
         id: entry.id,
@@ -183,11 +127,13 @@ const createEntriesStorageOperations = params => {
         storageEntry
       });
     }
+    const esLatestData = await transformer.getElasticsearchLatestEntryData();
     const esItems = [esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
       index: esIndex,
       data: esLatestData
     }))];
     if (isPublished) {
+      const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: esPublishedData
@@ -213,14 +159,16 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const entry = convertEntryKeysToStorage({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertEntryKeysToStorage({
+    const transformer = (0, _transformations.createTransformer)({
+      plugins,
       model,
-      entry: initialStorageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     });
+    const {
+      entry,
+      storageEntry
+    } = transformer.transformEntryKeys();
     const revisionKeys = {
       PK: (0, _keys.createPartitionKey)({
         id: entry.id,
@@ -237,13 +185,7 @@ const createEntriesStorageOperations = params => {
       }),
       SK: (0, _keys.createLatestSortKey)()
     };
-    const esEntry = (0, _helpers.prepareEntryToIndex)({
-      plugins,
-      model,
-      entry: (0, _cloneDeep.default)(entry),
-      storageEntry: (0, _cloneDeep.default)(storageEntry)
-    });
-    const esLatestData = await getESLatestEntryData(plugins, esEntry);
+    const esLatestData = await transformer.getElasticsearchLatestEntryData();
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       TYPE: (0, _recordType.createRecordType)()
     }, revisionKeys)), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
@@ -294,14 +236,16 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const entry = convertEntryKeysToStorage({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertEntryKeysToStorage({
+    const transformer = (0, _transformations.createTransformer)({
+      plugins,
       model,
-      entry: initialStorageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     });
+    const {
+      entry,
+      storageEntry
+    } = transformer.transformEntryKeys();
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
     const revisionKeys = {
@@ -358,14 +302,9 @@ const createEntriesStorageOperations = params => {
     } = _configurations.configurations.es({
       model
     });
-    /**
-     * Variable for the elasticsearch entry so we do not convert it more than once
-     */
-    let esEntry = undefined;
     /**
      * If the latest entry is the one being updated, we need to create a new latest entry records.
      */
-    let elasticsearchLatestData = null;
     if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * First we update the regular DynamoDB table
@@ -376,49 +315,14 @@ const createEntriesStorageOperations = params => {
       /**
        * And then update the Elasticsearch table to propagate changes to the Elasticsearch
        */
-      esEntry = (0, _helpers.prepareEntryToIndex)({
-        plugins,
-        model,
-        entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
-          locked
-        })),
-        storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
-          locked
-        }))
-      });
-      elasticsearchLatestData = await getESLatestEntryData(plugins, esEntry);
+      const elasticsearchLatestData = await transformer.getElasticsearchLatestEntryData();
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestKeys), {}, {
         index: esIndex,
         data: elasticsearchLatestData
       })));
     }
-    let elasticsearchPublishedData = null;
     if (isPublished && (publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
-      if (!elasticsearchLatestData) {
-        /**
-         * And then update the Elasticsearch table to propagate changes to the Elasticsearch
-         */
-        if (!esEntry) {
-          esEntry = (0, _helpers.prepareEntryToIndex)({
-            plugins,
-            model,
-            entry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
-              locked
-            })),
-            storageEntry: (0, _cloneDeep.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
-              locked
-            }))
-          });
-        }
-        elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
-      } else {
-        elasticsearchPublishedData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, elasticsearchLatestData), {}, {
-          published: true,
-          TYPE: (0, _recordType.createPublishedRecordType)(),
-          __type: (0, _recordType.createPublishedRecordType)()
-        });
-        delete elasticsearchPublishedData.latest;
-      }
+      const elasticsearchPublishedData = await transformer.getElasticsearchPublishedEntryData();
       esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
         index: esIndex,
         data: elasticsearchPublishedData
@@ -678,13 +582,13 @@ const createEntriesStorageOperations = params => {
       }));
     }
     if (latestEntry && latestStorageEntry) {
-      const esEntry = (0, _helpers.prepareEntryToIndex)({
+      const latestTransformer = (0, _transformations.createTransformer)({
         plugins,
         model,
-        entry: (0, _cloneDeep.default)(latestEntry),
-        storageEntry: (0, _cloneDeep.default)(latestStorageEntry)
+        entry: latestEntry,
+        storageEntry: latestStorageEntry
       });
-      const esLatestData = await getESLatestEntryData(plugins, esEntry);
+      const esLatestData = await latestTransformer.getElasticsearchLatestEntryData();
       /**
        * In the end we need to set the new latest entry
        */
@@ -872,7 +776,7 @@ const createEntriesStorageOperations = params => {
       model,
       entries: hits.map(item => item._source)
     }).map(item => {
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         model,
         entry: item
       });
@@ -911,14 +815,16 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const entry = convertEntryKeysToStorage({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertEntryKeysToStorage({
+    const transformer = (0, _transformations.createTransformer)({
+      plugins,
       model,
-      entry: initialStorageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     });
+    const {
+      entry,
+      storageEntry
+    } = transformer.transformEntryKeys();
 
     /**
      * We need currently published entry to check if need to remove it.
@@ -1024,28 +930,28 @@ const createEntriesStorageOperations = params => {
        * No need to transform it for the storage because it was fetched directly from the Elasticsearch table, where it sits transformed.
        */
       const latestEsEntryDataDecompressed = await (0, _apiElasticsearch.decompress)(plugins, latestEsEntry.data);
-      esItems.push(esEntity.putBatch({
-        index,
-        PK: (0, _keys.createPartitionKey)(latestEsEntryDataDecompressed),
-        SK: (0, _keys.createLatestSortKey)(),
-        data: await getESLatestEntryData(plugins, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
+      const latestTransformer = (0, _transformations.createTransformer)({
+        plugins,
+        model,
+        transformedToIndex: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestEsEntryDataDecompressed), {}, {
           status: _types.CONTENT_ENTRY_STATUS.PUBLISHED,
           locked: true,
           savedOn: entry.savedOn,
           publishedOn: entry.publishedOn
-        }))
+        })
+      });
+      esItems.push(esEntity.putBatch({
+        index,
+        PK: (0, _keys.createPartitionKey)(latestEsEntryDataDecompressed),
+        SK: (0, _keys.createLatestSortKey)(),
+        data: await latestTransformer.getElasticsearchLatestEntryData()
       }));
     }
-    const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
-      plugins,
-      model,
-      entry: (0, _cloneDeep.default)(entry),
-      storageEntry: (0, _cloneDeep.default)(storageEntry)
-    });
+
     /**
      * Update the published revision entry in ES.
      */
-    const esPublishedData = await getESPublishedEntryData(plugins, preparedEntryData);
+    const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
     esItems.push(esEntity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedKeys), {}, {
       index,
       data: esPublishedData
@@ -1094,14 +1000,16 @@ const createEntriesStorageOperations = params => {
       storageEntry: initialStorageEntry
     } = params;
     const model = getStorageOperationsModel(initialModel);
-    const entry = convertEntryKeysToStorage({
-      model,
-      entry: initialEntry
-    });
-    const storageEntry = convertEntryKeysToStorage({
+    const transformer = (0, _transformations.createTransformer)({
+      plugins,
       model,
-      entry: initialStorageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     });
+    const {
+      entry,
+      storageEntry
+    } = await transformer.transformEntryKeys();
 
     /**
      * We need the latest entry to check if it needs to be updated.
@@ -1136,13 +1044,7 @@ const createEntriesStorageOperations = params => {
       } = _configurations.configurations.es({
         model
       });
-      const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
-        plugins,
-        model,
-        entry: (0, _cloneDeep.default)(entry),
-        storageEntry: (0, _cloneDeep.default)(storageEntry)
-      });
-      const esLatestData = await getESLatestEntryData(plugins, preparedEntryData);
+      const esLatestData = await transformer.getElasticsearchLatestEntryData();
       esItems.push(esEntity.putBatch({
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -1193,7 +1095,7 @@ const createEntriesStorageOperations = params => {
     if (!entry) {
       return null;
     }
-    return convertEntryKeysFromStorage({
+    return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
       model,
       entry
     });
@@ -1207,7 +1109,7 @@ const createEntriesStorageOperations = params => {
     if (!entry) {
       return null;
     }
-    return convertEntryKeysFromStorage({
+    return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
       model,
       entry
     });
@@ -1221,7 +1123,7 @@ const createEntriesStorageOperations = params => {
     if (!entry) {
       return null;
     }
-    return convertEntryKeysFromStorage({
+    return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
       model,
       entry
     });
@@ -1233,7 +1135,7 @@ const createEntriesStorageOperations = params => {
       ids: [params.id]
     });
     return entries.map(entry => {
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         model,
         entry
       });
@@ -1246,7 +1148,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         model,
         entry
       });
@@ -1259,7 +1161,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         model,
         entry
       });
@@ -1272,7 +1174,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         model,
         entry
       });
@@ -1316,7 +1218,7 @@ const createEntriesStorageOperations = params => {
       if (!entry) {
         return null;
       }
-      return convertEntryKeysFromStorage({
+      return (0, _convertEntryKeys.convertEntryKeysFromStorage)({
         entry,
         model
       });
@@ -1427,4 +1329,6 @@ const createEntriesStorageOperations = params => {
     dataLoaders
   };
 };
-exports.createEntriesStorageOperations = createEntriesStorageOperations;
+exports.createEntriesStorageOperations = createEntriesStorageOperations;
+
+//# sourceMappingURL=index.js.map