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

package/tests/cases/integration/graphQlRequests/insert/manyHasOne/connectOrCreate.test.ts

@@ -0,0 +1,106 @@
+import { test } from 'vitest'
+import { execute, sqlTransaction } from '../../../../../src/test'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../../src/tags'
+import { testUuid } from '@contember/engine-api-tester'
+
+test('create posts and connect/create author (exists, many has one)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', e =>
+				e.column('publishedAt', c => c.type(Model.ColumnType.DateTime)).manyHasOne('author', r => r.target('Author')),
+			)
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).unique()))
+			.buildSchema(),
+		query: GQL`
+        mutation {
+          createPost(data: {
+            publishedAt: "2018-06-11",
+            author: {connectOrCreate: {connect: {name: "John"}, create: {name: "John"}}}
+          }) {
+			ok
+          }
+        }
+      `,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: `select "root_"."id" from "public"."author" as "root_" where "root_"."name" = ?`,
+					parameters: ['John'],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: `with "root_" as (select ? :: uuid as "id", ? :: timestamptz as "published_at", ? :: uuid as "author_id")
+					insert into  "public"."post" ("id", "published_at", "author_id") select "root_"."id", "root_"."published_at", "root_"."author_id"  from "root_"  returning "id"`,
+					parameters: [testUuid(1), '2018-06-11', testUuid(2)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				createPost: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+
+test('create posts and connect/create author (not exists, many has one)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', e =>
+				e.column('publishedAt', c => c.type(Model.ColumnType.DateTime)).manyHasOne('author', r => r.target('Author')),
+			)
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).unique()))
+			.buildSchema(),
+		query: GQL`
+        mutation {
+          createPost(data: {
+            publishedAt: "2018-06-11",
+            author: {connectOrCreate: {connect: {name: "John"}, create: {name: "John"}}}
+          }) {
+			ok
+          }
+        }
+      `,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: `select "root_"."id" from "public"."author" as "root_" where "root_"."name" = ?`,
+					parameters: ['John'],
+					response: { rows: [] },
+				},
+				{
+					sql: SQL`with "root_" as
+						(select ? :: uuid as "id", ? :: text as "name")
+						insert into "public"."author" ("id", "name")
+						select "root_"."id", "root_"."name"
+            from "root_"
+						returning "id"`,
+					parameters: [testUuid(2), 'John'],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: `with "root_" as (select ? :: uuid as "id", ? :: timestamptz as "published_at", ? :: uuid as "author_id")
+					insert into  "public"."post" ("id", "published_at", "author_id") select "root_"."id", "root_"."published_at", "root_"."author_id"  from "root_"  returning "id"`,
+					parameters: [testUuid(1), '2018-06-11', testUuid(2)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				createPost: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+
+

package/tests/cases/integration/graphQlRequests/insert/oneHasMany/{insertRelationConnect.test.ts → connect.test.ts}

@@ -41,11 +41,11 @@ test('insert category and connect existing post (one has many)', async () => {
 					},
 				},
 				{
-					sql: SQL`with "newdata_" as (select ? :: uuid as "category_id", "root_"."id", "root_"."name" from "public"."post" as "root_" where "root_"."id" = ?)
-						update "public"."post" set "category_id" = "newdata_"."category_id" from "newdata_" where "post"."id" = "newdata_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "category_id", "root_"."category_id" as "category_id_old__", "root_"."id", "root_"."name"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "category_id" =  "newData_"."category_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "category_id_old__"`,
 					parameters: [testUuid(1), testUuid(5)],
 					response: {
-						rowCount: 1,
+						rows: [{ category_id_old__: testUuid(99) }],
 					},
 				},
 				{

package/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.ts

@@ -0,0 +1,67 @@
+import { test } from 'vitest'
+import { execute } 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('Entity - explicit order by, default asc', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)).orderBy('title'))
+			.buildSchema(),
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" asc, "root_"."id" asc`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: [testUuid(1), 'Foo'],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					id: testUuid(1),
+				},
+			},
+		},
+	})
+})
+
+
+test('Entity - explicit order by desc', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)).orderBy('title', Model.OrderDirection.desc))
+			.buildSchema(),
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" desc, "root_"."id" asc`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: [testUuid(1), 'Foo'],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					id: testUuid(1),
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts

