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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.3.0-alpha.8",
+  "version": "1.3.0-beta.2",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -9,26 +9,25 @@
     "default": "./dist/src/index.js"
   },
   "scripts": {
-    "build-copy": "mkdir -p dist && find ./tests/ -name '*.gql' -type f -exec cp --parents {} ./dist \\;",
     "generate": "gql-gen --config graphql.codegen.yml",
-    "test": "vitest --no-threads"
+    "test": "vitest --dir ./tests/cases --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.3.0-alpha.8",
-    "@contember/dic": "^1.3.0-alpha.8",
-    "@contember/logger": "^1.3.0-alpha.8",
-    "@contember/graphql-utils": "^1.3.0-alpha.8",
-    "@contember/schema": "^1.3.0-alpha.8",
-    "@contember/schema-definition": "^1.3.0-alpha.8",
-    "@contember/schema-utils": "^1.3.0-alpha.8",
+    "@contember/database": "1.3.0-beta.2",
+    "@contember/dic": "1.3.0-beta.2",
+    "@contember/graphql-utils": "1.3.0-beta.2",
+    "@contember/logger": "1.3.0-beta.2",
+    "@contember/schema": "1.3.0-beta.2",
+    "@contember/schema-definition": "1.3.0-beta.2",
+    "@contember/schema-utils": "1.3.0-beta.2",
     "@graphql-tools/schema": "^8.3.5",
     "fast-deep-equal": "^3.1.3",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.3.0-alpha.8",
-    "@contember/engine-api-tester": "^1.3.0-alpha.8",
-    "@contember/schema-definition": "^1.3.0-alpha.8",
+    "@contember/database-tester": "1.3.0-beta.2",
+    "@contember/engine-api-tester": "1.3.0-beta.2",
+    "@contember/schema-definition": "1.3.0-beta.2",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",
@@ -41,4 +40,4 @@
     "graphql": ">= 14.6.0",
     "pg": "^8.9.0"
   }
-}
+}

package/src/mapper/delete/DeleteExecutor.ts

@@ -169,6 +169,10 @@ export class DeleteExecutor {
 		}
 		const owningRelations = findOwningRelations(this.schema, entity)
 		for (const [owningEntity, relation] of owningRelations) {
+			if (owningEntity.view) {
+				continue
+			}
+
 			if (relation.joiningColumn.onDelete === Model.OnDelete.restrict) {
 				await this.collectRestrictResult(state, mapper, owningEntity, relation, values)
 			} else if (relation.joiningColumn.onDelete === Model.OnDelete.cascade) {

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

@@ -1,6 +1,6 @@
 import { test } from 'vitest'
 import { execute, failedTransaction, sqlTransaction } from '../../../../src/test'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { createSchema, SchemaBuilder, SchemaDefinition as def } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
@@ -100,3 +100,56 @@ test('delete author with restrict on posts - declined', async () => {
 	})
 })
 
