@contember/engine-content-api 1.2.0-rc.3 → 1.3.0-alpha.1

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

@@ -2,7 +2,7 @@ import { test } from 'vitest'
 import { execute, sqlTransaction } from '../../../../../src/test'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
-import { siteSettingSchema } from './schema'
+import { siteSettingSchema, siteSettingSchemaWithOrphanRemoval } from './schema'
 
 test('create', async () => {
 	await execute({
@@ -67,3 +67,83 @@ test('create', async () => {
 	})
 })
 
+test('create - orphan removal', async () => {
+	const siteId = testUuid(2)
+	const currentSettingId = testUuid(3)
+	await execute({
+		schema: siteSettingSchemaWithOrphanRemoval,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${siteId}"},
+            data: {setting: {create: {url: "http://mangoweb.cz"}}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [siteId],
+					response: { rows: [{ id: siteId }] },
+				},
+				// get current inverse side
+				{
+					sql: 'select "root_"."setting_id"  from "public"."site" as "root_"   where "root_"."id" = ?',
+					parameters: [siteId],
+					response: { rows: [{ setting_id: currentSettingId }] },
+				},
+				{
+					sql: SQL`with "root_" as
+							(select ? :: uuid as "id", ? :: text as "url")
+							insert into "public"."site_setting" ("id", "url")
+							select "root_"."id", "root_"."url"
+              from "root_"
+							returning "id"`,
+					parameters: [testUuid(1), 'http://mangoweb.cz'],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`with "newData_" as
+              (select
+                 ? :: uuid as "setting_id",
+                 "root_"."id",
+                 "root_"."name"
+               from "public"."site" as "root_"
+               where "root_"."id" = ?) update "public"."site"
+              set "setting_id" = "newData_"."setting_id" from "newData_"
+              where "site"."id" = "newData_"."id"`,
+					parameters: [testUuid(1), siteId],
+					response: { rowCount: 1 },
+				},
+				{
+					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',
+					parameters: [currentSettingId],
+					response: { rows: [{ id: currentSettingId }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?',
+					parameters: [currentSettingId],
+					response: { rows: [{ id: currentSettingId, allowed: true }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "setting_id" in (?)',
+					parameters: [currentSettingId],
+					response: { rows: [] },
+				},
+				{
+					sql: 'DELETE FROM "public"."site_setting" WHERE "id" IN (?)',
+					parameters: [currentSettingId],
+					response: { rowCount: 1 },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: true,
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/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 { siteSettingSchema } from './schema'
@@ -31,31 +31,21 @@ test('delete', async () => {
 						rows: [{ setting_id: testUuid(1) }],
 					},
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."site_setting"
-              where "id" in (select "root_"."id"
-                             from "public"."site_setting" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-					{
-						sql: SQL`
-								with "newdata_" as
-								(select ? :: uuid as "setting_id", "root_"."id", "root_"."name"
-									from "public"."site" as "root_"
-									where "root_"."setting_id" in (?))
-								update "public"."site"
-								set "setting_id" = "newdata_"."setting_id" from "newdata_"
-								where "site"."id" = "newdata_"."id"`,
-						parameters: [null, testUuid(1)],
-						response: {
-							rowCount: 1,
-						},
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "setting_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."site_setting" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 			]),
 		],
 		return: {
@@ -68,3 +58,56 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete denied', async () => {
+	await execute({
+		schema: siteSettingSchema,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${testUuid(2)}"},
+            data: {setting: {delete: true}}
+          ) {
+          ok
+          errorMessage
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."setting_id"
+                       from "public"."site" as "root_"
+                       where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ setting_id: testUuid(1) }],
+					},
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "setting_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: false,
+					errorMessage: 'Execution has failed:\n'
+					+ 'setting: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000001 row(s) of entity SiteSetting, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Site in relation setting. OnDelete behaviour of this relation is set to "set null". This is possibly caused by ACL denial.)',
+				},
+			},
+		},
+	})
+})
+

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/schema.ts

@@ -8,8 +8,21 @@ export const siteSettingSchema = new SchemaBuilder()
 			.oneHasOne('setting', r =>
 				r
 					.inversedBy('site')
-					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String).unique()))
 					.onDelete(Model.OnDelete.setNull),
 			),
 	)
 	.buildSchema()
+
+export const siteSettingSchemaWithOrphanRemoval = new SchemaBuilder()
+	.entity('Site', entity =>
+		entity
+			.column('name', c => c.type(Model.ColumnType.String))
+			.oneHasOne('setting', r =>
+				r
+					.inversedBy('site')
+					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+					.removeOrphan(),
+			),
+	)
+	.buildSchema()

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

@@ -176,6 +176,7 @@ input OneHasManyEntityCreateInput {
 input OneHasManyEntityCreateR2EntityRelationInput {
   connect: RootUniqueWhere
   create: RootWithoutRCreateInput
+  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
 }
 
 input RootUniqueWhere {
@@ -188,6 +189,11 @@ input RootWithoutRCreateInput {
   _dummy_field_: Boolean
 }
 
+input OneHasManyEntityConnectOrCreateR2RelationInput {
+  connect: RootUniqueWhere
+  create: RootWithoutRCreateInput
+}
+
 input OneHasManyEntityUpdateInput {
   a: String
   r2: OneHasManyEntityUpdateR2EntityRelationInput
@@ -195,10 +201,11 @@ input OneHasManyEntityUpdateInput {
 }
 
 input OneHasManyEntityUpdateR2EntityRelationInput {
+  connect: RootUniqueWhere
   create: RootWithoutRCreateInput
+  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
   update: RootWithoutRUpdateInput
   upsert: OneHasManyEntityUpsertR2RelationInput
-  connect: RootUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }
@@ -231,6 +238,7 @@ input RootCreateInput {
 input RootCreateREntityRelationInput {
   connect: OneHasManyEntityUniqueWhere
   create: OneHasManyEntityWithoutR2CreateInput
+  connectOrCreate: RootConnectOrCreateRRelationInput
   alias: String
 }
 
@@ -239,6 +247,11 @@ input OneHasManyEntityWithoutR2CreateInput {
   _dummy_field_: Boolean
 }
 
+input RootConnectOrCreateRRelationInput {
+  connect: OneHasManyEntityUniqueWhere
+  create: OneHasManyEntityWithoutR2CreateInput
+}
+
 input RootUpdateInput {
   foo: String
   r: [RootUpdateREntityRelationInput!]

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

@@ -168,21 +168,21 @@ input OneHasManyEntityUpdateInput {
 }
 
 input OneHasManyEntityUpdateR2EntityRelationInput {
-  update: RootWithoutRUpdateInput
   connect: RootUniqueWhere
+  update: RootWithoutRUpdateInput
   disconnect: Boolean
   delete: Boolean
 }
 
-input RootWithoutRUpdateInput {
-  _dummy_field_: Boolean
-}
-
 input RootUniqueWhere {
   id: UUID
   r: OneHasManyEntityUniqueWhere
 }
 
+input RootWithoutRUpdateInput {
+  _dummy_field_: Boolean
+}
+
 type RootConnection {
   pageInfo: PageInfo!
   edges: [RootEdge!]!

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

@@ -172,6 +172,7 @@ input OneHasManyEntityCreateInput {
 input OneHasManyEntityCreateR2EntityRelationInput {
   connect: RootUniqueWhere
   create: RootWithoutRCreateInput
+  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
 }
 
 input RootUniqueWhere {
@@ -183,6 +184,11 @@ input RootWithoutRCreateInput {
   _dummy_field_: Boolean
 }
 
+input OneHasManyEntityConnectOrCreateR2RelationInput {
+  connect: RootUniqueWhere
+  create: RootWithoutRCreateInput
+}
+
 input OneHasManyEntityUpdateInput {
   a: String
   r2: OneHasManyEntityUpdateR2EntityRelationInput
@@ -190,10 +196,11 @@ input OneHasManyEntityUpdateInput {
 }
 
 input OneHasManyEntityUpdateR2EntityRelationInput {
+  connect: RootUniqueWhere
   create: RootWithoutRCreateInput
+  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
   update: RootWithoutRUpdateInput
   upsert: OneHasManyEntityUpsertR2RelationInput
-  connect: RootUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }
@@ -224,6 +231,7 @@ input RootCreateInput {
 input RootCreateREntityRelationInput {
   connect: OneHasManyEntityUniqueWhere
   create: OneHasManyEntityWithoutR2CreateInput
+  connectOrCreate: RootConnectOrCreateRRelationInput
   alias: String
 }
 
@@ -232,6 +240,11 @@ input OneHasManyEntityWithoutR2CreateInput {
   _dummy_field_: Boolean
 }
 
+input RootConnectOrCreateRRelationInput {
+  connect: OneHasManyEntityUniqueWhere
+  create: OneHasManyEntityWithoutR2CreateInput
+}
+
 input RootUpdateInput {
   r: [RootUpdateREntityRelationInput!]
   _dummy_field_: Boolean

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

@@ -171,6 +171,7 @@ input OneHasManyEntityCreateInput {
 input OneHasManyEntityCreateR2EntityRelationInput {
   connect: RootUniqueWhere
   create: RootWithoutRCreateInput
+  connectOrCreate: OneHasManyEntityConnectOrCreateR2RelationInput
 }
 
 input RootUniqueWhere {
@@ -182,6 +183,11 @@ input RootWithoutRCreateInput {
   _dummy_field_: Boolean
 }
 
+input OneHasManyEntityConnectOrCreateR2RelationInput {
+  connect: RootUniqueWhere
+  create: RootWithoutRCreateInput
+}
+
 type RootConnection {
   pageInfo: PageInfo!
   edges: [RootEdge!]!
@@ -199,6 +205,7 @@ input RootCreateInput {
 input RootCreateREntityRelationInput {
   connect: OneHasManyEntityUniqueWhere
   create: OneHasManyEntityWithoutR2CreateInput
+  connectOrCreate: RootConnectOrCreateRRelationInput
   alias: String
 }
 
@@ -207,6 +214,11 @@ input OneHasManyEntityWithoutR2CreateInput {
   _dummy_field_: Boolean
 }
 
+input RootConnectOrCreateRRelationInput {
+  connect: OneHasManyEntityUniqueWhere
+  create: OneHasManyEntityWithoutR2CreateInput
+}
+
 input RootUpdateInput {
   _dummy_field_: Boolean
 }

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

@@ -314,6 +314,7 @@ input AuthorCreateInput {
 input AuthorCreatePostsEntityRelationInput {
   connect: PostUniqueWhere
   create: PostWithoutAuthorCreateInput
+  connectOrCreate: AuthorConnectOrCreatePostsRelationInput
   alias: String
 }
 
@@ -327,6 +328,7 @@ input PostWithoutAuthorCreateInput {
 input PostCreateLocalesEntityRelationInput {
   connect: PostLocaleUniqueWhere
   create: PostLocaleWithoutPostCreateInput
+  connectOrCreate: PostConnectOrCreateLocalesRelationInput
   alias: String
 }
 
@@ -335,9 +337,15 @@ input PostLocaleWithoutPostCreateInput {
   _dummy_field_: Boolean
 }
 
+input PostConnectOrCreateLocalesRelationInput {
+  connect: PostLocaleUniqueWhere
+  create: PostLocaleWithoutPostCreateInput
+}
+
 input PostCreateCategoriesEntityRelationInput {
   connect: CategoryUniqueWhere
   create: CategoryWithoutPostsCreateInput
+  connectOrCreate: PostConnectOrCreateCategoriesRelationInput
   alias: String
 }
 
@@ -350,6 +358,16 @@ input CategoryWithoutPostsCreateInput {
   _dummy_field_: Boolean
 }
 
+input PostConnectOrCreateCategoriesRelationInput {
+  connect: CategoryUniqueWhere
+  create: CategoryWithoutPostsCreateInput
+}
+
+input AuthorConnectOrCreatePostsRelationInput {
+  connect: PostUniqueWhere
+  create: PostWithoutAuthorCreateInput
+}
+
 input AuthorUpdateInput {
   name: String
   posts: [AuthorUpdatePostsEntityRelationInput!]
@@ -445,6 +463,7 @@ input CategoryCreateInput {
 input CategoryCreatePostsEntityRelationInput {
   connect: PostUniqueWhere
   create: PostWithoutCategoriesCreateInput
+  connectOrCreate: CategoryConnectOrCreatePostsRelationInput
   alias: String
 }
 
@@ -458,6 +477,7 @@ input PostWithoutCategoriesCreateInput {
 input PostCreateAuthorEntityRelationInput {
   connect: AuthorUniqueWhere
   create: AuthorWithoutPostsCreateInput
+  connectOrCreate: PostConnectOrCreateAuthorRelationInput
 }
 
 input AuthorWithoutPostsCreateInput {
@@ -465,6 +485,16 @@ input AuthorWithoutPostsCreateInput {
   _dummy_field_: Boolean
 }
 
+input PostConnectOrCreateAuthorRelationInput {
+  connect: AuthorUniqueWhere
+  create: AuthorWithoutPostsCreateInput
+}
+
+input CategoryConnectOrCreatePostsRelationInput {
+  connect: PostUniqueWhere
+  create: PostWithoutCategoriesCreateInput
+}
+
 input CategoryUpdateInput {
   name: String
   posts: [CategoryUpdatePostsEntityRelationInput!]
@@ -494,10 +524,11 @@ input PostWithoutCategoriesUpdateInput {
 }
 
 input PostUpdateAuthorEntityRelationInput {
+  connect: AuthorUniqueWhere
   create: AuthorWithoutPostsCreateInput
+  connectOrCreate: PostConnectOrCreateAuthorRelationInput
   update: AuthorWithoutPostsUpdateInput
   upsert: PostUpsertAuthorRelationInput
-  connect: AuthorUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }
@@ -527,6 +558,7 @@ input PostLocaleCreateInput {
 input PostLocaleCreatePostEntityRelationInput {
   connect: PostUniqueWhere
   create: PostWithoutLocalesCreateInput
+  connectOrCreate: PostLocaleConnectOrCreatePostRelationInput
 }
 
 input PostWithoutLocalesCreateInput {
@@ -536,6 +568,11 @@ input PostWithoutLocalesCreateInput {
   _dummy_field_: Boolean
 }
 
+input PostLocaleConnectOrCreatePostRelationInput {
+  connect: PostUniqueWhere
+  create: PostWithoutLocalesCreateInput
+}
+
 input PostLocaleUpdateInput {
   title: String
   Post: PostLocaleUpdatePostEntityRelationInput
@@ -543,10 +580,11 @@ input PostLocaleUpdateInput {
 }
 
 input PostLocaleUpdatePostEntityRelationInput {
+  connect: PostUniqueWhere
   create: PostWithoutLocalesCreateInput
+  connectOrCreate: PostLocaleConnectOrCreatePostRelationInput
   update: PostWithoutLocalesUpdateInput
   upsert: PostLocaleUpsertPostRelationInput
-  connect: PostUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }

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

@@ -218,6 +218,7 @@ input VideoCreateInput {
 input VideoCreateFrontPageForIntroEntityRelationInput {
   connect: FrontPageUniqueWhere
   create: FrontPageWithoutIntroVideoCreateInput
+  connectOrCreate: VideoConnectOrCreateFrontPageForIntroRelationInput
 }
 
 input FrontPageWithoutIntroVideoCreateInput {
@@ -229,6 +230,7 @@ input FrontPageWithoutIntroVideoCreateInput {
 input FrontPageCreateInHouseVideosEntityRelationInput {
   connect: VideoUniqueWhere
   create: VideoWithoutFrontPageCreateInput
+  connectOrCreate: FrontPageConnectOrCreateInHouseVideosRelationInput
   alias: String
 }
 
@@ -238,9 +240,20 @@ input VideoWithoutFrontPageCreateInput {
   _dummy_field_: Boolean
 }
 
+input FrontPageConnectOrCreateInHouseVideosRelationInput {
+  connect: VideoUniqueWhere
+  create: VideoWithoutFrontPageCreateInput
+}
+
+input VideoConnectOrCreateFrontPageForIntroRelationInput {
+  connect: FrontPageUniqueWhere
+  create: FrontPageWithoutIntroVideoCreateInput
+}
+
 input VideoCreateFrontPageEntityRelationInput {
   connect: FrontPageUniqueWhere
   create: FrontPageWithoutInHouseVideosCreateInput
+  connectOrCreate: VideoConnectOrCreateFrontPageRelationInput
 }
 
 input FrontPageWithoutInHouseVideosCreateInput {
@@ -252,6 +265,7 @@ input FrontPageWithoutInHouseVideosCreateInput {
 input FrontPageCreateIntroVideoEntityRelationInput {
   connect: VideoUniqueWhere
   create: VideoWithoutFrontPageForIntroCreateInput
+  connectOrCreate: FrontPageConnectOrCreateIntroVideoRelationInput
 }
 
 input VideoWithoutFrontPageForIntroCreateInput {
@@ -260,6 +274,16 @@ input VideoWithoutFrontPageForIntroCreateInput {
   _dummy_field_: Boolean
 }
 
+input FrontPageConnectOrCreateIntroVideoRelationInput {
+  connect: VideoUniqueWhere
+  create: VideoWithoutFrontPageForIntroCreateInput
+}
+
+input VideoConnectOrCreateFrontPageRelationInput {
+  connect: FrontPageUniqueWhere
+  create: FrontPageWithoutInHouseVideosCreateInput
+}
+
 input VideoUpdateInput {
   vimeoId: String
   frontPageForIntro: VideoUpdateFrontPageForIntroEntityRelationInput
@@ -268,10 +292,11 @@ input VideoUpdateInput {
 }
 
 input VideoUpdateFrontPageForIntroEntityRelationInput {
+  connect: FrontPageUniqueWhere
   create: FrontPageWithoutIntroVideoCreateInput
+  connectOrCreate: VideoConnectOrCreateFrontPageForIntroRelationInput
   update: FrontPageWithoutIntroVideoUpdateInput
   upsert: VideoUpsertFrontPageForIntroRelationInput
-  connect: FrontPageUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }
@@ -315,10 +340,11 @@ input VideoUpsertFrontPageForIntroRelationInput {
 }
 
 input VideoUpdateFrontPageEntityRelationInput {
+  connect: FrontPageUniqueWhere
   create: FrontPageWithoutInHouseVideosCreateInput
+  connectOrCreate: VideoConnectOrCreateFrontPageRelationInput
   update: FrontPageWithoutInHouseVideosUpdateInput
   upsert: VideoUpsertFrontPageRelationInput
-  connect: FrontPageUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }
@@ -330,10 +356,11 @@ input FrontPageWithoutInHouseVideosUpdateInput {
 }
 
 input FrontPageUpdateIntroVideoEntityRelationInput {
+  connect: VideoUniqueWhere
   create: VideoWithoutFrontPageForIntroCreateInput
+  connectOrCreate: FrontPageConnectOrCreateIntroVideoRelationInput
   update: VideoWithoutFrontPageForIntroUpdateInput
   upsert: FrontPageUpsertIntroVideoRelationInput
-  connect: VideoUniqueWhere
   disconnect: Boolean
   delete: Boolean
 }