@webiny/api-headless-cms 0.0.0-unstable.d4f203fa97 → 0.0.0-unstable.d7f521b032

package/crud/contentEntry.crud.js

@@ -1,57 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 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 _mdbid = _interopRequireDefault(require("mdbid"));
-
 var _handlerGraphql = require("@webiny/handler-graphql");
-
 var _entryDataValidation = require("./contentEntry/entryDataValidation");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _pubsub = require("@webiny/pubsub");
-
 var _beforeCreate = require("./contentEntry/beforeCreate");
-
 var _beforeUpdate = require("./contentEntry/beforeUpdate");
-
 var _utils = require("@webiny/utils");
-
 var _afterDelete = require("./contentEntry/afterDelete");
-
 var _referenceFieldsMapping = require("./contentEntry/referenceFieldsMapping");
-
 var _merge = _interopRequireDefault(require("lodash/merge"));
-
 var _permissions = require("../utils/permissions");
-
 var _access = require("../utils/access");
-
 var _ownership = require("../utils/ownership");
-
 var _entryStorage = require("../utils/entryStorage");
-
 var _valueKeyStorageConverter = require("../utils/converters/valueKeyStorageConverter");
-
+var _searchableFields = require("./contentEntry/searchableFields");
 /**
  * Package mdbid does not have types.
  */
 // @ts-ignore
+
 const STATUS_DRAFT = "draft";
 exports.STATUS_DRAFT = STATUS_DRAFT;
 const STATUS_PUBLISHED = "published";
 exports.STATUS_PUBLISHED = STATUS_PUBLISHED;
 const STATUS_UNPUBLISHED = "unpublished";
 exports.STATUS_UNPUBLISHED = STATUS_UNPUBLISHED;
-
 /**
  * Used for some fields to convert their values.
  */
