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

package/operations/entry/index.js

@@ -1,48 +1,32 @@
 "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 _error = _interopRequireDefault(require("@webiny/error"));
-
 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");
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
 var _cursor = require("@webiny/utils/cursor");
-
 var _zeroPad = require("@webiny/utils/zeroPad");
-
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
-
+var _createFields = require("./filtering/createFields");
+var _filtering = require("./filtering");
 const createType = () => {
   return "cms.entry";
 };
-
 const createLatestType = () => {
   return `${createType()}.l`;
 };
-
 const createPublishedType = () => {
   return `${createType()}.p`;
 };
-
 const convertToStorageEntry = params => {
   const {
     model,
@@ -56,7 +40,6 @@ const convertToStorageEntry = params => {
     values
   });
 };
-
 const convertFromStorageEntry = params => {
   const {
     model,
@@ -70,7 +53,6 @@ const convertFromStorageEntry = params => {
     values
   });
 };
-
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -83,29 +65,23 @@ const createEntriesStorageOperations = params => {
     collection[plugin.fieldType] = plugin;
     return collection;
   }, {});
-
   const createStorageTransformCallable = model => {
     return (field, value) => {
       const plugin = storageTransformPlugins[field.type];
-
       if (!plugin) {
         return value;
       }
-
       return plugin.fromStorage({
         model,
         field,
         value,
-
         getStoragePlugin(fieldType) {
           return storageTransformPlugins[fieldType] || storageTransformPlugins["*"];
         },
-
         plugins
       });
     };
   };
-
   const create = async (model, params) => {
     const {
       entry,
@@ -127,7 +103,6 @@ const createEntriesStorageOperations = params => {
      *  - create new main entry item
      *  - create new or update latest entry item
      */
-
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked,
       PK: partitionKey,
@@ -143,10 +118,10 @@ const createEntriesStorageOperations = params => {
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
     }))];
+
     /**
      * We need to create published entry if
      */
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
@@ -157,7 +132,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -172,10 +146,8 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     return initialStorageEntry;
   };
-
   const createRevisionFrom = async (model, params) => {
     const {
       entry,
@@ -195,7 +167,6 @@ const createEntriesStorageOperations = params => {
      *  - create the main entry item
      *  - update the last entry item to a current one
      */
-
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(storageEntry),
@@ -209,7 +180,6 @@ const createEntriesStorageOperations = params => {
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "L"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
     }))];
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -228,11 +198,8 @@ 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,
@@ -255,7 +222,6 @@ const createEntriesStorageOperations = params => {
      *  - update the current entry
      *  - update the latest entry if the current entry is the latest one
      */
-
     items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       locked,
       PK: partitionKey,
@@ -264,7 +230,6 @@ const createEntriesStorageOperations = params => {
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "A"),
       GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
     })));
-
     if (isPublished) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
@@ -275,13 +240,11 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(storageEntry)
       })));
     }
+
     /**
      * We need the latest entry to update it as well if neccessary.
      */
-
-
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
     if (latestStorageEntry && latestStorageEntry.id === entry.id) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         locked,
@@ -292,7 +255,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(entry)
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -310,7 +272,6 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const deleteEntry = async (model, params) => {
     const {
       entry
@@ -327,7 +288,6 @@ const createEntriesStorageOperations = params => {
       }
     };
     let records = [];
-
     try {
       records = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
@@ -336,14 +296,12 @@ const createEntriesStorageOperations = params => {
         entry
       });
     }
-
     const items = records.map(item => {
       return entity.deleteBatch({
         PK: item.PK,
         SK: item.SK
       });
     });
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -360,7 +318,6 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const deleteRevision = async (model, params) => {
     const {
       entry,
@@ -377,17 +334,16 @@ const createEntriesStorageOperations = params => {
       SK: (0, _keys.createRevisionSortKey)(entry)
     })];
     const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
+
     /**
      * 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) {
       items.push(entity.deleteBatch({
         PK: partitionKey,
         SK: (0, _keys.createPublishedSortKey)()
       }));
     }
-
     if (initialLatestStorageEntry) {
       const latestStorageEntry = convertToStorageEntry({
         storageEntry: initialLatestStorageEntry,
@@ -401,7 +357,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(latestStorageEntry)
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -418,58 +373,48 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const getLatestRevisionByEntryId = async (model, params) => {
     const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
     const item = items.shift() || null;
-
     if (!item) {
       return null;
     }
-
     return convertFromStorageEntry({
       storageEntry: item,
       model
     });
   };
-
   const getPublishedRevisionByEntryId = async (model, params) => {
     const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
     const item = items.shift() || null;
-
     if (!item) {
       return null;
     }
-
     return convertFromStorageEntry({
       storageEntry: item,
       model
     });
   };
-
   const getRevisionById = async (model, params) => {
     const items = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
     const item = items.shift() || null;
-
     if (!item) {
       return null;
     }
-
     return convertFromStorageEntry({
       storageEntry: item,
       model
     });
   };
-
   const getRevisions = async (model, params) => {
     const items = await dataLoaders.getAllEntryRevisions({
       model,
@@ -482,7 +427,6 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
   const getByIds = async (model, params) => {
     const items = await dataLoaders.getRevisionById({
       model,
@@ -495,7 +439,6 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
   const getLatestByIds = async (model, params) => {
     const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
@@ -508,7 +451,6 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
   const getPublishedByIds = async (model, params) => {
     const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
@@ -521,7 +463,6 @@ const createEntriesStorageOperations = params => {
       });
     });
   };
-
   const getPreviousRevision = async (model, params) => {
     const {
       entryId,
@@ -536,7 +477,6 @@ const createEntriesStorageOperations = params => {
       }),
       options: {
         lt: `REV#${(0, _zeroPad.zeroPad)(version)}`,
-
         /**
          * We need to have extra checks because DynamoDB will return published or latest record if there is no REV# record.
          */