+
+namespace DeleteModelView {
+	export class Author {
+		name = def.stringColumn()
+		stats = def.oneHasOneInverse(AuthorStats, 'author')
+	}
+
+	@def.View('SELECT 1') // not important here
+	export class AuthorStats {
+		author = def.oneHasOne(Author, 'stats')
+		postCount = def.intColumn().notNull()
+	}
+}
+
+test('delete author with restrict on a view - should be ignored', async () => {
+	const schema = createSchema(DeleteModelView)
+	await execute({
+		schema: schema.model,
+		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`delete from "public"."author" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { },
+				},
+			]),
+		],
+		return: {
+			data: {
+				deleteAuthor: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+

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

@@ -1,420 +0,0 @@
-type Query {
-  getOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
-  listOneHasManyEntity(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
-  paginateOneHasManyEntity(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
-  validateCreateOneHasManyEntity(data: OneHasManyEntityCreateInput!): _ValidationResult!
-  validateUpdateOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, data: OneHasManyEntityUpdateInput!): _ValidationResult!
-  getRoot(by: RootUniqueWhere!, filter: RootWhere): Root
-  listRoot(filter: RootWhere, orderBy: [RootOrderBy!], offset: Int, limit: Int): [Root!]!
-  paginateRoot(filter: RootWhere, orderBy: [RootOrderBy!], skip: Int, first: Int): RootConnection!
-  validateCreateRoot(data: RootCreateInput!): _ValidationResult!
-  validateUpdateRoot(by: RootUniqueWhere!, data: RootUpdateInput!): _ValidationResult!
-  transaction: QueryTransaction
-  _info: Info
-}
-
-type OneHasManyEntity {
-  _meta: OneHasManyEntityMeta
-  id: UUID!
-  a: String
-  r2(filter: RootWhere): Root
-}
-
-type OneHasManyEntityMeta {
-  id: FieldMeta
-  a: FieldMeta
-  r2: FieldMeta
-}
-
-type FieldMeta {
-  readable: Boolean
-  updatable: Boolean
-}
-
-scalar UUID
-
-type Root {
-  _meta: RootMeta
-  id: UUID!
-  foo: String
-  r(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
-  paginateR(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
-}
-
-type RootMeta {
-  id: FieldMeta
-  foo: FieldMeta
-  r: FieldMeta
-}
-
-input OneHasManyEntityWhere {
-  id: UUIDCondition
-  a: StringCondition
-  r2: RootWhere
-  and: [OneHasManyEntityWhere]
-  or: [OneHasManyEntityWhere]
-  not: OneHasManyEntityWhere
-}
-
-input UUIDCondition {
-  and: [UUIDCondition!]
-  or: [UUIDCondition!]
-  not: UUIDCondition
-  null: Boolean
-  isNull: Boolean
-  eq: UUID
-  notEq: UUID
-  in: [UUID!]
-  notIn: [UUID!]
-  lt: UUID
-  lte: UUID
-  gt: UUID
-  gte: UUID
-}
-
-input StringCondition {
-  and: [StringCondition!]
-  or: [StringCondition!]
-  not: StringCondition
-  null: Boolean
-  isNull: Boolean
-  eq: String
-  notEq: String
-  in: [String!]
-  notIn: [String!]
-  lt: String
-  lte: String
-  gt: String
-  gte: String
-  contains: String
-  startsWith: String
-  endsWith: String
-  containsCI: String
-  startsWithCI: String
-  endsWithCI: String
-}
-
-input RootWhere {
-  id: UUIDCondition
-  foo: StringCondition
-  r: OneHasManyEntityWhere
-  and: [RootWhere]
-  or: [RootWhere]
-  not: RootWhere
-}
-
-input OneHasManyEntityOrderBy {
-  _random: Boolean
-  _randomSeeded: Int
-  id: OrderDirection
-  a: OrderDirection
-  r2: RootOrderBy
-}
-
-enum OrderDirection {
-  asc
-  desc
-  ascNullsFirst
-  descNullsLast
-}
-
-input RootOrderBy {
-  _random: Boolean
-  _randomSeeded: Int
-  id: OrderDirection
-  foo: OrderDirection
-}
-
-type OneHasManyEntityConnection {
-  pageInfo: PageInfo!
-  edges: [OneHasManyEntityEdge!]!
-}
-
-type PageInfo {
-  totalCount: Int!
-}
-
-type OneHasManyEntityEdge {
-  node: OneHasManyEntity!
-}
-
-input OneHasManyEntityUniqueWhere {
-  id: UUID
-}
-
-type _ValidationResult {
-  valid: Boolean!
-  errors: [_ValidationError!]!
-}
-
-type _ValidationError {
-  path: [_PathFragment!]!
-  message: _ValidationMessage!
-}
-
-union _PathFragment = _FieldPathFragment | _IndexPathFragment
-
-type _FieldPathFragment {
-  field: String!
-}
-
-type _IndexPathFragment {
-  index: Int!
-  alias: String
-}
-
-type _ValidationMessage {
-  text: String!
-}
-
-input OneHasManyEntityCreateInput {
-  a: String
-  r2: OneHasManyEntityCreateR2EntityRelationInput
-  _dummy_field_: Boolean
-}
-
-input OneHasManyEntityCreateR2EntityRelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
-  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
-}
-
-input RootUniqueWhere {
-  id: UUID
-  r: OneHasManyEntityUniqueWhere
-}
-
-input RootWithoutRCreateInput {
-  foo: String
-  _dummy_field_: Boolean
-}
-
-input OneHasManyEntityConnectOrCreateR2RelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
-}
-
-input OneHasManyEntityUpdateInput {
-  a: String
-  r2: OneHasManyEntityUpdateR2EntityRelationInput
-  _dummy_field_: Boolean
-}
-
-input OneHasManyEntityUpdateR2EntityRelationInput {
-  connect: RootUniqueWhere
-  create: RootWithoutRCreateInput
-  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
-  update: RootWithoutRUpdateInput
-  upsert: OneHasManyEntityUpsertR2RelationInput
-  disconnect: Boolean
-  delete: Boolean
-}
-
-input RootWithoutRUpdateInput {
-  foo: String
-  _dummy_field_: Boolean
-}
-
-input OneHasManyEntityUpsertR2RelationInput {
-  update: RootWithoutRUpdateInput
-  create: RootWithoutRCreateInput
-}
-
-type RootConnection {
-  pageInfo: PageInfo!
-  edges: [RootEdge!]!
-}
-
-type RootEdge {
-  node: Root!
-}
-
-input RootCreateInput {
-  foo: String
-  r: [RootCreateREntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input RootCreateREntityRelationInput {
-  connect: OneHasManyEntityUniqueWhere
-  create: OneHasManyEntityWithoutR2CreateInput
-  connectOrCreate: RootConnectOrCreateRRelationInput
-  alias: String
-}
-
-input OneHasManyEntityWithoutR2CreateInput {
-  a: String
-  _dummy_field_: Boolean
-}
-
-input RootConnectOrCreateRRelationInput {
-  connect: OneHasManyEntityUniqueWhere
-  create: OneHasManyEntityWithoutR2CreateInput
-}
-
-input RootUpdateInput {
-  foo: String
-  r: [RootUpdateREntityRelationInput!]
-  _dummy_field_: Boolean
-}
-
-input RootUpdateREntityRelationInput {
-  create: OneHasManyEntityWithoutR2CreateInput
-  update: RootUpdateRRelationInput
-  upsert: RootUpsertRRelationInput
-  connect: OneHasManyEntityUniqueWhere
-  disconnect: OneHasManyEntityUniqueWhere
-  delete: OneHasManyEntityUniqueWhere
-  alias: String
-}
-
-input RootUpdateRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  data: OneHasManyEntityWithoutR2UpdateInput
-}
-
-input OneHasManyEntityWithoutR2UpdateInput {
-  a: String
-  _dummy_field_: Boolean
-}
-
-input RootUpsertRRelationInput {
-  by: OneHasManyEntityUniqueWhere
-  update: OneHasManyEntityWithoutR2UpdateInput
-  create: OneHasManyEntityWithoutR2CreateInput
-}
-
-type QueryTransaction {
-  getOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntity
-  listOneHasManyEntity(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], offset: Int, limit: Int): [OneHasManyEntity!]!
-  paginateOneHasManyEntity(filter: OneHasManyEntityWhere, orderBy: [OneHasManyEntityOrderBy!], skip: Int, first: Int): OneHasManyEntityConnection!
-  validateCreateOneHasManyEntity(data: OneHasManyEntityCreateInput!): _ValidationResult!
-  validateUpdateOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, data: OneHasManyEntityUpdateInput!): _ValidationResult!
-  getRoot(by: RootUniqueWhere!, filter: RootWhere): Root
-  listRoot(filter: RootWhere, orderBy: [RootOrderBy!], offset: Int, limit: Int): [Root!]!
-  paginateRoot(filter: RootWhere, orderBy: [RootOrderBy!], skip: Int, first: Int): RootConnection!
-  validateCreateRoot(data: RootCreateInput!): _ValidationResult!
-  validateUpdateRoot(by: RootUniqueWhere!, data: RootUpdateInput!): _ValidationResult!
-}
-
-type Info {
-  description: String
-}
-
-type Mutation {
-  createOneHasManyEntity(data: OneHasManyEntityCreateInput!): OneHasManyEntityCreateResult!
-  deleteOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntityDeleteResult!
-  updateOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere, data: OneHasManyEntityUpdateInput!): OneHasManyEntityUpdateResult!
-  upsertOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere, update: OneHasManyEntityUpdateInput!, create: OneHasManyEntityCreateInput!): OneHasManyEntityUpsertResult!
-  createRoot(data: RootCreateInput!): RootCreateResult!
-  deleteRoot(by: RootUniqueWhere!, filter: RootWhere): RootDeleteResult!
-  updateRoot(by: RootUniqueWhere!, filter: RootWhere, data: RootUpdateInput!): RootUpdateResult!
-  upsertRoot(by: RootUniqueWhere!, filter: RootWhere, update: RootUpdateInput!, create: RootCreateInput!): RootUpsertResult!
-  transaction(options: MutationTransactionOptions): MutationTransaction!
-  query: Query!
-}
-
-type OneHasManyEntityCreateResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: OneHasManyEntity
-  validation: _ValidationResult!
-}
-
-interface MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-}
-
-type _MutationError {
-  path: [_PathFragment!]! @deprecated(reason: "Use `paths`.")
-  paths: [[_PathFragment!]!]!
-  type: _MutationErrorType!
-  message: String
-}
-
-enum _MutationErrorType {
-  NotNullConstraintViolation
-  UniqueConstraintViolation
-  ForeignKeyConstraintViolation
-  NotFoundOrDenied
-  NonUniqueWhereInput
-  InvalidDataInput
-  SqlError
-}
-
-type OneHasManyEntityDeleteResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: OneHasManyEntity
-}
-
-type OneHasManyEntityUpdateResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: OneHasManyEntity
-  validation: _ValidationResult!
-}
-
-type OneHasManyEntityUpsertResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: OneHasManyEntity
-  validation: _ValidationResult!
-}
-
-type RootCreateResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: Root
-  validation: _ValidationResult!
-}
-
-type RootDeleteResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: Root
-}
-
-type RootUpdateResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: Root
-  validation: _ValidationResult!
-}
-
-type RootUpsertResult implements MutationResult {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  node: Root
-  validation: _ValidationResult!
-}
-
-type MutationTransaction {
-  ok: Boolean!
-  errorMessage: String
-  errors: [_MutationError!]!
-  validation: _ValidationResult!
-  createOneHasManyEntity(data: OneHasManyEntityCreateInput!): OneHasManyEntityCreateResult!
-  deleteOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere): OneHasManyEntityDeleteResult!
-  updateOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere, data: OneHasManyEntityUpdateInput!): OneHasManyEntityUpdateResult!
-  upsertOneHasManyEntity(by: OneHasManyEntityUniqueWhere!, filter: OneHasManyEntityWhere, update: OneHasManyEntityUpdateInput!, create: OneHasManyEntityCreateInput!): OneHasManyEntityUpsertResult!
-  createRoot(data: RootCreateInput!): RootCreateResult!
-  deleteRoot(by: RootUniqueWhere!, filter: RootWhere): RootDeleteResult!
-  updateRoot(by: RootUniqueWhere!, filter: RootWhere, data: RootUpdateInput!): RootUpdateResult!
-  upsertRoot(by: RootUniqueWhere!, filter: RootWhere, update: RootUpdateInput!, create: RootCreateInput!): RootUpsertResult!
-  query: Query
-}
-
-input MutationTransactionOptions {
-  deferForeignKeyConstraints: Boolean
-}