@@ -59,45 +41,35 @@ 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(({
@@ -109,8 +81,6 @@ const getDefaultValue = field => {
 /**
  * Cleans and adds default values to create input data.
  */
-
-
 const mapAndCleanCreateInputData = (model, input) => {
   return model.fields.reduce((acc, field) => {
     /**
@@ -122,12 +92,10 @@ const mapAndCleanCreateInputData = (model, input) => {
         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;
   }, {});
@@ -135,8 +103,6 @@ const mapAndCleanCreateInputData = (model, input) => {
 /**
  * Cleans the update input entry data.
  */
-
-
 const mapAndCleanUpdatedInputData = (model, input) => {
   return model.fields.reduce((acc, field) => {
     /**
@@ -151,14 +117,10 @@ const mapAndCleanUpdatedInputData = (model, input) => {
     /**
      * 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;
   }, {});
@@ -167,26 +129,29 @@ const mapAndCleanUpdatedInputData = (model, input) => {
  * 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 || {});
-
   for (const key in meta) {
     if (meta[key] !== undefined || meta[key] !== null) {
       continue;
     }
-
     delete meta[key];
   }
-
   return meta;
 };
-
-const createEntryId = version => {
-  const entryId = (0, _mdbid.default)();
+const createEntryId = input => {
+  let entryId = (0, _mdbid.default)();
+  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 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,
+    entryId: entryId,
     version,
     id: (0, _utils.createIdentifier)({
       id: entryId,
@@ -194,19 +159,16 @@ const createEntryId = 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,
@@ -216,42 +178,10 @@ const increaseEntryIdVersion = id => {
     })
   };
 };
-
-const getSearchableFields = params => {
-  const {
-    plugins,
-    model,
-    fields
-  } = params;
-  const fieldPluginMap = plugins.byType("cms-model-field-to-graphql").reduce((collection, field) => {
-    collection[field.fieldType] = field;
-    return collection;
-  }, {});
-  return model.fields.filter(field => {
-    if (!field.fieldId) {
-      return false;
-    }
-
-    const plugin = fieldPluginMap[field.type];
-
-    if (!plugin) {
-      return false;
-    } else if (!plugin.fullTextSearch) {
-      return false;
-    } else if (!fields || fields.length === 0) {
-      return true;
-    }
-
-    return fields.includes(field.fieldId);
-  }).map(field => field.fieldId);
-};
-
 const allowedEntryStatus = ["draft", "published", "unpublished"];
-
 const transformEntryStatus = status => {
   return allowedEntryStatus.includes(status) ? status : "draft";
 };
-
 const createContentEntryCrud = params => {
   const {
     storageOperations,
@@ -261,43 +191,71 @@ const createContentEntryCrud = params => {
   } = params;
   const {
     plugins
-  } = context; // create
+  } = context;
 
+  /**
+   * Create
+   */
   const onEntryBeforeCreate = (0, _pubsub.createTopic)("cms.onEntryBeforeCreate");
   const onEntryAfterCreate = (0, _pubsub.createTopic)("cms.onEntryAfterCreate");
-  const onEntryCreateError = (0, _pubsub.createTopic)("cms.onEntryCreateError"); // create revision
+  const onEntryCreateError = (0, _pubsub.createTopic)("cms.onEntryCreateError");
 
+  /**
+   * Create new revision
+   */
   const onEntryBeforeCreateRevision = (0, _pubsub.createTopic)("cms.onEntryBeforeCreateRevision");
   const onEntryRevisionAfterCreate = (0, _pubsub.createTopic)("cms.onEntryRevisionAfterCreate");
-  const onEntryCreateRevisionError = (0, _pubsub.createTopic)("cms.onEntryCreateRevisionError"); // update
+  const onEntryCreateRevisionError = (0, _pubsub.createTopic)("cms.onEntryCreateRevisionError");
 
+  /**
+   * Update
+   */
   const onEntryBeforeUpdate = (0, _pubsub.createTopic)("cms.onEntryBeforeUpdate");
   const onEntryAfterUpdate = (0, _pubsub.createTopic)("cms.onEntryAfterUpdate");
-  const onEntryUpdateError = (0, _pubsub.createTopic)("cms.onEntryUpdateError"); // publish
+  const onEntryUpdateError = (0, _pubsub.createTopic)("cms.onEntryUpdateError");
 
+  /**
+   * Publish
+   */
   const onEntryBeforePublish = (0, _pubsub.createTopic)("cms.onEntryBeforePublish");
-  const onEntryAfterPublish = (0, _pubsub.createTopic)("cms.onEntryAfterPublic");
-  const onEntryPublishError = (0, _pubsub.createTopic)("cms.onEntryPublishError"); // unpublish
+  const onEntryAfterPublish = (0, _pubsub.createTopic)("cms.onEntryAfterPublish");
+  const onEntryPublishError = (0, _pubsub.createTopic)("cms.onEntryPublishError");
 
+  /**
+   * Republish
+   */
+  const onEntryBeforeRepublish = (0, _pubsub.createTopic)("cms.onEntryBeforeRepublish");
+  const onEntryAfterRepublish = (0, _pubsub.createTopic)("cms.onEntryAfterRepublish");
+  const onEntryRepublishError = (0, _pubsub.createTopic)("cms.onEntryRepublishError");
+
+  /**
+   * Unpublish
+   */
   const onEntryBeforeUnpublish = (0, _pubsub.createTopic)("cms.onEntryBeforeUnpublish");
   const onEntryAfterUnpublish = (0, _pubsub.createTopic)("cms.onEntryAfterUnpublish");
-  const onEntryUnpublishError = (0, _pubsub.createTopic)("cms.onEntryUnpublishError"); // delete
+  const onEntryUnpublishError = (0, _pubsub.createTopic)("cms.onEntryUnpublishError");
 
+  /**
+   * Delete
+   */
   const onEntryBeforeDelete = (0, _pubsub.createTopic)("cms.onEntryBeforeDelete");
   const onEntryAfterDelete = (0, _pubsub.createTopic)("cms.onEntryAfterDelete");
-  const onEntryDeleteError = (0, _pubsub.createTopic)("cms.onEntryDeleteError"); // delete revision
+  const onEntryDeleteError = (0, _pubsub.createTopic)("cms.onEntryDeleteError");
 
+  // delete revision
   const onEntryRevisionBeforeDelete = (0, _pubsub.createTopic)("cms.onEntryRevisionBeforeDelete");
   const onEntryRevisionAfterDelete = (0, _pubsub.createTopic)("cms.onEntryRevisionAfterDelete");
-  const onEntryRevisionDeleteError = (0, _pubsub.createTopic)("cms.onEntryRevisionDeleteError"); // get
+  const onEntryRevisionDeleteError = (0, _pubsub.createTopic)("cms.onEntryRevisionDeleteError");
 
-  const onEntryBeforeGet = (0, _pubsub.createTopic)("cms.onEntryBeforeGet"); // list
+  // get
+  const onEntryBeforeGet = (0, _pubsub.createTopic)("cms.onEntryBeforeGet");
 
+  // list
   const onEntryBeforeList = (0, _pubsub.createTopic)("cms.onEntryBeforeList");
+
   /**
    * We need to assign some default behaviors.
    */
-
   (0, _beforeCreate.assignBeforeEntryCreate)({
     context,
     onEntryBeforeCreate
@@ -310,21 +268,18 @@ const createContentEntryCrud = params => {
     context,
     onEntryAfterDelete
   });
-
   const checkEntryPermissions = check => {
     return (0, _permissions.checkPermissions)(context, "cms.contentEntry", check);
   };
+
   /**
    * A helper to delete the entire entry.
    */
-
-
   const deleteEntry = async params => {
     const {
       model,
       entry
     } = params;
-
     try {
       await onEntryBeforeDelete.publish({
         entry,
@@ -351,8 +306,6 @@ const createContentEntryCrud = params => {
   /**
    * A helper to get entries by revision IDs
    */
-
-
   const getEntriesByIds = async (initialModel, ids) => {
     const permission = await checkEntryPermissions({
       rwd: "r"
@@ -367,7 +320,6 @@ const createContentEntryCrud = params => {
     });
     return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
   };
-
   return {
     /**
      * Deprecated - will be removed in 5.35.0
@@ -388,39 +340,62 @@ const createContentEntryCrud = params => {
     onAfterEntryUnpublish: onEntryAfterUnpublish,
     onBeforeEntryGet: onEntryBeforeGet,
     onBeforeEntryList: onEntryBeforeList,
-
     /**
      * Released in 5.34.0
+     *
+     * Create
      */
     onEntryBeforeCreate,
     onEntryAfterCreate,
     onEntryCreateError,
+    /**
+     * Create revision
+     */
     onEntryRevisionBeforeCreate: onEntryBeforeCreateRevision,
     onEntryRevisionAfterCreate,
     onEntryRevisionCreateError: onEntryCreateRevisionError,
+    /**
+     * Update
+     */
     onEntryBeforeUpdate,
     onEntryAfterUpdate,
     onEntryUpdateError,
+    /**
+     * Delete whole entry
+     */
     onEntryBeforeDelete,
     onEntryAfterDelete,
     onEntryDeleteError,
+    /**
+     * Delete entry revision
+     */
     onEntryRevisionBeforeDelete,
     onEntryRevisionAfterDelete,
     onEntryRevisionDeleteError,
+    /**
+     * Publish
+     */
     onEntryBeforePublish,
     onEntryAfterPublish,
     onEntryPublishError,
+    /**
+     * Republish
+     */
+    onEntryBeforeRepublish,
+    onEntryAfterRepublish,
+    onEntryRepublishError,
+    /**
+     * Unpublish
+     */
     onEntryBeforeUnpublish,
     onEntryAfterUnpublish,
     onEntryUnpublishError,
     onEntryBeforeGet,
     onEntryBeforeList,
-
     /**
      * Get entries by exact revision IDs from the database.
      */
     getEntriesByIds: getEntriesByIds,
-
     /**
      * Get a single entry by revision ID from the database.
      */
@@ -437,14 +412,11 @@ const createContentEntryCrud = params => {
         model
       });
       const [entry] = await getEntriesByIds(model, [id]);
-
       if (!entry) {
         throw new _handlerGraphql.NotFoundError(`Entry by ID "${id}" not found.`);
       }
-
       return entry;
     },
-
     /**
      * Get published revisions by entry IDs.
      */
@@ -462,9 +434,8 @@ const createContentEntryCrud = params => {
       });
       return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
     },
-
     /**
-     * Get latest revisions by entry IDs.
+     * Get the latest revisions by entry IDs.
      */
     async getLatestEntriesByIds(initialModel, ids) {
       const permission = await checkEntryPermissions({
@@ -480,7 +451,6 @@ const createContentEntryCrud = params => {
       });
       return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
     },
-
     async getEntryRevisions(initialModel, entryId) {
       const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
         model: initialModel,
@@ -490,7 +460,6 @@ const createContentEntryCrud = params => {
         id: entryId
       });
     },
-
     /**
      * TODO determine if this method is required at all.
      *
@@ -517,14 +486,11 @@ const createContentEntryCrud = params => {
         sort,
         limit: 1
       });
-
       if (items.length === 0) {
         throw new _handlerGraphql.NotFoundError(`Entry not found!`);
       }
-
       return items[0];
     },
-
     /**
      * @description Should not be used directly. Internal use only!
      *
@@ -540,20 +506,19 @@ const createContentEntryCrud = params => {
         plugins
       });
       const {
-        where: initialWhere
+        where: initialWhere,
+        limit: initialLimit
       } = params;
+      const limit = initialLimit && initialLimit > 0 ? initialLimit : 50;
       /**
        * We always assign tenant and locale because we do not allow one model to have content through multiple tenants.
        */
-
       const where = (0, _objectSpread2.default)({}, 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.
        */
-
       const ownedBy = permission.own ? getIdentity().id : where.ownedBy;
-
       if (ownedBy !== undefined) {
         where.ownedBy = ownedBy;
       }
@@ -561,8 +526,6 @@ const createContentEntryCrud = params => {
        * Where must contain either latest or published keys.
        * We cannot list entries without one of those
        */
-
-
       if (where.latest && where.published) {
         throw new _error.default("Cannot list entries that are both published and latest.", "LIST_ENTRIES_ERROR", {
           where
@@ -572,13 +535,11 @@ const createContentEntryCrud = params => {
           where
         });
       }
-
-      const fields = getSearchableFields({
-        model,
+      const fields = (0, _searchableFields.getSearchableFields)({
+        fields: model.fields,
         plugins: context.plugins,
-        fields: params.fields || []
+        input: params.fields || []
       });
-
       try {
         await onEntryBeforeList.publish({
           where,
@@ -590,13 +551,13 @@ const createContentEntryCrud = params => {
           cursor,
           items
         } = await storageOperations.entries.list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+          limit,
           where,
           fields
         }));
         const meta = {
           hasMoreItems,
           totalCount,
-
           /**
            * Cursor should be null if there are no more items to load.
            * Just make sure of that, disregarding what is returned from the storageOperations.entries.list method.
@@ -617,7 +578,6 @@ 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)({
@@ -628,7 +588,6 @@ const createContentEntryCrud = params => {
         })
       }));
     },
-
     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)({
@@ -639,7 +598,6 @@ const createContentEntryCrud = params => {
         })
       }));
     },
-
     async createEntry(initialModel, inputData) {
       await checkEntryPermissions({
         rwd: "w"
@@ -649,10 +607,10 @@ const createContentEntryCrud = params => {
         model: initialModel,
         plugins
       });
+
       /**
        * Make sure we only work with fields that are defined in the model.
        */
-
       const initialInput = mapAndCleanCreateInputData(model, inputData);
       await (0, _entryDataValidation.validateModelEntryData)({
         context,
@@ -672,11 +630,15 @@ const createContentEntryCrud = params => {
         displayName: identity.displayName,
         type: identity.type
       };
+      /**
+       * 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 {
         id,
         entryId,
         version
-      } = createEntryId(1);
+      } = createEntryId(inputData);
       const entry = {
         webinyVersion: context.WEBINY_VERSION,
         tenant: getTenant().id,
@@ -694,7 +656,6 @@ const createContentEntryCrud = params => {
         values: input
       };
       let storageEntry = null;
-
       try {
         await onEntryBeforeCreate.publish({
           entry,
@@ -728,7 +689,6 @@ const createContentEntryCrud = params => {
         });
       }
     },
-
     async createEntryRevisionFrom(initialModel, sourceId, inputData) {
       const permission = await checkEntryPermissions({
         rwd: "w"
@@ -738,15 +698,15 @@ const createContentEntryCrud = params => {
         model: initialModel,
         plugins
       });
+
       /**
        * Make sure we only work with fields that are defined in the model.
        */
-
       const input = mapAndCleanUpdatedInputData(model, inputData);
+
       /**
        * Entries are identified by a common parent ID + Revision number.
        */
-
       const {
         id: uniqueId
       } = (0, _utils.parseIdentifier)(sourceId);
@@ -756,15 +716,13 @@ const createContentEntryCrud = params => {
       const latestStorageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
         id: uniqueId
       });
-
       if (!originalStorageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${sourceId}" 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.validateModelEntryData)({
@@ -802,7 +760,6 @@ const createContentEntryCrud = params => {
         values
       });
       let storageEntry = null;
-
       try {
         await onEntryBeforeCreateRevision.publish({
           input,
@@ -826,6 +783,7 @@ const createContentEntryCrud = params => {
       } catch (ex) {
         await onEntryCreateRevisionError.publish({
           entry,
+          original: originalEntry,
           model,
           input,
           error: ex
@@ -839,7 +797,6 @@ const createContentEntryCrud = params => {
         });
       }
     },
-
     async updateEntry(initialModel, id, inputData, metaInput) {
       const permission = await checkEntryPermissions({
         rwd: "w"
@@ -849,27 +806,24 @@ const createContentEntryCrud = params => {
         model: initialModel,
         plugins
       });
+
       /**
        * Make sure we only work with fields that are defined in the model.
        */
-
       const input = mapAndCleanUpdatedInputData(model, inputData);
+
       /**
        * The entry we are going to update.
        */
-
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
-
       if (!originalStorageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${id}" of model "${model.modelId}" was not found.`);
       }
-
       if (originalStorageEntry.locked) {
         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.validateModelEntryData)({
         context,
@@ -888,12 +842,10 @@ const createContentEntryCrud = params => {
       /**
        * 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: new Date().toISOString(),
         values,
@@ -901,7 +853,6 @@ const createContentEntryCrud = params => {
         status: transformEntryStatus(originalEntry.status)
       });
       let storageEntry = null;
-
       try {
         await onEntryBeforeUpdate.publish({
           entry,
@@ -938,7 +889,10 @@ const createContentEntryCrud = params => {
         });
       }
     },
-
+    /**
+     * Method used internally. Not documented and should not be used in users systems.
+     * @internal
+     */
     async republishEntry(initialModel, id) {
       await checkEntryPermissions({
         rwd: "w"
@@ -951,27 +905,22 @@ const createContentEntryCrud = params => {
       /**
        * Fetch the entry from the storage.
        */
-
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
-
       if (!originalStorageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${id}" was not found!`);
       }
-
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
       /**
        * We can only process published entries.
        */
-
       if (originalEntry.status !== "published") {
         throw new _error.default("Entry with given ID is not published!", "NOT_PUBLISHED_ERROR", {
           id,
           original: originalEntry
         });
       }
-
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
@@ -987,7 +936,6 @@ const createContentEntryCrud = params => {
       /**
        * First we need to update existing entry.
        */
-
       try {
         await storageOperations.entries.update(model, {
           entry,
@@ -1001,20 +949,32 @@ const createContentEntryCrud = params => {
       /**
        * Then we move onto publishing it again.
        */
-
-
       try {
-        return await storageOperations.entries.publish(model, {
+        await onEntryBeforeRepublish.publish({
+          entry,
+          model
+        });
+        const result = await storageOperations.entries.publish(model, {
           entry,
           storageEntry
         });
+        await onEntryAfterRepublish.publish({
+          entry,
+          model,
+          storageEntry
+        });
+        return result;
       } catch (ex) {
+        await onEntryRepublishError.publish({
+          entry,
+          model,
+          error: ex
+        });
         throw new _error.default("Could not publish existing entry while re-publishing.", "REPUBLISH_PUBLISH_ERROR", {
           entry
         });
       }
     },
-
     async deleteEntryRevision(initialModel, revisionId) {
       const permission = await checkEntryPermissions({
         rwd: "d"
@@ -1038,11 +998,9 @@ const createContentEntryCrud = params => {
         entryId,
         version: version
       });
-
       if (!storageEntryToDelete) {
         throw new _handlerGraphql.NotFoundError(`Entry "${revisionId}" was not found!`);
       }
-
       (0, _ownership.checkOwnership)(context, permission, storageEntryToDelete);
       const latestEntryRevisionId = latestStorageEntry ? latestStorageEntry.id : null;
       const entryToDelete = await (0, _entryStorage.entryFromStorageTransform)(context, model, storageEntryToDelete);
@@ -1050,7 +1008,6 @@ const createContentEntryCrud = params => {
        * 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 (entryToDelete.id === latestEntryRevisionId && !previousStorageEntry) {
         return await deleteEntry({
           model,
@@ -1060,16 +1017,12 @@ const createContentEntryCrud = params => {
       /**
        * If targeted record is 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;
       }
-
       try {
         await onEntryRevisionBeforeDelete.publish({
           entry: entryToDelete,
@@ -1100,7 +1053,6 @@ const createContentEntryCrud = params => {
         });
       }
     },
-
     async deleteEntry(initialModel, entryId) {
       const permission = await checkEntryPermissions({
         rwd: "d"
@@ -1113,11 +1065,9 @@ const createContentEntryCrud = params => {
       const storageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
         id: entryId
       });
-
       if (!storageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${entryId}" was not found!`);
       }
-
       (0, _ownership.checkOwnership)(context, permission, storageEntry);
       const entry = await (0, _entryStorage.entryFromStorageTransform)(context, model, storageEntry);
       return await deleteEntry({
@@ -1125,7 +1075,6 @@ const createContentEntryCrud = params => {
         entry
       });
     },
-
     async publishEntry(initialModel, id) {
       const permission = await checkEntryPermissions({
         pw: "p"
@@ -1138,11 +1087,9 @@ const createContentEntryCrud = params => {
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
-
       if (!originalStorageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${id}" in the model "${model.modelId}" was not found.`);
       }
-
       (0, _ownership.checkOwnership)(context, permission, originalStorageEntry);
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
       const currentDate = new Date().toISOString();
@@ -1153,7 +1100,6 @@ const createContentEntryCrud = params => {
         publishedOn: currentDate
       });
       let storageEntry = null;
-
       try {
         await onEntryBeforePublish.publish({
           entry,
@@ -1185,7 +1131,6 @@ const createContentEntryCrud = params => {
         });
       }
     },
-
     async unpublishEntry(initialModel, id) {
       const permission = await checkEntryPermissions({
         pw: "u"
@@ -1200,24 +1145,20 @@ const createContentEntryCrud = params => {
       const originalStorageEntry = await storageOperations.entries.getPublishedRevisionByEntryId(model, {
         id: entryId
       });
-
       if (!originalStorageEntry) {
         throw new _handlerGraphql.NotFoundError(`Entry "${id}" of model "${model.modelId}" was not found.`);
       }
-
       if (originalStorageEntry.id !== id) {
         throw new _error.default(`Entry is not published.`, "UNPUBLISH_ERROR", {
           entry: originalStorageEntry
         });
       }
-
       (0, _ownership.checkOwnership)(context, permission, originalStorageEntry);
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
       const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         status: STATUS_UNPUBLISHED
       });
       let storageEntry = null;
-
       try {
         await onEntryBeforeUnpublish.publish({
           entry,
@@ -1248,8 +1189,6 @@ const createContentEntryCrud = params => {
         });
       }
     }
-
   };
 };
-
 exports.createContentEntryCrud = createContentEntryCrud;