@webiny/api-headless-cms-ddb-es 5.32.0 → 5.33.0-beta.0

package/operations/entry/index.js

@@ -84,6 +84,34 @@ const getESPublishedEntryData = async (plugins, entry) => {
   }));
 };
 
+const convertToStorageEntry = params => {
+  const {
+    model,
+    entry
+  } = params;
+  const values = model.convertValueKeyToStorage({
+    fields: model.fields,
+    values: entry.values
+  });
+  return _objectSpread(_objectSpread({}, entry), {}, {
+    values
+  });
+};
+
+const convertFromStorageEntry = params => {
+  const {
+    model,
+    entry
+  } = params;
+  const values = model.convertValueKeyFromStorage({
+    fields: model.fields,
+    values: entry.values
+  });
+  return _objectSpread(_objectSpread({}, entry), {}, {
+    values
+  });
+};
+
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -97,11 +125,19 @@ const createEntriesStorageOperations = params => {
 
   const create = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
-    const isPublished = entry.status === "published";
-    const locked = isPublished ? true : entry.locked;
+    const isPublished = initialEntry.status === "published";
+    const locked = isPublished ? true : initialEntry.locked;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     const esEntry = (0, _helpers.prepareEntryToIndex)({
       plugins,
       model,
@@ -204,14 +240,22 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const createRevisionFrom = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     const revisionKeys = {
       PK: (0, _keys.createPartitionKey)({
         id: entry.id,
@@ -283,14 +327,22 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const update = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
     const revisionKeys = {
@@ -351,13 +403,18 @@ const createEntriesStorageOperations = params => {
       model
     });
     /**
-     * If the latest entry is the one being updated, we need to create a new latest entry records.
+     * 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 && latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * First we update the regular DynamoDB table
        */
@@ -368,7 +425,7 @@ const createEntriesStorageOperations = params => {
        * And then update the Elasticsearch table to propagate changes to the Elasticsearch
        */
 
-      const esEntry = (0, _helpers.prepareEntryToIndex)({
+      esEntry = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
         entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
@@ -387,21 +444,24 @@ const createEntriesStorageOperations = params => {
 
     let elasticsearchPublishedData = null;
 
-    if (isPublished && publishedStorageEntry && publishedStorageEntry.id === entry.id) {
+    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
          */
-        const esEntry = (0, _helpers.prepareEntryToIndex)({
-          plugins,
-          model,
-          entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
-            locked
-          })),
-          storageEntry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, storageEntry), {}, {
-            locked
-          }))
-        });
+        if (!esEntry) {
+          esEntry = (0, _helpers.prepareEntryToIndex)({
+            plugins,
+            model,
+            entry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, entry), {}, {
+              locked
+            })),
+            storageEntry: (0, _cloneDeep.default)(_objectSpread(_objectSpread({}, storageEntry), {}, {
+              locked
+            }))
+          });
+        }
+
         elasticsearchPublishedData = await getESPublishedEntryData(plugins, esEntry);
       } else {
         elasticsearchPublishedData = _objectSpread(_objectSpread({}, elasticsearchLatestData), {}, {
@@ -435,7 +495,7 @@ const createEntriesStorageOperations = params => {
     }
 
     if (esItems.length === 0) {
-      return storageEntry;
+      return initialStorageEntry;
     }
 
     try {
@@ -450,7 +510,7 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const deleteEntry = async (model, params) => {
@@ -560,7 +620,7 @@ const createEntriesStorageOperations = params => {
      * If revision we are deleting is the published one as well, we need to delete those records as well.
      */
 
-    if (publishedStorageEntry && entry.id === publishedStorageEntry.id) {
+    if ((publishedStorageEntry === null || publishedStorageEntry === void 0 ? void 0 : publishedStorageEntry.id) === entry.id) {
       items.push(entity.deleteBatch({
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)()
@@ -680,7 +740,8 @@ const createEntriesStorageOperations = params => {
       throw new _error.default(ex.message, ex.code || "ELASTICSEARCH_ERROR", {
         error: ex,
         index,
-        body
+        body,
+        model
       });
     }
 
@@ -692,6 +753,11 @@ const createEntriesStorageOperations = params => {
       plugins,
       model,
       entries: hits.map(item => item._source)
+    }).map(item => {
+      return convertFromStorageEntry({
+        model,
+        entry: item
+      });
     });
     const hasMoreItems = items.length > limit;
 
@@ -727,9 +793,17 @@ const createEntriesStorageOperations = params => {
 
   const publish = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     /**
      * We need currently published entry to check if need to remove it.
      */
@@ -799,7 +873,12 @@ 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)
@@ -829,7 +908,7 @@ const createEntriesStorageOperations = params => {
       ids: [entry.id]
     });
 
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), latestKeys)));
     }
     /**
@@ -837,9 +916,11 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    if (latestEsEntry && latestStorageEntry && latestStorageEntry.id === entry.id) {
+    if (latestEsEntry && (latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       /**
        * Need to decompress the data from Elasticsearch DynamoDB table.
+       *
+       * No need to transform it for the storage because it was fetched directly from the Elasticsearch table, where it sits transformed.
        */
       const latestEsEntryDataDecompressed = await (0, _compression.decompress)(plugins, latestEsEntry.data);
       esItems.push(esEntity.putBatch({
@@ -909,14 +990,22 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const unpublish = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     /**
      * We need the latest entry to check if it needs to be updated.
      */
@@ -946,7 +1035,7 @@ const createEntriesStorageOperations = params => {
      * If we are unpublishing the latest revision, let's also update the latest revision entry's status in ES.
      */
 
-    if (latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       const {
         index
       } = _configurations.configurations.es({
@@ -1003,14 +1092,22 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const requestReview = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     /**
      * We need the latest entry to check if it needs to be updated.
      */
@@ -1036,7 +1133,7 @@ const createEntriesStorageOperations = params => {
       model
     });
 
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       const preparedEntryData = (0, _helpers.prepareEntryToIndex)({
         plugins,
         model,
@@ -1068,7 +1165,7 @@ const createEntriesStorageOperations = params => {
 
 
     if (!esLatestData) {
-      return storageEntry;
+      return initialStorageEntry;
     }
 
     try {
@@ -1086,14 +1183,22 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const requestChanges = async (model, params) => {
     const {
-      entry,
-      storageEntry
+      entry: initialEntry,
+      storageEntry: initialStorageEntry
     } = params;
+    const entry = convertToStorageEntry({
+      model,
+      entry: initialEntry
+    });
+    const storageEntry = convertToStorageEntry({
+      model,
+      entry: initialStorageEntry
+    });
     /**
      * We need the latest entry to check if it needs to be updated.
      */
@@ -1124,7 +1229,7 @@ const createEntriesStorageOperations = params => {
 
     let esLatestData = null;
 
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
+    if ((latestStorageEntry === null || latestStorageEntry === void 0 ? void 0 : latestStorageEntry.id) === entry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -1159,7 +1264,7 @@ const createEntriesStorageOperations = params => {
 
 
     if (!esLatestData) {
-      return storageEntry;
+      return initialStorageEntry;
     }
 
     try {
@@ -1176,59 +1281,107 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const getLatestRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getLatestRevisionByEntryId({
+    const [entry] = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+
+    if (!entry) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getPublishedRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getPublishedRevisionByEntryId({
+    const [entry] = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+
+    if (!entry) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getRevisionById = async (model, params) => {
-    const result = await dataLoaders.getRevisionById({
+    const [entry] = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+
+    if (!entry) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      model,
+      entry
+    });
   };
 
   const getRevisions = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
+    const entries = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getByIds = async (model, params) => {
-    return dataLoaders.getRevisionById({
+    const entries = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getLatestByIds = async (model, params) => {
-    return dataLoaders.getLatestRevisionByEntryId({
+    const entries = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getPublishedByIds = async (model, params) => {
-    return dataLoaders.getPublishedRevisionByEntryId({
+    const entries = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return entries.map(entry => {
+      return convertFromStorageEntry({
+        model,
+        entry
+      });
+    });
   };
 
   const getPreviousRevision = async (model, params) => {
@@ -1266,7 +1419,16 @@ const createEntriesStorageOperations = params => {
 
     try {
       const result = await (0, _query.queryOne)(queryParams);
-      return (0, _cleanup.cleanupItem)(entity, result);
+      const entry = (0, _cleanup.cleanupItem)(entity, result);
+
+      if (!entry) {
+        return null;
+      }
+
+      return convertFromStorageEntry({
+        entry,
+        model
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", _objectSpread(_objectSpread({}, params), {}, {
         error: ex,