@webiny/api-headless-cms-ddb 0.0.0-unstable.5e7233243f → 0.0.0-unstable.60a863e033

package/operations/entry/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEntriesStorageOperations = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -15,8 +15,6 @@ var _dataLoaders = require("./dataLoaders");
 
 var _types = require("@webiny/api-headless-cms/types");
 
-var _utils = require("./utils");
-
 var _keys = require("./keys");
 
 var _batchWrite = require("@webiny/db-dynamodb/utils/batchWrite");
@@ -31,9 +29,9 @@ var _zeroPad = require("@webiny/utils/zeroPad");
 
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+var _createFields = require("./filtering/createFields");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _filtering = require("./filtering");
 
 const createType = () => {
   return "cms.entry";
@@ -56,7 +54,7 @@ const convertToStorageEntry = params => {
     fields: model.fields,
     values: storageEntry.values
   });
-  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
     values
   });
 };
@@ -70,7 +68,7 @@ const convertFromStorageEntry = params => {
     fields: model.fields,
     values: storageEntry.values
   });
-  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
     values
   });
 };
@@ -132,14 +130,14 @@ const createEntriesStorageOperations = params => {
      *  - create new or update latest entry item
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked,
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked,
       PK: partitionKey,
       SK: (0, _keys.createLatestSortKey)(),
@@ -152,7 +150,7 @@ const createEntriesStorageOperations = params => {
      */
 
     if (isPublished) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)(),
@@ -200,13 +198,13 @@ const createEntriesStorageOperations = params => {
      *  - update the last entry item to a current one
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(storageEntry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createLatestSortKey)(),
       TYPE: createLatestType(),
@@ -260,7 +258,7 @@ const createEntriesStorageOperations = params => {
      *  - update the latest entry if the current entry is the latest one
      */
 
-    items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked,
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(storageEntry),
@@ -270,7 +268,7 @@ const createEntriesStorageOperations = params => {
     })));
 
     if (isPublished) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)(),