@@ -550,15 +490,12 @@ const createEntriesStorageOperations = params => {
         reverse: true
       }
     };
-
     try {
       const result = await (0, _query.queryOne)(queryParams);
       const storageEntry = (0, _cleanup.cleanupItem)(entity, result);
-
       if (!storageEntry) {
         return null;
       }
-
       return convertFromStorageEntry({
         storageEntry,
         model
@@ -572,13 +509,12 @@ const createEntriesStorageOperations = params => {
       }));
     }
   };
-
   const list = async (model, params) => {
     const {
       limit: initialLimit = 10,
       where: initialWhere,
       after,
-      sort,
+      sort: sortBy,
       fields,
       search
     } = params;
@@ -592,10 +528,9 @@ 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,
@@ -603,8 +538,7 @@ const createEntriesStorageOperations = params => {
         options: queryAllParams.options
       });
     }
-
-    if (records.length === 0) {
+    if (storageEntries.length === 0) {
       return {
         hasMoreItems: false,
         totalCount: 0,
@@ -612,49 +546,58 @@ const createEntriesStorageOperations = params => {
         items: []
       };
     }
-
     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 || []
       }
     });
     const totalCount = filteredItems.length;
+
     /**
      * Sorting is also done via the code.
      * 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;
@@ -665,7 +608,6 @@ const createEntriesStorageOperations = params => {
      * Although we do not need a cursor here, we will use it as such to keep it standardized.
      * Number is simply encoded.
      */
-
     const cursor = totalCount > start + limit ? (0, _cursor.encodeCursor)(`${start + limit}`) : null;
     return {
       hasMoreItems,
@@ -674,7 +616,6 @@ const createEntriesStorageOperations = params => {
       items: (0, _cleanup.cleanupItems)(entity, slicedItems)
     };
   };
-
   const get = async (model, params) => {
     const {
       items
@@ -683,7 +624,6 @@ const createEntriesStorageOperations = params => {
     }));
     return items.shift() || null;
   };
-
   const publish = async (model, params) => {
     const {
       entry,
@@ -694,10 +634,10 @@ const createEntriesStorageOperations = params => {
       locale: model.locale,
       tenant: model.tenant
     });
+
     /**
      * We need the latest and published entries to see if something needs to be updated along side the publishing one.
      */
-
     const initialLatestStorageEntry = await getLatestRevisionByEntryId(model, entry);
     const initialPublishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
     const storageEntry = convertToStorageEntry({
@@ -711,7 +651,6 @@ const createEntriesStorageOperations = params => {
      *  - latest sort key - if entry updated is actually latest
      *  - previous published entry to unpublished status - if any previously published entry
      */
-
     const items = [entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
       PK: partitionKey,
       SK: (0, _keys.createRevisionSortKey)(entry),
@@ -725,7 +664,6 @@ const createEntriesStorageOperations = params => {
       GSI1_PK: (0, _keys.createGSIPartitionKey)(model, "P"),
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
     }))];
-
     if (initialLatestStorageEntry && entry.id === initialLatestStorageEntry.id) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
@@ -735,7 +673,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(entry)
       })));
     }
-
     if (initialPublishedStorageEntry && initialPublishedStorageEntry.id !== entry.id) {
       const publishedStorageEntry = convertToStorageEntry({
         storageEntry: initialPublishedStorageEntry,
@@ -750,7 +687,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(publishedStorageEntry)
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -768,7 +704,6 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   const unpublish = async (model, params) => {
     const {
       entry,
@@ -789,7 +724,6 @@ const createEntriesStorageOperations = params => {
      *  - update current entry revision with new data
      *  - update latest entry status - if entry being unpublished is latest
      */
-
     const items = [entity.deleteBatch({
       PK: partitionKey,
       SK: (0, _keys.createPublishedSortKey)()
@@ -800,12 +734,11 @@ const createEntriesStorageOperations = params => {
       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 unpublishing one.
      */
-
     const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-
     if (latestStorageEntry && entry.id === latestStorageEntry.id) {
       items.push(entity.putBatch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
         PK: partitionKey,
@@ -815,7 +748,6 @@ const createEntriesStorageOperations = params => {
         GSI1_SK: (0, _keys.createGSISortKey)(entry)
       })));
     }
-
     try {
       await (0, _batchWrite.batchWriteAll)({
         table: entity.table,
@@ -832,7 +764,6 @@ const createEntriesStorageOperations = params => {
       });
     }
   };
-
   return {
     create,
     createRevisionFrom,
@@ -853,5 +784,4 @@ const createEntriesStorageOperations = params => {
     unpublish
   };
 };
-
 exports.createEntriesStorageOperations = createEntriesStorageOperations;