@strapi/strapi 4.5.0 → 4.5.2

package/lib/services/entity-validator/index.js

@@ -5,7 +5,8 @@
 
 'use strict';
 
-const { has, assoc, prop, isObject } = require('lodash/fp');
+const { uniqBy, castArray, isNil, isArray, mergeWith } = require('lodash');
+const { has, assoc, prop, isObject, isEmpty } = require('lodash/fp');
 const strapiUtils = require('@strapi/utils');
 const validators = require('./validators');
 
@@ -222,10 +223,151 @@ const createValidateEntity =
         entity,
       },
       { isDraft }
-    ).required();
+    )
+      .test('relations-test', 'check that all relations exist', async function (data) {
+        try {
+          await checkRelationsExist(buildRelationsStore({ uid: model.uid, data }));
+        } catch (e) {
+          return this.createError({
+            path: this.path,
+            message: e.message,
+          });
+        }
+        return true;
+      })
+      .required();
+
     return validateYupSchema(validator, { strict: false, abortEarly: false })(data);
   };
 
+/**
+ * Builds an object containing all the media and relations being associated with an entity
+ * @param {String} uid of the model
+ * @param {Object} data
+ * @returns {Object}
+ */
+const buildRelationsStore = ({ uid, data }) => {
+  if (!uid) {
+    throw new ValidationError(`Cannot build relations store: "uid" is undefined`);
+  }
+
+  if (isEmpty(data)) {
+    return {};
+  }
+
+  const currentModel = strapi.getModel(uid);
+
+  return Object.keys(currentModel.attributes).reduce((result, attributeName) => {
+    const attribute = currentModel.attributes[attributeName];
+    const value = data[attributeName];
+
+    if (isNil(value)) {
+      return result;
+    }
+
+    switch (attribute.type) {
+      case 'relation':
+      case 'media': {
+        if (attribute.relation === 'morphToMany' || attribute.relation === 'morphToOne') {
+          // TODO: handle polymorphic relations
+          break;
+        }
+
+        const target = attribute.type === 'media' ? 'plugin::upload.file' : attribute.target;
+        // As there are multiple formats supported for associating relations
+        // with an entity, the value here can be an: array, object or number.
+        let source;
+        if (Array.isArray(value)) {
+          source = value;
+        } else if (isObject(value)) {
+          source = value.connect ?? value.set ?? [];
+        } else {
+          source = castArray(value);
+        }
+        const idArray = source.map((v) => ({ id: v.id || v }));
+
+        // Update the relationStore to keep track of all associations being made
+        // with relations and media.
+        result[target] = result[target] || [];
+        result[target].push(...idArray);
+        break;
+      }
+      case 'component': {
+        return castArray(value).reduce(
+          (relationsStore, componentValue) =>
+            mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: attribute.component,
+                data: componentValue,
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
+              }
+            ),
+          result
+        );
+      }
+      case 'dynamiczone': {
+        return value.reduce(
+          (relationsStore, dzValue) =>
+            mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: dzValue.__component,
+                data: dzValue,
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
+              }
+            ),
+          result
+        );
+      }
+      default:
+        break;
+    }
+
+    return result;
+  }, {});
+};
+
+/**
+ * Iterate through the relations store and validates that every relation or media
+ * mentioned exists
+ */
+const checkRelationsExist = async (relationsStore = {}) => {
+  const promises = [];
+
+  for (const [key, value] of Object.entries(relationsStore)) {
+    const evaluate = async () => {
+      const uniqueValues = uniqBy(value, `id`);
+      const count = await strapi.db.query(key).count({
+        where: {
+          id: {
+            $in: uniqueValues.map((v) => v.id),
+          },
+        },
+      });
+
+      if (count !== uniqueValues.length) {
+        throw new ValidationError(
+          `${
+            uniqueValues.length - count
+          } relation(s) of type ${key} associated with this entity do not exist`
+        );
+      }
+    };
+    promises.push(evaluate());
+  }
+
+  return Promise.all(promises);
+};
+
 module.exports = {
   validateEntityCreation: createValidateEntity('creation'),
   validateEntityUpdate: createValidateEntity('update'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,23 +80,23 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.5.0",
-    "@strapi/database": "4.5.0",
-    "@strapi/generate-new": "4.5.0",
-    "@strapi/generators": "4.5.0",
-    "@strapi/logger": "4.5.0",
-    "@strapi/permissions": "4.5.0",
-    "@strapi/plugin-content-manager": "4.5.0",
-    "@strapi/plugin-content-type-builder": "4.5.0",
-    "@strapi/plugin-email": "4.5.0",
-    "@strapi/plugin-upload": "4.5.0",
-    "@strapi/typescript-utils": "4.5.0",
-    "@strapi/utils": "4.5.0",
+    "@strapi/admin": "4.5.2",
+    "@strapi/database": "4.5.2",
+    "@strapi/generate-new": "4.5.2",
+    "@strapi/generators": "4.5.2",
+    "@strapi/logger": "4.5.2",
+    "@strapi/permissions": "4.5.2",
+    "@strapi/plugin-content-manager": "4.5.2",
+    "@strapi/plugin-content-type-builder": "4.5.2",
+    "@strapi/plugin-email": "4.5.2",
+    "@strapi/plugin-upload": "4.5.2",
+    "@strapi/typescript-utils": "4.5.2",
+    "@strapi/utils": "4.5.2",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
-    "ci-info": "3.3.2",
+    "ci-info": "3.5.0",
     "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
@@ -128,7 +128,7 @@
     "package-json": "7.0.0",
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.7",
+    "semver": "7.3.8",
     "statuses": "2.0.1",
     "uuid": "^8.3.2"
   },
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "33debd57010667a3fc5dfa343a673206cfb956e1"
+  "gitHead": "bcb1b7f472aae2556a9b59d59ee66d241c497a3e"
 }