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

package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/connect.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('connect - same owner', async () => {
 	await execute({
@@ -84,17 +84,10 @@ test('connect - no owner', async () => {
 					},
 				},
 				{
-					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"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
 					parameters: [testUuid(2), testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -107,6 +100,7 @@ test('connect - no owner', async () => {
 		},
 	})
 })
+
 test('connect - different owner', async () => {
 	await execute({
 		schema: siteSettingSchema,
@@ -142,30 +136,16 @@ test('connect - different owner', async () => {
 					},
 				},
 				{
-					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"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
 					parameters: [null, testUuid(3)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 				{
-					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"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
 					parameters: [testUuid(2), testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -179,3 +159,93 @@ test('connect - different owner', async () => {
 	})
 })
 
+test('connect - different owner & orphan removal enabled', async () => {
+	await execute({
+		schema: siteSettingSchemaWithOrphanRemoval,
+		query: GQL`mutation {
+        updateSiteSetting(
+            by: {id: "${testUuid(2)}"},
+            data: {site: {connect: {id: "${testUuid(1)}"}}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				// inverse side
+				{
+					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				// new owner
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: {
+						rows: [{ id: testUuid(1) }],
+					},
+				},
+				// current owner
+				{
+					sql: SQL`select "root_"."id"
+                       from "public"."site" as "root_"
+                       where "root_"."setting_id" = ?`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ id: testUuid(3) }],
+					},
+				},
+				// set current owner to null
+				{
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
+					parameters: [null, testUuid(3)],
+					response: { rows: [{}] },
+				},
+				// current inverse of new owner
+				{
+					sql: 'select "root_"."setting_id"  from "public"."site" as "root_"   where "root_"."id" = ?',
+					parameters: [testUuid(1)],
+					response: { rows: [{ setting_id: testUuid(4) }] },
+				},
+				// update inverse of new owner
+				{
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
+					parameters: [testUuid(2), testUuid(1)],
+					response: { rows: [{}] },
+				},
+				{
+					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',
+					parameters: [testUuid(4)],
+					response: { rows: [{ id: testUuid(4) }] },
+				},
+				// delete orphaned inverse side
+				{
+					sql: 'select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?',
+					parameters: [testUuid(4)],
+					response: { rows: [{ id: testUuid(4), allowed: true }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "setting_id" in (?)',
+					parameters: [testUuid(4)],
+					response: { rows: [] },
+				},
+				{
+					sql: 'DELETE FROM "public"."site_setting" WHERE "id" IN (?)',
+					parameters: [testUuid(4)],
+					response: { rowCount: 1 },
+				},
+
+			]),
+		],
+		return: {
+			data: {
+				updateSiteSetting: {
+					ok: true,
+				},
+			},
+		},
+	})
+})

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

@@ -5,11 +5,14 @@ import { testUuid } from '../../../../../src/testUuid'
 import { siteSettingSchema } from './schema'
 
 test('create', async () => {
+	const settingId = testUuid(2)
+	const oldSiteId = testUuid(3)
+	const newSiteId = testUuid(1)
 	await execute({
 		schema: siteSettingSchema,
 		query: GQL`mutation {
         updateSiteSetting(
-            by: {id: "${testUuid(2)}"},
+            by: {id: "${settingId}"},
             data: {site: {create: {name: "Mangoweb"}}}
           ) {
           ok
@@ -19,8 +22,8 @@ test('create', async () => {
 			...sqlTransaction([
 				{
 					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
-					parameters: [testUuid(2)],
-					response: { rows: [{ id: testUuid(2) }] },
+					parameters: [settingId],
+					response: { rows: [{ id: settingId }] },
 				},
 				// {
 				// 	sql: SQL`select "root_"."id" as "root_id", "root_"."id" as "root_id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
@@ -40,20 +43,16 @@ test('create', async () => {
 					sql: SQL`select "root_"."id"
                        from "public"."site" as "root_"
                        where "root_"."setting_id" = ?`,
-					parameters: [testUuid(2)],
+					parameters: [settingId],
 					response: {
-						rows: [{ id: testUuid(3) }],
+						rows: [{ id: oldSiteId }],
 					},
 				},
 				{
-					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: [null, testUuid(3)],
-					response: { rowCount: 1 },
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
+					parameters: [null, oldSiteId],
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 				{
 					sql: SQL`with "root_" as
@@ -62,8 +61,8 @@ test('create', async () => {
 							select "root_"."id", "root_"."name", "root_"."setting_id"
               from "root_"
 							returning "id"`,
-					parameters: [testUuid(1), 'Mangoweb', testUuid(2)],
-					response: { rows: [{ id: testUuid(1) }] },
+					parameters: [newSiteId, 'Mangoweb', settingId],
+					response: { rows: [{ id: newSiteId }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/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'
@@ -27,17 +27,16 @@ test('delete', async () => {
 					parameters: [testUuid(2)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."site"
-              where "id" in (select "root_"."id"
-                             from "public"."site" 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"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."site" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: {  },
+				},
 			]),
 		],
 		return: {
@@ -50,3 +49,98 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete', async () => {
+	await execute({
+		schema: siteSettingSchema,
+		query: GQL`mutation {
+        updateSiteSetting(
+            by: {id: "${testUuid(2)}"},
+            data: {site: {delete: true}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`SELECT "root_"."id"
+							 FROM "public"."site_setting" AS "root_"
+							 WHERE "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`SELECT "root_"."id"
+							 FROM "public"."site" AS "root_"
+							 WHERE "root_"."setting_id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`SELECT "root_"."id" AS "id", TRUE AS "allowed"
+							 FROM "public"."site" AS "root_"
+							 WHERE "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`DELETE
+							 FROM "public"."site"
+							 WHERE "id" IN (?)`,
+					parameters: [testUuid(1)],
+					response: {},
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSiteSetting: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+
+test('delete - denied', async () => {
+	await execute({
+		schema: siteSettingSchema,
+		query: GQL`mutation {
+        updateSiteSetting(
+            by: {id: "${testUuid(2)}"},
+            data: {site: {delete: true}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."setting_id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSiteSetting: {
+					ok: false,
+				},
+			},
+		},
+	})
+})
+

package/tests/cases/integration/graphQlRequests/update/oneHasOneInverse/disconnect.test.ts

@@ -5,11 +5,13 @@ import { testUuid } from '../../../../../src/testUuid'
 import { siteSettingSchema } from './schema'
 
 test('disconnect', async () => {
+	const settingId = testUuid(2)
+	const siteId = testUuid(1)
 	await execute({
 		schema: siteSettingSchema,
 		query: GQL`mutation {
         updateSiteSetting(
-            by: {id: "${testUuid(2)}"},
+            by: {id: "${settingId}"},
             data: {site: {disconnect: true}}
           ) {
           ok
@@ -19,26 +21,23 @@ test('disconnect', async () => {
 			...sqlTransaction([
 				{
 					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
-					parameters: [testUuid(2)],
-					response: { rows: [{ id: testUuid(2) }] },
+					parameters: [settingId],
+					response: { rows: [{ id: settingId }] },
 				},
 				{
 					sql: SQL`select "root_"."id"
                        from "public"."site" as "root_"
                        where "root_"."setting_id" = ?`,
-					parameters: [testUuid(2)],
+					parameters: [settingId],
 					response: {
-						rows: [{ id: testUuid(1) }],
+						rows: [{ id: siteId }],
 					},
 				},
 				{
-					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: [null, testUuid(1)],
-					response: { rowCount: 1 },
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "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"  returning "setting_id_old__"`,
+					parameters: [null, siteId],
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

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

@@ -13,3 +13,16 @@ export const siteSettingSchema = new SchemaBuilder()
 			),
 	)
 	.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/graphQlRequests/update/oneHasOneInverse/update.test.ts

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

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

@@ -32,14 +32,10 @@ test('upsert - exists', async () => {
 					},
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-						(select ? :: text as "name", "root_"."id", "root_"."setting_id"  from "public"."site" as "root_"  where "root_"."id" = ?)
-						update  "public"."site" set  "name" =  "newData_"."name"
-						from "newData_"  where "site"."id" = "newData_"."id"
-					`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id", "root_"."setting_id"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site" set  "name" =  "newData_"."name"   from "newData_"  where "site"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Mangoweb', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'XX' }] },
 				},
 			]),
 		],
@@ -53,11 +49,13 @@ test('upsert - exists', async () => {
 	})
 })
 test('upsert - not exists', async () => {
+	const settingId = testUuid(2)
+	const siteId = testUuid(1)
 	await execute({
 		schema: siteSettingSchema,
 		query: GQL`mutation {
         updateSiteSetting(
-            by: {id: "${testUuid(2)}"},
+            by: {id: "${settingId}"},
            data: {site: {upsert: {update: {name: "Mangoweb"}, create: {name: "Mgw"}}}}
           ) {
           ok
@@ -67,14 +65,14 @@ test('upsert - not exists', async () => {
 			...sqlTransaction([
 				{
 					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
-					parameters: [testUuid(2)],
-					response: { rows: [{ id: testUuid(2) }] },
+					parameters: [settingId],
+					response: { rows: [{ id: settingId }] },
 				},
 				{
 					sql: SQL`select "root_"."id"
                        from "public"."site" as "root_"
                        where "root_"."setting_id" = ?`,
-					parameters: [testUuid(2)],
+					parameters: [settingId],
 					response: {
 						rows: [],
 					},
@@ -86,8 +84,8 @@ test('upsert - not exists', async () => {
 							select "root_"."id", "root_"."name", "root_"."setting_id"
               from "root_"
 							returning "id"`,
-					parameters: [testUuid(1), 'Mgw', testUuid(2)],
-					response: { rows: [{ id: testUuid(1) }] },
+					parameters: [siteId, 'Mgw', settingId],
+					response: { rows: [{ id: siteId }] },
 				},
 			]),
 		],