@contember/engine-content-api 1.1.0-alpha.6 → 1.1.0-beta.0

package/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.ts

@@ -417,3 +417,90 @@ test('Posts with paginated comments without count (one has many)', async () => {
 })
 
 
+test('Posts with paginated comments (one has many)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.oneHasMany('comments', relation => relation.target('Comment').ownedBy('post')))
+			.entity('Comment', entity => entity.column('content').column('deletedAt', c => c.type(Model.ColumnType.DateTime)))
+			.buildSchema(),
+		query: GQL`
+        query {
+          listPost {
+            id
+            comments: paginateComments(filter: {deletedAt: {isNull: true}}, first: 1) {
+				pages: pageInfo {
+					count: totalCount
+				}
+				comments: edges {
+					comment: node {
+						content
+					}
+				}
+            }
+          }
+        }
+			`,
+		executes: [
+			{
+				sql: SQL`select
+                       "root_"."id" as "root_id",
+                       "root_"."id" as "root_id"
+                     from "public"."post" as "root_"`,
+				response: {
+					rows: [{ root_id: testUuid(1) }],
+				},
+			},
+			{
+				sql: SQL`select
+       				count(*) as "row_count", "root_"."post_id"
+					from "public"."comment" as "root_"
+					where "root_"."deleted_at" is null and "root_"."post_id" in (?)
+					group by "root_"."post_id"`,
+				parameters: [testUuid(1)],
+				response: {
+					rows: [
+						{ post_id: testUuid(1), row_count: 5 },
+					],
+				},
+			},
+			{
+				sql: SQL`with "data" as
+    				(select
+    				    "root_"."post_id" as "__grouping_key",
+    				    "root_"."content" as "root_content",
+    					"root_"."id" as "root_id",
+    				    row_number() over(partition by  "root_"."post_id" order by "root_"."id" asc) as "rowNumber_"
+    					from "public"."comment" as "root_"
+    					where "root_"."deleted_at" is null
+    					      and "root_"."post_id" in (?)
+    					order by "root_"."id" asc)
+					select "data".*  from "data"   where "data"."rowNumber_" <= ?`,
+				parameters: [testUuid(1), 1],
+				response: {
+					rows: [
+						{ __grouping_key: testUuid(1), root_id: testUuid(3), root_content: 'Lorem ipsum' },
+					],
+				},
+			},
+		],
+		return: {
+			data: {
+				listPost: [
+					{
+						id: testUuid(1),
+						comments: {
+							pages: {
+								count: 5,
+							},
+							comments: [
+								{
+									comment: { content: 'Lorem ipsum' },
+								},
+							],
+						},
+					},
+				],
+			},
+		},
+	})
+})

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

@@ -0,0 +1,34 @@
+import { test } from 'vitest'
+import { execute } from '../../../../../src/test'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { GQL, SQL } from '../../../../../src/tags'
+
+test('order by desc nulls last', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title'))
+			.buildSchema(),
+		query: GQL`
+        query {
+          listPost(orderBy: {title: descNullsLast}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select
+                       "root_"."id" as "root_id"
+                     from "public"."post" as "root_" order by "root_"."title" desc nulls last, "root_"."id" asc`,
+				response: {
+					rows: [],
+				},
+			},
+		],
+		return: {
+			data: {
+				listPost: [],
+			},
+		},
+	})
+})
+

package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts

