@webiny/api-headless-cms 5.39.0-beta.0 → 5.39.0-beta.2

package/crud/contentEntry.crud.js

@@ -4,191 +4,26 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createContentEntryCrud = exports.STATUS_UNPUBLISHED = exports.STATUS_PUBLISHED = exports.STATUS_DRAFT = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _merge = _interopRequireDefault(require("lodash/merge"));
+exports.createContentEntryCrud = void 0;
 var _utils = require("@webiny/utils");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _handlerGraphql = require("@webiny/handler-graphql");
-var _types = require("../types");
 var _entryDataValidation = require("./contentEntry/entryDataValidation");
 var _pubsub = require("@webiny/pubsub");
 var _beforeCreate = require("./contentEntry/beforeCreate");
 var _beforeUpdate = require("./contentEntry/beforeUpdate");
 var _afterDelete = require("./contentEntry/afterDelete");
-var _referenceFieldsMapping = require("./contentEntry/referenceFieldsMapping");
 var _entryStorage = require("../utils/entryStorage");
 var _searchableFields = require("./contentEntry/searchableFields");
 var _filterAsync = require("../utils/filterAsync");
-var _apiSecurity = require("@webiny/api-security/");
+var _apiSecurity = require("@webiny/api-security");
 var _constants = require("../constants");