@@ -287,7 +285,7 @@ const createEntriesStorageOperations = params => {
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
     if (latestStorageEntry && latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -397,7 +395,7 @@ const createEntriesStorageOperations = params => {
         storageEntry: initialLatestStorageEntry,
         model
       });
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, latestStorageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -568,7 +566,7 @@ const createEntriesStorageOperations = params => {
         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), {}, {
+      throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
         error: ex,
         partitionKey: queryParams.partitionKey,
         options: queryParams.options,
@@ -582,7 +580,7 @@ const createEntriesStorageOperations = params => {
       limit: initialLimit = 10,
       where: initialWhere,
       after,
-      sort,
+      sort: sortBy,
       fields,
       search
     } = params;
@@ -596,10 +594,10 @@ const createEntriesStorageOperations = params => {
         gte: " "
       }
     };
-    let records = [];
+    let storageEntries = [];
 
     try {
-      records = await (0, _query.queryAll)(queryAllParams);
+      storageEntries = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
       throw new _error.default(ex.message, "QUERY_ENTRIES_ERROR", {
         error: ex,
@@ -608,7 +606,7 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    if (records.length === 0) {
+    if (storageEntries.length === 0) {
       return {
         hasMoreItems: false,
         totalCount: 0,
@@ -617,35 +615,47 @@ const createEntriesStorageOperations = params => {
       };
     }
 
-    const where = _objectSpread({}, initialWhere);
-
+    const where = (0, _objectSpread2.default)({}, initialWhere);
     delete where["published"];
     delete where["latest"];
     /**
-     * We need a object containing field, transformers and paths.
+     * We need an object containing field, transformers and paths.
      * Just build it here and pass on into other methods that require it to avoid mapping multiple times.
      */
 
-    const modelFields = (0, _utils.buildModelFields)({
+    const modelFields = (0, _createFields.createFields)({
       plugins,
-      model
+      fields: model.fields
     });
+    const fromStorage = createStorageTransformCallable(model);
+    /**
+     * Let's transform records from storage ones to regular ones, so we do not need to do it later.
+     *
+     * This is always being done, but at least its in parallel.
+     */
+
+    const records = await Promise.all(storageEntries.map(async storageEntry => {
+      const entry = convertFromStorageEntry({
+        storageEntry,
+        model
+      });
+
+      for (const field of model.fields) {
+        entry.values[field.fieldId] = await fromStorage(field, entry.values[field.fieldId]);
+      }
+
+      return entry;
+    }));
     /**
      * Filter the read items via the code.
      * It will build the filters out of the where input and transform the values it is using.
      */
 
-    const filteredItems = await (0, _utils.filterItems)({
-      items: records.map(record => {
-        return convertFromStorageEntry({
-          storageEntry: record,
-          model
-        });
-      }),
+    const filteredItems = (0, _filtering.filter)({
+      items: records,
       where,
       plugins,
       fields: modelFields,
-      fromStorage: createStorageTransformCallable(model),
       fullTextSearch: {
         term: search,
         fields: fields || []
@@ -657,9 +667,11 @@ const createEntriesStorageOperations = params => {
      * It takes the sort input and sorts by it via the lodash sortBy method.
      */
 
-    const sortedItems = (0, _utils.sortEntryItems)({
+    const sortedItems = (0, _filtering.sort)({
+      model,
+      plugins,
       items: filteredItems,
-      sort,
+      sort: sortBy,
       fields: modelFields
     });
     const start = parseInt((0, _cursor.decodeCursor)(after) || "0") || 0;
@@ -683,132 +695,12 @@ const createEntriesStorageOperations = params => {
   const get = async (model, params) => {
     const {
       items
-    } = await list(model, _objectSpread(_objectSpread({}, params), {}, {
+    } = await list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
       limit: 1
     }));
     return items.shift() || null;
   };
 
-  const requestChanges = async (model, params) => {
-    const {
-      entry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
-    const storageEntry = convertToStorageEntry({
-      storageEntry: initialStorageEntry,
-      model
-    });
-    /**
-     * We need to:
-     *  - update the existing entry
-     *  - update latest version - if existing entry is the latest version
-     */
-
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createType(),
-      PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entry),
-      GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-      GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    }))];
-    /**
-     * We need the latest entry to see if something needs to be updated along side the request changes one.
-     */
-
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
-      })));
-    }
-
-    try {
-      await (0, _batchWrite.batchWriteAll)({
-        table: entity.table,
-        items
-      });
-      dataLoaders.clearAll({
-        model
-      });
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute the request changes batch.", ex.code || "REQUEST_CHANGES_ERROR", {
-        entry
-      });
-    }
-
-    return entry;
-  };
-
-  const requestReview = async (model, params) => {
-    const {
-      entry,
-      storageEntry: initialStorageEntry
-    } = params;
-    const partitionKey = (0, _keys.createPartitionKey)({
-      id: entry.id,
-      locale: model.locale,
-      tenant: model.tenant
-    });
-    const storageEntry = convertToStorageEntry({
-      storageEntry: initialStorageEntry,
-      model
-    });
-    /**
-     * We need to:
-     *  - update existing entry
-     *  - update latest entry - if existing entry is the latest entry
-     */
-
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-      TYPE: createType(),
-      PK: partitionKey,
-      SK: (0, _keys.createRevisionSortKey)(entry),
-      GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
-      GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    }))];
-    /**
-     * We need the latest entry to see if something needs to be updated along side the request review one.
-     */
-
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
-    if (latestStorageEntry && latestStorageEntry.id === entry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
-        PK: partitionKey,
-        SK: (0, _keys.createLatestSortKey)(),
-        TYPE: createLatestType(),
-        GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
-        GSI1_SK: (0, _keys.createGSISortKey)(entry)
-      })));
-    }
-
-    try {
-      await (0, _batchWrite.batchWriteAll)({
-        table: entity.table,
-        items
-      });
-      dataLoaders.clearAll({
-        model
-      });
-      return initialStorageEntry;
-    } catch (ex) {
-      throw new _error.default(ex.message || "Could not execute request review batch.", ex.code || "REQUEST_REVIEW_ERROR", {
-        entry,
-        storageEntry
-      });
-    }
-  };
-
   const publish = async (model, params) => {
     const {
       entry,
@@ -837,13 +729,13 @@ const createEntriesStorageOperations = params => {
      *  - previous published entry to unpublished status - if any previously published entry
      */
 
-    const items = [entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
-    })), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    })), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createPublishedSortKey)(),
       TYPE: createPublishedType(),
@@ -852,7 +744,7 @@ const createEntriesStorageOperations = params => {
     }))];
 
     if (initialLatestStorageEntry && entry.id === initialLatestStorageEntry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -866,7 +758,7 @@ const createEntriesStorageOperations = params => {
         storageEntry: initialPublishedStorageEntry,
         model
       });
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, publishedStorageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, publishedStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
         TYPE: createType(),
@@ -918,7 +810,7 @@ const createEntriesStorageOperations = params => {
     const items = [entity.deleteBatch({
       PK: partitionKey,
       SK: (0, _keys.createPublishedSortKey)()
-    }), entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+    }), entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
       TYPE: createType(),
@@ -932,7 +824,7 @@ const createEntriesStorageOperations = params => {
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
 
     if (latestStorageEntry && entry.id === latestStorageEntry.id) {
-      items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
+      items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
         TYPE: createLatestType(),
@@ -973,8 +865,6 @@ const createEntriesStorageOperations = params => {
     getLatestRevisionByEntryId,
     get,
     getRevisions,
-    requestChanges,
-    requestReview,
     publish,
     list,
     unpublish