Merge pull request #14599 from strapi/relations-main-view/validation-test-findExisting-findAvailable

add validation tests on findAvailable and findExisting relations

packages/core/content-manager/server/controllers/relations.js

@@ -65,6 +65,15 @@ module.exports = {
           return ctx.forbidden();
         }
       }
+    } else {
+      // eslint-disable-next-line no-lonely-if
+      if (entityId) {
+        const entity = await strapi.entityService.findOne(model, entityId);
+
+        if (!entity) {
+          return ctx.notFound();
+        }
+      }
     }
 
     const targetedModel = strapi.getModel(attribute.target);
@@ -161,6 +170,12 @@ module.exports = {
       if (permissionChecker.cannot.read(entity, targetField)) {
         return ctx.forbidden();
       }
+    } else {
+      const entity = await strapi.entityService.findOne(model, id);
+
+      if (!entity) {
+        return ctx.notFound();
+      }
     }
 
     const targetedModel = strapi.getModel(attribute.target);

packages/core/content-manager/server/tests/find-available-relations.test.e2e.js

@@ -171,6 +171,124 @@ describe.each([[false], [true]])('Relations, with d&p: %p', (withDraftAndPublish
   });
 
   describe('findAvailable', () => {
+    describe('On a content-type', () => {
+      test('Fail when entity is not found', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/api::shop.shop/products_ow',
+          qs: {
+            entityId: 99999,
+          },
+        });
+
+        expect(res.status).toBe(404);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: 'Not Found',
+            name: 'NotFoundError',
+            status: 404,
+          },
+        });
+      });
+
+      test("Fail when the field doesn't exist", async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/api::shop.shop/unkown',
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+
+      test('Fail when the field exists but is not a relational field', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/api::shop.shop/name',
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+    });
+
+    describe('On a component', () => {
+      test('Fail when the component is not found', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/default.compo/compo_products_ow',
+          qs: {
+            entityId: 99999,
+          },
+        });
+
+        expect(res.status).toBe(404);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: 'Not Found',
+            name: 'NotFoundError',
+            status: 404,
+          },
+        });
+      });
+
+      test("Fail when the field doesn't exist", async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/default.compo/unknown',
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+
+      test('Fail when the field exists but is not a relational field', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: '/content-manager/relations/default.compo/name',
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+    });
+
     describe.each([
       ['products_ow', false],
       ['products_oo', false],

packages/core/content-manager/server/tests/find-existing-relations.test.e2e.js

@@ -173,14 +173,69 @@ describe.each([false, true])('Relations, with d&p: %s', (withDraftAndPublish) =>
     await builder.cleanup();
   });
   describe('findExisting', () => {
+    describe('On a content-type', () => {
+      test('Fail when entity is not found', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/api::shop.shop/999999/products_ow`,
+        });
+
+        expect(res.status).toBe(404);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: 'Not Found',
+            name: 'NotFoundError',
+            status: 404,
+          },
+        });
+      });
+
+      test("Fail when the field doesn't exist", async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/api::shop.shop/${data.shops[0].id}/unkown`,
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+
+      test('Fail when the field exists but is not a relational field', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/api::shop.shop/${data.shops[0].id}/name`,
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+
       describe.each([
-      ['products_ow', false],
+        ['one-way', 'products_ow', false],
-      ['products_oo', false],
+        ['one-one', 'products_oo', false],
-      ['products_mo', false],
+        ['many-to-one', 'products_mo', false],
-      ['products_om', true],
+        ['one-to-many', 'products_om', true],
-      ['products_mm', true],
+        ['many-many', 'products_mm', true],
-      ['products_mw', true],
+        ['many-way', 'products_mw', true],
-    ])('Relation not in a component (%s)', (fieldName, isManyRelation) => {
+      ])('%s relation (%s)', (relationType, fieldName, isManyRelation) => {
         test('Can retrieve the relation(s) for an entity that have some relations', async () => {
           const res = await rq({
             method: 'GET',
@@ -251,11 +306,67 @@ describe.each([false, true])('Relations, with d&p: %s', (withDraftAndPublish) =>
           });
         }
       });
+    });
+
+    describe('On a component', () => {
+      test('Fail when the component is not found', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/default.compo/999999/compo_products_ow`,
+        });
+
+        expect(res.status).toBe(404);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: 'Not Found',
+            name: 'NotFoundError',
+            status: 404,
+          },
+        });
+      });
+
+      test("Fail when the field doesn't exist", async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/default.compo/${data.shops[0].myCompo.id}/unknown`,
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
+
+      test('Fail when the field exists but is not a relational field', async () => {
+        const res = await rq({
+          method: 'GET',
+          url: `/content-manager/relations/default.compo/${data.shops[0].myCompo.id}/name`,
+        });
+
+        expect(res.status).toBe(400);
+        expect(res.body).toMatchObject({
+          data: null,
+          error: {
+            details: {},
+            message: "This relational field doesn't exist",
+            name: 'BadRequestError',
+            status: 400,
+          },
+        });
+      });
 
       describe.each([
-      ['compo_products_ow', false],
+        ['one-way', 'compo_products_ow', false],
-      ['compo_products_mw', true],
+        ['many-way', 'compo_products_mw', true],
-    ])('Relation in a component (%s)', (fieldName, isManyRelation) => {
+      ])('%s relation (%s)', (relationType, fieldName, isManyRelation) => {
         test('Can retrieve the relation(s)', async () => {
           const res = await rq({
             method: 'GET',
@@ -288,3 +399,4 @@ describe.each([false, true])('Relations, with d&p: %s', (withDraftAndPublish) =>
       });
     });
   });
+});