-var _date = require("../utils/date");
-const STATUS_DRAFT = _types.CONTENT_ENTRY_STATUS.DRAFT;
-exports.STATUS_DRAFT = STATUS_DRAFT;
-const STATUS_PUBLISHED = _types.CONTENT_ENTRY_STATUS.PUBLISHED;
-exports.STATUS_PUBLISHED = STATUS_PUBLISHED;
-const STATUS_UNPUBLISHED = _types.CONTENT_ENTRY_STATUS.UNPUBLISHED;
-exports.STATUS_UNPUBLISHED = STATUS_UNPUBLISHED;
-/**
- * Used for some fields to convert their values.
- */
-const convertDefaultValue = (field, value) => {
-  switch (field.type) {
-    case "boolean":
-      return Boolean(value);
-    case "number":
-      return Number(value);
-    default:
-      return value;
-  }
-};
-const getDefaultValue = field => {
-  const {
-    settings,
-    multipleValues
-  } = field;
-  if (settings && settings.defaultValue !== undefined) {
-    return convertDefaultValue(field, settings.defaultValue);
-  }
-  const {
-    predefinedValues
-  } = field;
-  if (!predefinedValues || !predefinedValues.enabled || Array.isArray(predefinedValues.values) === false) {
-    return undefined;
-  }
-  if (!multipleValues) {
-    const selectedValue = predefinedValues.values.find(value => {
-      return !!value.selected;
-    });
-    if (selectedValue) {
-      return convertDefaultValue(field, selectedValue.value);
-    }
-    return undefined;
-  }
-  return predefinedValues.values.filter(({
-    selected
-  }) => !!selected).map(({
-    value
-  }) => {
-    return convertDefaultValue(field, value);
-  });
-};
-/**
- * Cleans and adds default values to create input data.
- */
-const mapAndCleanCreateInputData = (model, input) => {
-  return model.fields.reduce((acc, field) => {
-    /**
-     * This should never happen, but let's make it sure.
-     * The fix would be for the user to add the fieldId on the field definition.
-     */
-    if (!field.fieldId) {
-      throw new _error.default("Field does not have an fieldId.", "MISSING_FIELD_ID", {
-        field
-      });
-    }
-    const value = input[field.fieldId];
-    /**
-     * We set the default value on create input if value is not defined.
-     */
-    acc[field.fieldId] = value === undefined ? getDefaultValue(field) : value;
-    return acc;
-  }, {});
-};
-/**
- * Cleans the update input entry data.
- */
-const mapAndCleanUpdatedInputData = (model, input) => {
-  return model.fields.reduce((acc, field) => {
-    /**
-     * This should never happen, but let's make it sure.
-     * The fix would be for the user to add the fieldId on the field definition.
-     */
-    if (!field.fieldId) {
-      throw new _error.default("Field does not have an fieldId.", "MISSING_FIELD_ID", {
-        field
-      });
-    }
-    /**
-     * We cannot set default value here because user might want to update only certain field values.
-     */
-    const value = input[field.fieldId];
-    if (value === undefined) {
-      return acc;
-    }
-    acc[field.fieldId] = value;
-    return acc;
-  }, {});
-};
-/**
- * This method takes original entry meta and new input.
- * When new meta is merged onto the existing one, everything that has undefined or null value is removed.
- */
-const createEntryMeta = (input, original) => {
-  const meta = (0, _merge.default)(original || {}, input || {});
-  return (0, _utils.removeUndefinedValues)((0, _utils.removeNullValues)(meta));
-};
-const createEntryId = input => {
-  let entryId = (0, _utils.mdbid)();
-  if (input.id) {
-    if (input.id.match(/^([a-zA-Z0-9])([a-zA-Z0-9\-]+)([a-zA-Z0-9])$/) === null) {
-      throw new _error.default("The provided ID is not valid. It must be a string which can be A-Z, a-z, 0-9, - and it cannot start or end with a -.", "INVALID_ID", {
-        id: input.id
-      });
-    }
-    entryId = input.id;
-  }
-  const version = 1;
-  return {
-    entryId,
-    version,
-    id: (0, _utils.createIdentifier)({
-      id: entryId,
-      version
-    })
-  };
-};
-const increaseEntryIdVersion = id => {
-  const {
-    id: entryId,
-    version
-  } = (0, _utils.parseIdentifier)(id);
-  if (!version) {
-    throw new _error.default("Cannot increase version on the ID without the version part.", "WRONG_ID", {
-      id
-    });
-  }
-  return {
-    entryId,
-    version: version + 1,
-    id: (0, _utils.createIdentifier)({
-      id: entryId,
-      version: version + 1
-    })
-  };
-};
-const allowedEntryStatus = ["draft", "published", "unpublished"];
-const transformEntryStatus = status => {
-  return allowedEntryStatus.includes(status) ? status : "draft";
-};
+var _entryDataFactories = require("./contentEntry/entryDataFactories");
 const createSort = sort => {
-  if (!Array.isArray(sort)) {
-    return ["createdOn_DESC"];
-  } else if (sort.filter(s => !!s).length === 0) {
-    return ["createdOn_DESC"];
-  }
-  return sort;
-};
-const getIdentity = (input, defaultValue) => {
-  const identity = input !== null && input !== void 0 && input.id && input !== null && input !== void 0 && input.displayName && input !== null && input !== void 0 && input.type ? input : defaultValue;
-  if (!identity) {
-    return null;
+  if (Array.isArray(sort) && sort.filter(Boolean).length > 0) {
+    return sort;
   }
-  return {
-    id: identity.id,
-    displayName: identity.displayName,
-    type: identity.type
-  };
+  return ["revisionCreatedOn_DESC"];
 };
 const createContentEntryCrud = params => {
   const {
@@ -343,7 +178,7 @@ const createContentEntryCrud = params => {
       });
       return (0, _filterAsync.filterAsync)(entries, async entry => {
         return entriesPermissions.ensure({
-          owns: entry.createdBy
+          owns: entry.revisionCreatedBy
         }, {
           throw: false
         });
@@ -376,7 +211,7 @@ const createContentEntryCrud = params => {
     });
     return (0, _filterAsync.filterAsync)(entries, async entry => {
       return entriesPermissions.ensure({
-        owns: entry.createdBy
+        owns: entry.revisionCreatedBy
       }, {
         throw: false
       });
@@ -394,7 +229,7 @@ const createContentEntryCrud = params => {
     });
     return (0, _filterAsync.filterAsync)(entries, async entry => {
       return entriesPermissions.ensure({
-        owns: entry.createdBy
+        owns: entry.revisionCreatedBy
       }, {
         throw: false
       });
@@ -448,13 +283,15 @@ const createContentEntryCrud = params => {
       limit: initialLimit
     } = params;
     const limit = initialLimit && initialLimit > 0 ? initialLimit : 50;
-    const where = (0, _objectSpread2.default)({}, initialWhere);
+    const where = {
+      ...initialWhere
+    };
     /**
      * Possibly only get records which are owned by current user.
      * Or if searching for the owner set that value - in the case that user can see other entries than their own.
      */
     if (await entriesPermissions.canAccessOnlyOwnRecords()) {
-      where.ownedBy = getSecurityIdentity().id;
+      where.createdBy = getSecurityIdentity().id;
     }
 
     /**
@@ -485,12 +322,13 @@ const createContentEntryCrud = params => {
         totalCount,
         cursor,
         items
-      } = await storageOperations.entries.list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+      } = await storageOperations.entries.list(model, {
+        ...params,
         sort: createSort(params.sort),
         limit,
         where,
         fields
-      }));
+      });
       const meta = {
         hasMoreItems,
         totalCount,
@@ -515,63 +353,25 @@ const createContentEntryCrud = params => {
     }
   };
   const createEntry = async (model, rawInput, options) => {
-    var _rawInput$wbyAco_loca;
     await entriesPermissions.ensure({
       rwd: "w"
     });
     await modelsPermissions.ensureCanAccessModel({
       model
     });
-
-    /**
-     * Make sure we only work with fields that are defined in the model.
-     */
-    const initialInput = mapAndCleanCreateInputData(model, rawInput);
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context,
-      model,
-      data: initialInput,
-      skipValidators: options === null || options === void 0 ? void 0 : options.skipValidators
-    });
-    const input = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+    const {
+      entry,
+      input
+    } = await (0, _entryDataFactories.createEntryData)({
       context,
       model,
-      input: initialInput,
-      validateEntries: true
+      options,
+      rawInput,
+      getLocale,
+      getTenant,
+      getIdentity: getSecurityIdentity,
+      entriesPermissions
     });
-    const locale = getLocale();
-    const identity = getSecurityIdentity();
-    const {
-      id,
-      entryId,
-      version
-    } = createEntryId(rawInput);
-    /**
-     * There is a possibility that user sends an ID in the input, so we will use that one.
-     * There is no check if the ID is unique or not, that is up to the user.
-     */
-    const currentDate = new Date();
-    const entry = {
-      webinyVersion: context.WEBINY_VERSION,
-      tenant: getTenant().id,
-      entryId,
-      id,
-      modelId: model.modelId,
-      locale: locale.code,
-      createdOn: (0, _date.getDate)(rawInput.createdOn, currentDate),
-      savedOn: (0, _date.getDate)(rawInput.savedOn, currentDate),
-      publishedOn: (0, _date.getDate)(rawInput.publishedOn),
-      createdBy: getIdentity(rawInput.createdBy, identity),
-      ownedBy: getIdentity(rawInput.ownedBy, identity),
-      modifiedBy: getIdentity(rawInput.modifiedBy, null),
-      version,
-      locked: false,
-      status: STATUS_DRAFT,
-      values: input,
-      location: {
-        folderId: ((_rawInput$wbyAco_loca = rawInput.wbyAco_location) === null || _rawInput$wbyAco_loca === void 0 ? void 0 : _rawInput$wbyAco_loca.folderId) || _constants.ROOT_FOLDER
-      }
-    };
     let storageEntry = null;
     try {
       await onEntryBeforeCreate.publish({
@@ -614,11 +414,6 @@ const createContentEntryCrud = params => {
       model
     });
 
-    /**
-     * Make sure we only work with fields that are defined in the model.
-     */
-    const input = mapAndCleanUpdatedInputData(model, rawInput);
-
     /**
      * Entries are identified by a common parent ID + Revision number.
      */
@@ -634,46 +429,31 @@ const createContentEntryCrud = params => {
     if (!originalStorageEntry) {
       throw new _handlerGraphql.NotFoundError(`Entry "${sourceId}" of model "${model.modelId}" was not found.`);
     }
+    if (!latestStorageEntry) {
+      throw new _handlerGraphql.NotFoundError(`Latest entry "${uniqueId}" of model "${model.modelId}" was not found.`);
+    }
 
     /**
      * We need to convert data from DB to its original form before using it further.
      */
     const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-    const initialValues = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry.values), input);
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context,
-      model,
-      data: initialValues,
-      entry: originalEntry,
-      skipValidators: options === null || options === void 0 ? void 0 : options.skipValidators
-    });
-    const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
-      context,
-      model,
-      input: initialValues,
-      validateEntries: false
-    });
     await entriesPermissions.ensure({
       owns: originalEntry.createdBy
     });
-    const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;
     const {
-      id,
-      version: nextVersion
-    } = increaseEntryIdVersion(latestId);
-    const currentDate = new Date();
-    const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      id,
-      version: nextVersion,
-      savedOn: (0, _date.getDate)(rawInput.savedOn, currentDate),
-      createdOn: (0, _date.getDate)(rawInput.createdOn, currentDate),
-      publishedOn: (0, _date.getDate)(rawInput.publishedOn, originalEntry.publishedOn),
-      createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy),
-      modifiedBy: getIdentity(rawInput.modifiedBy, null),
-      ownedBy: getIdentity(rawInput.ownedBy, originalEntry.ownedBy),
-      locked: false,
-      status: STATUS_DRAFT,
-      values
+      entry,
+      input
+    } = await (0, _entryDataFactories.createEntryRevisionFromData)({
+      sourceId,
+      model,
+      rawInput,
+      options,
+      context,
+      getIdentity: getSecurityIdentity,
+      getTenant,
+      getLocale,
+      originalEntry,
+      latestStorageEntry
     });
     let storageEntry = null;
     try {
@@ -714,7 +494,6 @@ const createContentEntryCrud = params => {
     }
   };
   const updateEntry = async (model, id, rawInput, metaInput, options) => {
-    var _rawInput$wbyAco_loca2;
     await entriesPermissions.ensure({
       rwd: "w"
     });
@@ -722,11 +501,6 @@ const createContentEntryCrud = params => {
       model
     });
 