@@ -98,8 +98,54 @@ test('upsert author (exists)', async () => {
 					response: { rowCount: 1 },
 				},
 				{
-					sql: SQL`select "root_"."id" as "root_id"  from "public"."author" as "root_"  where "root_"."id" = ?`,
-					parameters: [testUuid(2)],
+					sql: SQL`select "root_"."id" as "root_id"  from "public"."author" as "root_"  where "root_"."slug" = ?`,
+					parameters: ['john-doe'],
+					response: { rows: [{ root_id: testUuid(2) }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				upsertAuthor: {
+					ok: true,
+					node: {
+						id: testUuid(2),
+					},
+				},
+			},
+		},
+	})
+})
+
+test('upsert author (exists) with noop update)', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Author', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.column('slug', c => c.type(Model.ColumnType.String).unique()),
+			)
+			.buildSchema(),
+		query: GQL`
+          mutation {
+              upsertAuthor(by: {slug: "john-doe"}, update: {}, create: {slug: "john-doe", name: "John Doe"}) {
+                  ok
+                  node {
+                      id
+                  }
+              }
+          }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id"
+					from "public"."author" as "root_"  where "root_"."slug" = ?`,
+					parameters: ['john-doe'],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "root_id"  from "public"."author" as "root_"  where "root_"."slug" = ?`,
+					parameters: ['john-doe'],
 					response: { rows: [{ root_id: testUuid(2) }] },
 				},
 			]),
@@ -117,3 +163,4 @@ test('upsert author (exists)', async () => {
 	})
 })
 
+

package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts

@@ -26,7 +26,7 @@ const testSchema = async (test: Test) => {
 	const schema = schemaResult instanceof SchemaBuilder ? schemaResult.buildSchema() : schemaResult
 	const schemaWithAcl = { ...schema, acl: { roles: {}, variables: {} } }
 	const permissions = test.permissions(schemaWithAcl)
-	const authorizator = new Authorizator(permissions)
+	const authorizator = new Authorizator(permissions, false)
 	const graphQlSchemaBuilder = schemaFactory.create(schemaWithAcl, authorizator)
 	const graphQlSchema = graphQlSchemaBuilder.build()
 

package/tests/cases/integration/graphQlSchema/schema-acl-allowed.gql

@@ -114,6 +114,8 @@ input OneHasManyEntityOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input RootOrderBy {

package/tests/cases/integration/graphQlSchema/schema-acl-predicate.gql

@@ -84,6 +84,8 @@ input TestOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 type TestConnection {

package/tests/cases/integration/graphQlSchema/schema-acl-predicate2.gql

@@ -84,6 +84,8 @@ input TestOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 type TestConnection {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-create.gql

@@ -109,6 +109,8 @@ input OneHasManyEntityOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input RootOrderBy {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-delete.gql

@@ -111,6 +111,8 @@ input OneHasManyEntityOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input RootOrderBy {

package/tests/cases/integration/graphQlSchema/schema-acl-restricted-update.gql

@@ -110,6 +110,8 @@ input OneHasManyEntityOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input RootOrderBy {

package/tests/cases/integration/graphQlSchema/schema-acl.gql

@@ -86,6 +86,8 @@ input TestOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 type TestConnection {

package/tests/cases/integration/graphQlSchema/schema-aliased-type.gql

@@ -82,6 +82,8 @@ input AuthorOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 type AuthorConnection {

package/tests/cases/integration/graphQlSchema/schema-basic.gql

@@ -182,6 +182,8 @@ input PostLocaleOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input PostOrderBy {

package/tests/cases/integration/graphQlSchema/schema-bug-66.gql

@@ -142,6 +142,8 @@ input VideoOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input FrontPageOrderBy {

package/tests/cases/integration/graphQlSchema/schema-custom-primary.gql

@@ -182,6 +182,8 @@ input PostLocaleOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input PostOrderBy {

package/tests/cases/integration/graphQlSchema/schema-has-many-reduction.gql

@@ -137,6 +137,8 @@ input PostLocaleOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input PostOrderBy {

package/tests/cases/integration/graphQlSchema/schema-new-builder.gql

@@ -232,6 +232,8 @@ input PostOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 input AuthorOrderBy {

package/tests/cases/integration/graphQlSchema/schema-view-entity.gql

@@ -84,6 +84,8 @@ input AuthorOrderBy {
 enum OrderDirection {
   asc
   desc
+  ascNullsFirst
+  descNullsLast
 }
 
 type AuthorConnection {

package/tests/cases/unit/uuidType.test.ts

@@ -0,0 +1,25 @@
+import { describe, it, expect } from 'vitest'
+import { CustomTypesProvider } from '../../../src'
+
+describe('uuid graphql type', () => {
+
+	const customTypesProvider = new CustomTypesProvider()
+	it('accepts valid uuid', () => {
+		const validUuid = 'e0818cf9-eee3-4452-9a13-031435218473'
+		expect(customTypesProvider.uuidType.parseValue(validUuid)).eq(validUuid)
+	})
+
+	it('accepts valid uuid without dashes', () => {
+		const validUuid = 'e0818cf9eee344529a13031435218473'
+		expect(customTypesProvider.uuidType.parseValue(validUuid)).eq(validUuid)
+	})
+
+	it('declines invalid uuid', () => {
+		const invalidUuid = '818cf9-eee3-4452-9a13-031435218473'
+		expect(customTypesProvider.uuidType.parseValue(invalidUuid)).eq(undefined)
+	})
+
+	it('declines not-string', () => {
+		expect(customTypesProvider.uuidType.parseValue(1)).eq(undefined)
+	})
+})

package/tests/src/test.ts

@@ -89,7 +89,7 @@ export const failedTransaction = (executes: SqlQuery[]): SqlQuery[] => {
 
 export const execute = async (test: Test) => {
 	const permissions: Acl.Permissions = test.permissions || new AllowAllPermissionFactory().create(test.schema)
-	const authorizator = new Authorizator(permissions)
+	const authorizator = new Authorizator(permissions, false)
 	const builder = new GraphQlSchemaBuilderFactory().create(test.schema, authorizator)
 	const graphQLSchema = builder.build()