@contember/engine-content-api 2.0.0-beta.1 → 2.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,18 +26,18 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.0.0-beta.1",
-    "@contember/dic": "2.0.0-beta.1",
-    "@contember/graphql-utils": "2.0.0-beta.1",
-    "@contember/logger": "2.0.0-beta.1",
-    "@contember/schema": "2.0.0-beta.1",
-    "@contember/schema-definition": "2.0.0-beta.1",
-    "@contember/schema-utils": "2.0.0-beta.1",
+    "@contember/database": "2.0.0-beta.2",
+    "@contember/dic": "2.0.0-beta.2",
+    "@contember/graphql-utils": "2.0.0-beta.2",
+    "@contember/logger": "2.0.0-beta.2",
+    "@contember/schema": "2.0.0-beta.2",
+    "@contember/schema-definition": "2.0.0-beta.2",
+    "@contember/schema-utils": "2.0.0-beta.2",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-beta.1",
-    "@contember/schema-definition": "2.0.0-beta.1",
+    "@contember/database-tester": "2.0.0-beta.2",
+    "@contember/schema-definition": "2.0.0-beta.2",
     "@types/node": "^20.16.11",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

package/src/mapper/Mapper.ts

@@ -60,7 +60,8 @@ export class Mapper<ConnectionType extends Connection.ConnectionLike = Connectio
 			.from(entity.tableName, 'root_')
 			.select(['root_', columnName])
 		const expandedWhere = this.uniqueWhereExpander.expand(entity, where)
-		const builtQb = this.whereBuilder.build(qb, entity, this.pathFactory.create([]), expandedWhere)
+		const withPredicates = this.predicatesInjector.inject(entity, expandedWhere)
+		const builtQb = this.whereBuilder.build(qb, entity, this.pathFactory.create([]), withPredicates)
 		const result = await builtQb.getResult(this.db)
 
 		return result[0] !== undefined ? result[0][columnName] : undefined

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

@@ -1,6 +1,6 @@
 import { test } from 'bun:test'
 import { execute, failedTransaction, sqlTransaction } from '../../../../../src/test'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { c, createSchema, SchemaBuilder } from '@contember/schema-definition'
 import {  Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
@@ -255,3 +255,70 @@ test('update m:n', async () => {
 	})
 })
 
+
+
+namespace ConnectWithAclOnRead {
+	export const editor = c.createRole('editor')
+
+	@c.Allow(editor, {
+		read: ['id'],
+		update: ['id', 'category'],
+	})
+	export class Article {
+		category = c.manyHasOne(Category)
+	}
+
+	@c.Allow(editor, {
+		when: { isPublic: { eq: true } },
+		read: ['id', 'slug'],
+	})
+	export class Category {
+		isPublic = c.boolColumn().notNull()
+		slug = c.stringColumn().notNull().unique()
+	}
+
+}
+
+test('connect category', async () => {
+	const schema = createSchema(ConnectWithAclOnRead)
+
+	await execute({
+		schema: schema.model,
+		query: GQL`mutation {
+        updateArticle(
+            by: {id: "${testUuid(1)}"},
+            data: {category: {connect: {slug: "abcd"}}}
+          ) {
+          ok
+        }
+      }`,
+		permissions: schema.acl.roles.editor.entities,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."article" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id"  from "public"."category" as "root_"  where "root_"."slug" = ? and "root_"."is_public" = ?`,
+					parameters: ['abcd', true],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`with "newData_" as (select ? :: uuid as "category_id", "root_"."category_id" as "category_id_old__", "root_"."id" from "public"."article" as "root_"  where "root_"."id" = ?) 
+update "public"."article" set  "category_id" =  "newData_"."category_id" from "newData_"  where "article"."id" = "newData_"."id"  returning "category_id_old__"`,
+					parameters: [testUuid(2), testUuid(1)],
+					response: { rows: [{ category_id_old__: null }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateArticle: {
+					ok: true,
+				},
+			},
+		},
+	})
+})