-    /**
-     * Make sure we only work with fields that are defined in the model.
-     */
-    const input = mapAndCleanUpdatedInputData(model, rawInput);
-
     /**
      * The entry we are going to update.
      */
@@ -740,48 +514,23 @@ const createContentEntryCrud = params => {
       throw new _error.default(`Cannot update entry because it's locked.`, "CONTENT_ENTRY_UPDATE_ERROR");
     }
     const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context,
-      model,
-      data: input,
-      entry: originalEntry,
-      skipValidators: options === null || options === void 0 ? void 0 : options.skipValidators
-    });
     await entriesPermissions.ensure({
-      owns: originalEntry.createdBy
+      owns: originalEntry.revisionCreatedBy
     });
-    const initialValues = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry.values), input);
-    const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
-      context,
+    const {
+      entry,
+      input
+    } = await (0, _entryDataFactories.createUpdateEntryData)({
       model,
-      input: initialValues,
-      validateEntries: false
+      rawInput,
+      options,
+      context,
+      getIdentity: getSecurityIdentity,
+      getTenant,
+      getLocale,
+      originalEntry,
+      metaInput
     });
-
-    /**
-     * If users wants to remove a key from meta values, they need to send meta key with the null value.
-     */
-    const meta = createEntryMeta(metaInput, originalEntry.meta);
-    /**
-     * We always send the full entry to the hooks and storage operations update.
-     */
-    const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      savedOn: (0, _date.getDate)(rawInput.savedOn, new Date()),
-      createdOn: (0, _date.getDate)(rawInput.createdOn, originalEntry.createdOn),
-      publishedOn: (0, _date.getDate)(rawInput.publishedOn, originalEntry.publishedOn),
-      createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy),
-      modifiedBy: getIdentity(rawInput.modifiedBy, getSecurityIdentity()),
-      ownedBy: getIdentity(rawInput.ownedBy, originalEntry.ownedBy),
-      values,
-      meta,
-      status: transformEntryStatus(originalEntry.status)
-    });
-    const folderId = (_rawInput$wbyAco_loca2 = rawInput.wbyAco_location) === null || _rawInput$wbyAco_loca2 === void 0 ? void 0 : _rawInput$wbyAco_loca2.folderId;
-    if (folderId) {
-      entry.location = {
-        folderId
-      };
-    }
     let storageEntry = null;
     try {
       await onEntryBeforeUpdate.publish({
@@ -826,7 +575,7 @@ const createContentEntryCrud = params => {
     await modelsPermissions.ensureCanAccessModel({
       model
     });
-    const input = mapAndCleanUpdatedInputData(model, inputData || {});
+    const input = (0, _entryDataFactories.mapAndCleanUpdatedInputData)(model, inputData || {});
     let originalEntry;
     if (id) {
       /**
@@ -849,7 +598,6 @@ const createContentEntryCrud = params => {
     return result.length > 0 ? result : [];
   };
   const moveEntry = async (model, id, folderId) => {
-    var _entry$location;
     await entriesPermissions.ensure({
       rwd: "w"
     });
@@ -869,7 +617,7 @@ const createContentEntryCrud = params => {
     /**
      * No need to continue if the entry is already in the requested folder.
      */
-    if (((_entry$location = entry.location) === null || _entry$location === void 0 ? void 0 : _entry$location.folderId) === folderId) {
+    if (entry.location?.folderId === folderId) {
       return entry;
     }
     try {
@@ -916,18 +664,13 @@ const createContentEntryCrud = params => {
       throw new _handlerGraphql.NotFoundError(`Entry "${id}" was not found!`);
     }
     const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-    const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+    const {
+      entry
+    } = await (0, _entryDataFactories.createRepublishEntryData)({
       context,
       model,
-      input: originalEntry.values,
-      validateEntries: false
-    });
-    const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      status: STATUS_PUBLISHED,
-      publishedOn: (0, _date.getDate)(originalEntry.publishedOn, new Date()),
-      savedOn: (0, _date.getDate)(originalEntry.savedOn, new Date()),
-      webinyVersion: context.WEBINY_VERSION,
-      values
+      originalEntry,
+      getIdentity: getSecurityIdentity
     });
     const storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
     /**
@@ -989,7 +732,7 @@ const createContentEntryCrud = params => {
     const latestStorageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
       id: entryId
     });
-    const previousStorageEntry = await storageOperations.entries.getPreviousRevision(model, {
+    const storagePreviousEntry = await storageOperations.entries.getPreviousRevision(model, {
       entryId,
       version: version
     });
@@ -997,28 +740,46 @@ const createContentEntryCrud = params => {
       throw new _handlerGraphql.NotFoundError(`Entry "${revisionId}" was not found!`);
     }
     await entriesPermissions.ensure({
-      owns: storageEntryToDelete.createdBy
+      owns: storageEntryToDelete.revisionCreatedBy
     });
     const latestEntryRevisionId = latestStorageEntry ? latestStorageEntry.id : null;
     const entryToDelete = await (0, _entryStorage.entryFromStorageTransform)(context, model, storageEntryToDelete);
+
     /**
-     * If targeted record is the latest entry record and there is no previous one, we need to run full delete with hooks.
-     * At this point deleteRevision hooks are not fired.
+     * If targeted record is the latest entry record and there is no previous one, we need
+     * to run full delete with hooks. In this case, `deleteRevision` hooks are not fired.
      */
-    if (entryToDelete.id === latestEntryRevisionId && !previousStorageEntry) {
+    if (entryToDelete.id === latestEntryRevisionId && !storagePreviousEntry) {
       return await deleteEntryHelper({
         model,
         entry: entryToDelete
       });
     }
     /**
-     * If targeted record is latest entry revision, set the previous one as the new latest
+     * If targeted record is the latest entry revision, set the previous one as the new latest.
      */
     let entryToSetAsLatest = null;
     let storageEntryToSetAsLatest = null;
-    if (entryToDelete.id === latestEntryRevisionId && previousStorageEntry) {
-      entryToSetAsLatest = await (0, _entryStorage.entryFromStorageTransform)(context, model, previousStorageEntry);
-      storageEntryToSetAsLatest = previousStorageEntry;
+    let updatedEntryToSetAsLatest = null;
+    let storageUpdatedEntryToSetAsLatest = null;
+    if (entryToDelete.id === latestEntryRevisionId && storagePreviousEntry) {
+      entryToSetAsLatest = await (0, _entryStorage.entryFromStorageTransform)(context, model, storagePreviousEntry);
+      storageEntryToSetAsLatest = storagePreviousEntry;
+
+      /**
+       * Since we're setting a different revision as the latest, we need to update entry-level meta
+       * fields. The values are taken from the latest revision we're about to delete. The update of the
+       * new latest revision is performed within storage operations.
+       */
+      const pickedEntryLevelMetaFields = (0, _constants.pickEntryMetaFields)(entryToDelete, _constants.isEntryLevelEntryMetaField);
+      updatedEntryToSetAsLatest = {
+        ...entryToSetAsLatest,
+        ...pickedEntryLevelMetaFields
+      };
+      storageUpdatedEntryToSetAsLatest = {
+        ...storageEntryToSetAsLatest,
+        ...pickedEntryLevelMetaFields
+      };
     }
     try {
       await onEntryRevisionBeforeDelete.publish({
@@ -1028,8 +789,8 @@ const createContentEntryCrud = params => {
       await storageOperations.entries.deleteRevision(model, {
         entry: entryToDelete,
         storageEntry: storageEntryToDelete,
-        latestEntry: entryToSetAsLatest,
-        latestStorageEntry: storageEntryToSetAsLatest
+        latestEntry: updatedEntryToSetAsLatest,
+        latestStorageEntry: storageUpdatedEntryToSetAsLatest
       });
       await onEntryRevisionAfterDelete.publish({
         entry: entryToDelete,
@@ -1045,8 +806,8 @@ const createContentEntryCrud = params => {
         error: ex,
         entry: entryToDelete,
         storageEntry: storageEntryToDelete,
-        latestEntry: entryToSetAsLatest,
-        latestStorageEntry: storageEntryToSetAsLatest
+        latestEntry: updatedEntryToSetAsLatest,
+        latestStorageEntry: storageUpdatedEntryToSetAsLatest
       });
     }
   };
@@ -1172,7 +933,7 @@ const createContentEntryCrud = params => {
       entry
     });
   };
-  const publishEntry = async (model, id, options) => {
+  const publishEntry = async (model, id) => {
     await entriesPermissions.ensure({
       pw: "p"
     });
@@ -1186,39 +947,26 @@ const createContentEntryCrud = params => {
       throw new _handlerGraphql.NotFoundError(`Entry "${id}" in the model "${model.modelId}" was not found.`);
     }
     await entriesPermissions.ensure({
-      owns: originalStorageEntry.createdBy
+      owns: originalStorageEntry.revisionCreatedBy
     });
     const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context,
-      model,
-      data: originalEntry.values,
-      entry: originalEntry
+
+    // We need the latest entry to get the latest entry-level meta fields.
+    const latestStorageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
+      id: originalEntry.entryId
     });
-    const currentDate = new Date().toISOString();
-    /**
-     * The existing functionality is to set the publishedOn date to the current date.
-     * Users can now choose to skip updating the publishedOn date - unless it is not set.
-     *
-     * Same logic goes for the savedOn date.
-     */
-    const {
-      updatePublishedOn = true,
-      updateSavedOn = true
-    } = options || {};
-    let publishedOn = originalEntry.publishedOn;
-    if (updatePublishedOn || !publishedOn) {
-      publishedOn = currentDate;
-    }
-    let savedOn = originalEntry.savedOn;
-    if (updateSavedOn || !savedOn) {
-      savedOn = currentDate;
+    if (!latestStorageEntry) {
+      throw new _handlerGraphql.NotFoundError(`Entry "${id}" in the model "${model.modelId}" was not found.`);
     }
-    const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      status: STATUS_PUBLISHED,
-      locked: true,
-      savedOn,
-      publishedOn
+    const latestEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, latestStorageEntry);
+    const {
+      entry
+    } = await (0, _entryDataFactories.createPublishEntryData)({
+      context,
+      model,
+      originalEntry,
+      latestEntry,
+      getIdentity: getSecurityIdentity
     });
     let storageEntry = null;
     try {
@@ -1274,11 +1022,16 @@ const createContentEntryCrud = params => {
       });
     }
     await entriesPermissions.ensure({
-      owns: originalStorageEntry.createdBy
+      owns: originalStorageEntry.revisionCreatedBy
     });
     const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-    const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      status: STATUS_UNPUBLISHED
+    const {
+      entry
+    } = await (0, _entryDataFactories.createUnpublishEntryData)({
+      context,
+      model,
+      originalEntry,
+      getIdentity: getSecurityIdentity
     });
     let storageEntry = null;
     try {
@@ -1322,13 +1075,15 @@ const createContentEntryCrud = params => {
       where: initialWhere,
       fieldId
     } = params;
-    const where = (0, _objectSpread2.default)({}, initialWhere);
+    const where = {
+      ...initialWhere
+    };
     /**
      * Possibly only get records which are owned by current user.
      * Or if searching for the owner set that value - in the case that user can see other entries than their own.
      */
     if (await entriesPermissions.canAccessOnlyOwnRecords()) {
-      where.ownedBy = getSecurityIdentity().id;
+      where.createdBy = getSecurityIdentity().id;
     }
 
     /**
@@ -1459,24 +1214,26 @@ const createContentEntryCrud = params => {
       });
     },
     async listLatestEntries(model, params) {
-      const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-      return this.listEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        sort: ["createdOn_DESC"]
-      }, params || {}), {}, {
-        where: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, where), {}, {
+      const where = params?.where || {};
+      return this.listEntries(model, {
+        sort: ["createdOn_DESC"],
+        ...(params || {}),
+        where: {
+          ...where,
           latest: true
-        })
-      }));
+        }
+      });
     },
     async listPublishedEntries(model, params) {
-      const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-      return this.listEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        sort: ["createdOn_DESC"]
-      }, params || {}), {}, {
-        where: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, where), {}, {
+      const where = params?.where || {};
+      return this.listEntries(model, {
+        sort: ["createdOn_DESC"],
+        ...(params || {}),
+        where: {
+          ...where,
           published: true
-        })
-      }));
+        }
+      });
     },
     async createEntry(model, input, options) {
       return context.benchmark.measure("headlessCms.crud.entries.createEntry", async () => {
@@ -1527,9 +1284,9 @@ const createContentEntryCrud = params => {
         return deleteMultipleEntries(model, ids);
       });
     },
-    async publishEntry(model, id, options) {
+    async publishEntry(model, id) {
       return context.benchmark.measure("headlessCms.crud.entries.publishEntry", async () => {
-        return publishEntry(model, id, options);
+        return publishEntry(model, id);
       });
     },
     async unpublishEntry(model, id) {