@@ -45,16 +45,10 @@ test('update name', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where "root_"."id" = ? and "root_"."name" in (?, ?)) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ? and "root_"."name" in (?, ?)) 
+						update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)  returning "name_old__"`,
 					parameters: ['John', testUuid(1), 'John', 'Jack', 'John', 'Jack'],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'John' }] },
 				},
 			]),
 		],
@@ -108,16 +102,10 @@ test('update name - denied', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where false) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and false`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where false) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and false  returning "name_old__"`,
 					parameters: ['John'],
-					response: 0,
+					response: { rows: [] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/additionalFilter.test.ts

@@ -30,11 +30,10 @@ test('applies a filter', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newdata_" as
-								(select ? :: text as "name", "root_"."id" from "public"."author" as "root_" where "root_"."id" = ? and "root_"."name" = ?)
-								update "public"."author" set "name" = "newdata_"."name" from "newdata_" where "author"."id" = "newdata_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ? and "root_"."name" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1), 'Jack'],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/update/basic/columnUpdate.test.ts

@@ -29,15 +29,10 @@ test('update name', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select
-                  ? :: text as "name",
-                  "root_"."id"
-                from "public"."author" as "root_"
-                where "root_"."id" = ?) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'John' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/delete.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 { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 import { postWithCategories } from './schema'
@@ -27,17 +27,16 @@ test('delete', 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: {
@@ -50,3 +49,43 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete - denied', async () => {
+	await execute({
+		schema: postWithCategories,
+		query: GQL`mutation {
+        updateCategory(
+            by: {id: "${testUuid(2)}"},
+            data: {posts: [{delete: {id: "${testUuid(1)}"}}]}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."category" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."post" 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"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateCategory: {
+					ok: false,
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/update.test.ts

@@ -28,16 +28,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "title",
-                 "root_"."id"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "title" = "newData_"."title" from "newData_"
-             where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Foo bar' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/upsert.test.ts

@@ -28,16 +28,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "title",
-                 "root_"."id"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "title" = "newData_"."title" from "newData_"
-             where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/delete.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 { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 import { postWithCategories } from './schema'
@@ -27,17 +27,16 @@ test('delete', async () => {
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."category"
-              where "id" in (select "root_"."id"
-                             from "public"."category" 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"."category" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."category" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 			]),
 		],
 		return: {
@@ -50,3 +49,43 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete - denied', async () => {
+	await execute({
+		schema: postWithCategories,
+		query: GQL`mutation {
+        updatePost(
+            by: {id: "${testUuid(2)}"},
+            data: {categories: [{delete: {id: "${testUuid(1)}"}}]}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."category" 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"."category" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updatePost: {
+					ok: false,
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/update.test.ts

@@ -28,16 +28,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."category" as "root_"
-               where "root_"."id" = ?) update "public"."category"
-              set "name" = "newData_"."name" from "newData_"
-              where "category"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."category" as "root_"  where "root_"."id" = ?) 
+							update  "public"."category" set  "name" =  "newData_"."name"   from "newData_"  where "category"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/upsert.test.ts

@@ -28,16 +28,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."category" as "root_"
-               where "root_"."id" = ?) update "public"."category"
-              set "name" = "newData_"."name" from "newData_"
-              where "category"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."category" as "root_"  where "root_"."id" = ?) 
+						update  "public"."category" set  "name" =  "newData_"."name"   from "newData_"  where "category"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasOne/connect.test.ts

@@ -28,17 +28,10 @@ test('connect', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "author_id",
-                 "root_"."id",
-                 "root_"."title"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "author_id" = "newData_"."author_id" from "newData_"
-              where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "author_id", "root_"."author_id" as "author_id_old__", "root_"."id", "root_"."title"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "author_id" =  "newData_"."author_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "author_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ author_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/manyHasOne/create.test.ts

@@ -39,17 +39,10 @@ test('create', async () => {
 				},
 
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "author_id",
-                 "root_"."id",
-                 "root_"."title"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "author_id" = "newData_"."author_id" from "newData_"
-              where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "author_id", "root_"."author_id" as "author_id_old__", "root_"."id", "root_"."title"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post" set  "author_id" =  "newData_"."author_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "author_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ author_id_old__: testUuid(99) }] },
 				},
 			]),
 		],