@contember/engine-content-api 1.2.1 → 1.3.0-alpha.13

package/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.ts

@@ -5,7 +5,7 @@ import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Site', e => e.column('slug', c => c.unique().type(Model.ColumnType.String)))
 	.entity('ContactPage', e =>
 		e.column('title').oneHasOne('site', r => r.target('Site').inversedBy('contactPage').notNull()),
@@ -14,7 +14,7 @@ const schema = new SchemaBuilder()
 
 test('update site & create contact page', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -35,15 +35,15 @@ test('update site & create contact page', async () => {
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en' }],
-			contact_page: [{ site_id: testUuid(1), id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en' }],
+			contact_page: [{ site_id: testUuid(3), id: testUuid(5), title: 'Test' }],
 		},
 	})
 })
 
 test('update site & try to create contact page which however exists', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -68,15 +68,12 @@ test('update site & try to create contact page which however exists', async () =
 					{
 						type: 'NotNullConstraintViolation',
 					},
-					{
-						type: 'UniqueConstraintViolation',
-					},
 				],
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en' }],
-			contact_page: [{ site_id: testUuid(1), id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en' }],
+			contact_page: [{ site_id: testUuid(3), id: testUuid(4), title: 'Test' }],
 		},
 	})
 })

package/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.ts

@@ -4,7 +4,7 @@ import { test } from 'vitest'
 import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Site', e =>
 		e.column('slug', c => c.unique().type(Model.ColumnType.String)),
 	)
@@ -12,7 +12,7 @@ const schema = new SchemaBuilder()
 
 test('fail when creating a non-unique site', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {

package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts

@@ -1,11 +1,11 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
+import { execute, failedTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Acl, Model } from '@contember/schema'
+import { Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
-test('delete post with acl', async () => {
+test('delete post with acl (denied)', async () => {
 	await execute({
 		schema: new SchemaBuilder()
 			.entity('Post', entity => entity.column('locale', c => c.type(Model.ColumnType.String)))
@@ -13,9 +13,8 @@ test('delete post with acl', async () => {
 		query: GQL`
         mutation {
           deletePost(by: {id: "${testUuid(1)}"}) {
-            node {
-              id
-            }
+            ok
+            errorMessage
           }
         }`,
 		permissions: {
@@ -35,45 +34,27 @@ test('delete post with acl', async () => {
 			locale_variable: { in: ['cs'] },
 		},
 		executes: [
-			...sqlTransaction([
-				{
-					sql: SQL`select
-                     "root_"."id" as "root_id"
-                     from "public"."post" as "root_"
-                   where "root_"."id" = ?`,
-					parameters: [testUuid(1)],
-					response: {
-						rows: [
-							{
-								root_id: testUuid(1),
-							},
-						],
-					},
-				},
+			...failedTransaction([
 				{
 					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post"
-            where "id" in (select "root_"."id"
-                           from "public"."post" as "root_"
-                           where "root_"."id" = ? and "root_"."locale" in (?))
-            returning "id"`,
-						parameters: [testUuid(1), 'cs'],
-						response: { rows: [{ id: testUuid(1) }] },
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."locale" in (?) as "allowed" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: ['cs', testUuid(1)],
+					response: {
+						rows: [{ id: testUuid(1), allowed: false }],
 					},
-				]),
+				},
 			]),
 		],
 		return: {
 			data: {
 				deletePost: {
-					node: {
-						id: testUuid(1),
-					},
+					ok: false,
+					errorMessage: 'Execution has failed:\n' +
+						'unknown field: NotFoundOrDenied (for input {"id":{"in":["123e4567-e89b-12d3-a456-000000000001"]}})',
 				},
 			},
 		},

package/tests/cases/integration/graphQlRequests/delete/additionalDeleteFilter.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
+import { execute, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
@@ -13,51 +13,32 @@ test('delete post with additional filter', async () => {
 		query: GQL`
         mutation {
           deletePost(by: {id: "${testUuid(1)}"}, filter: {locale: {eq: "cs"}}) {
-            node {
-              id
-            }
+            ok
           }
         }`,
 		executes: [
 			...sqlTransaction([
 				{
-					sql: SQL`select
-                     "root_"."id" as "root_id"
-                     from "public"."post" as "root_"
-                   where "root_"."id" = ?`,
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
 					parameters: [testUuid(1)],
-					response: {
-						rows: [
-							{
-								root_id: testUuid(1),
-							},
-						],
-					},
+					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."post" as "root_" where "root_"."id" = ? and "root_"."locale" = ?`,
+					parameters: [testUuid(1), 'cs'],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."post" where "id" in (?)`,
 					parameters: [testUuid(1)],
-					response: { rows: [{ id: testUuid(1) }] },
+					response: {  },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post"
-            where "id" in (select "root_"."id"
-                           from "public"."post" as "root_"
-                           where "root_"."id" = ? and "root_"."locale" = ?)
-            returning "id"`,
-						parameters: [testUuid(1), 'cs'],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-				]),
 			]),
 		],
 		return: {
 			data: {
 				deletePost: {
-					node: {
-						id: testUuid(1),
-					},
+					ok: true,
 				},
 			},
 		},

package/tests/cases/integration/graphQlRequests/delete/cascadeDelete.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
+import { execute, failedTransaction, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
@@ -19,68 +19,89 @@ test('delete author with posts and locales cascade delete', async () => {
 		query: GQL`
         mutation {
           deleteAuthor(by: {id: "${testUuid(1)}"}) {
-            node {
-              id
-            }
+            ok
           }
         }`,
 		executes: [
 			...sqlTransaction([
 				{
-					sql: SQL`select "root_"."id" as "root_id"
-                     from "public"."author" as "root_"
-                     where "root_"."id" = ?`,
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "author_id" in (?)`,
 					parameters: [testUuid(1)],
-					response: {
-						rows: [
-							{
-								root_id: testUuid(1),
-							},
-						],
-					},
+					response: { rows: [{ id: testUuid(2), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."post_id" as "ref", true as "allowed" from "public"."post_locales" as "root_" where "post_id" in (?)`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(3), allowed: true }] },
 				},
+				{
+					sql: SQL`delete from "public"."author" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { },
+				},
+			]),
+		],
+		return: {
+			data: {
+				deleteAuthor: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+
+test('delete author with posts (denied) ', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.manyHasOne('author', relation => relation.target('Author').onDelete(Model.OnDelete.cascade)),
+			)
+			.entity('Author', entity => entity.column('name', column => column.type(Model.ColumnType.String)))
+			.buildSchema(),
+		query: GQL`
+        mutation {
+          deleteAuthor(by: {id: "${testUuid(1)}"}) {
+            ok
+            errorMessage
+          }
+        }`,
+		executes: [
+			...failedTransaction([
 				{
 					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."author"
-            where "id" in (select "root_"."id"
-                           from "public"."author" as "root_"
-                           where "root_"."id" = ?)
-            returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-					{
-						sql: SQL`delete from "public"."post"
-            where "id" in (select "root_"."id"
-                           from "public"."post" as "root_"
-                           where "root_"."author_id" in (?))
-            returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(2) }, { id: testUuid(3) }] },
-					},
-					{
-						sql: SQL`delete from "public"."post_locales"
-            where "id" in (select "root_"."id"
-                           from "public"."post_locales" as "root_"
-                           where "root_"."post_id" in (?, ?))
-            returning "id"`,
-						parameters: [testUuid(2), testUuid(3)],
-						response: { rows: [{ id: testUuid(4) }, { id: testUuid(5) }] },
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
+				},
 			]),
 		],
 		return: {
 			data: {
 				deleteAuthor: {
-					node: {
-						id: testUuid(1),
-					},
+					ok: false,
+					errorMessage: 'Execution has failed:\n' +
+						'unknown field: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000001 row(s) of entity Author, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Post in relation author. OnDelete behaviour of this relation is set to "cascade". This is possibly caused by ACL denial.)',
 				},
 			},
 		},
@@ -88,3 +109,4 @@ test('delete author with posts and locales cascade delete', async () => {
 })
 
 
+

package/tests/cases/integration/graphQlRequests/delete/deleteById.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
+import { execute, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
@@ -62,17 +62,16 @@ test('delete post by id', async () => {
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post"
-            where "id" in (select "root_"."id"
-                           from "public"."post" as "root_"
-                           where "root_"."id" = ?)
-						returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."post" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 			]),
 		],
 		return: {

package/tests/cases/integration/graphQlRequests/delete/orphanRemoval.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
+import { execute, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
 import { GQL, SQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
@@ -38,26 +38,37 @@ test('delete post and orphaned content', async () => {
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post"
-            where "id" in (select "root_"."id"
-                           from "public"."post" as "root_"
-                           where "root_"."id" = ?)
-            returning "id", "content_id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1), content_id: testUuid(2) }] },
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."content_id" as "_content_id", true as "allowed" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: {
+						rows: [{ id: testUuid(1), _content_id: testUuid(2), allowed: true }],
+					},
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."content" as "root_" where "root_"."id" in (?)`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ id: testUuid(2), allowed: true }],
 					},
-					{
-						sql: SQL`delete from "public"."content"
-            where "id" in (select "root_"."id"
-                           from "public"."content" as "root_"
-                           where "root_"."id" in (?))
-            returning "id"`,
-						parameters: [testUuid(2)],
-						response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."content_id" as "ref" from "public"."post" as "root_" where "content_id" in (?)`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ id: testUuid(1), ref: testUuid(2) }],
 					},
-				]),
+				},
+				{
+					sql: SQL`delete from "public"."post" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { },
+				},
+				{
+					sql: SQL`delete from "public"."content" where "id" in (?)`,
+					parameters: [testUuid(2)],
+					response: { },
+				},
 			]),
 		],
 		return: {

package/tests/cases/integration/graphQlRequests/delete/restrictOnDelete.test.ts

@@ -0,0 +1,102 @@
+import { test } from 'vitest'
+import { execute, failedTransaction, sqlTransaction } from '../../../../src/test'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../src/tags'
+import { testUuid } from '../../../../src/testUuid'
+
+test('delete author and with restrict on posts', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.manyHasOne('author', relation => relation.target('Author')),
+			)
+			.entity('Author', entity => entity.column('name', column => column.type(Model.ColumnType.String)))
+			.buildSchema(),
+		query: GQL`
+        mutation {
+          deleteAuthor(by: {id: "${testUuid(1)}"}) {
+            ok
+          }
+        }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [] },
+				},
+				{
+					sql: SQL`delete from "public"."author" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { },
+				},
+			]),
+		],
+		return: {
+			data: {
+				deleteAuthor: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+
+test('delete author with restrict on posts - declined', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.manyHasOne('author', relation => relation.target('Author')),
+			)
+			.entity('Author', entity => entity.column('name', column => column.type(Model.ColumnType.String)))
+			.buildSchema(),
+		query: GQL`
+        mutation {
+          deleteAuthor(by: {id: "${testUuid(1)}"}) {
+            ok
+            errorMessage
+          }
+        }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1) }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				deleteAuthor: {
+					ok: false,
+					errorMessage: 'Execution has failed:\n' +
+						'unknown field: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000001 row(s) of entity Author, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Post in relation author. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
+				},
+			},
+		},
+	})
+})
+