@contember/engine-content-api 2.1.0-alpha.14 → 2.1.0-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.1.0-alpha.14",
+  "version": "2.1.0-alpha.16",
   "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.1.0-alpha.14",
-    "@contember/dic": "2.1.0-alpha.14",
-    "@contember/graphql-utils": "2.1.0-alpha.14",
-    "@contember/logger": "2.1.0-alpha.14",
-    "@contember/schema": "2.1.0-alpha.14",
-    "@contember/schema-definition": "2.1.0-alpha.14",
-    "@contember/schema-utils": "2.1.0-alpha.14",
+    "@contember/database": "2.1.0-alpha.15",
+    "@contember/dic": "2.1.0-alpha.15",
+    "@contember/graphql-utils": "2.1.0-alpha.15",
+    "@contember/logger": "2.1.0-alpha.15",
+    "@contember/schema": "2.1.0-alpha.15",
+    "@contember/schema-definition": "2.1.0-alpha.15",
+    "@contember/schema-utils": "2.1.0-alpha.15",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.1.0-alpha.14",
-    "@contember/schema-definition": "2.1.0-alpha.14",
+    "@contember/database-tester": "2.1.0-alpha.15",
+    "@contember/schema-definition": "2.1.0-alpha.15",
     "@types/node": "^20.17.22",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

package/src/mapper/Result.ts

@@ -202,6 +202,6 @@ export const prependPath = (path: Path, results: MutationResultList): MutationRe
 	}))
 
 export const getInsertPrimary = (result: MutationResultList) =>
-	result[0] && result[0].result === MutationResultType.ok && result[0].type === ModificationType.create
+	!result.some(it => it.error) && result[0] && result[0].result === MutationResultType.ok && result[0].type === ModificationType.create
 		? result[0].primary
 		: undefined

package/tests/cases/integration/graphQlRequests/insert/subOperationFail.test.ts

@@ -0,0 +1,105 @@
+import { test } from 'bun:test'
+import { execute, failedTransaction, sqlTransaction } from '../../../../src/test'
+import { c, createSchema } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../src/tags'
+import { testUuid } from '../../../../src/testUuid'
+
+namespace TestModel {
+	export class Article {
+		content = c.manyHasOne(ArticleContent)
+	}
+
+	export class ArticleContent {
+		locales = c.oneHasMany(ArticleContentLocale, 'content')
+	}
+
+	export class ArticleContentLocale {
+		content = c.manyHasOne(ArticleContent, 'locales')
+		title = c.stringColumn()
+		locale = c.stringColumn()
+	}
+}
+
+test('failed to insert in sub-operation', async () => {
+	await execute({
+		schema: createSchema(TestModel).model,
+		query: GQL`
+          mutation {
+              createArticle(data: {content: {create: {locales: [{create: {locale: "en", title: "Title"}}]}}}) {
+                  ok
+              }
+          }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`with "root_" as (select ? :: uuid as "id") insert into  "public"."article_content" ("id") select "root_"."id"  from "root_"  returning "id"`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ id: testUuid(2) }],
+					},
+				},
+				{
+					sql: SQL`with "root_" as (select ? :: uuid as "id", ? :: text as "title", ? :: text as "locale", ? :: uuid as "content_id") insert into  "public"."article_content_locale" ("id", "title", "locale", "content_id") select "root_"."id", "root_"."title", "root_"."locale", "root_"."content_id"  from "root_"  returning "id"`,
+					parameters: [testUuid(3), 'Title', 'en', testUuid(2)],
+					response: {
+						rows: [],
+					},
+				},
+			]),
+		],
+		return: {
+			data: {
+				createArticle: {
+					ok: false,
+				},
+			},
+		},
+	})
+})
+
+
+test('failed to insert in sub-operation in update', async () => {
+	await execute({
+		schema: createSchema(TestModel).model,
+		query: GQL`
+          mutation {
+              updateArticle(by: {id: "${testUuid(10)}"}, data: {content: {create: {locales: [{create: {locale: "en", title: "Title"}}]}}}) {
+                  ok
+              }
+          }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: `select "root_"."id"  from "public"."article" as "root_"  where "root_"."id" = ?`,
+					parameters: [testUuid(10)],
+					response: {
+						rows: [{ id: testUuid(10) }],
+					},
+				},
+				{
+					sql: SQL`with "root_" as (select ? :: uuid as "id") insert into  "public"."article_content" ("id") select "root_"."id"  from "root_"  returning "id"`,
+					parameters: [testUuid(1)],
+					response: {
+						rows: [{ id: testUuid(1) }],
+					},
+				},
+				{
+					sql: SQL`with "root_" as (select ? :: uuid as "id", ? :: text as "title", ? :: text as "locale", ? :: uuid as "content_id") insert into  "public"."article_content_locale" ("id", "title", "locale", "content_id") select "root_"."id", "root_"."title", "root_"."locale", "root_"."content_id"  from "root_"  returning "id"`,
+					parameters: [testUuid(2), 'Title', 'en', testUuid(1)],
+					response: {
+						rows: [],
+					},
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateArticle: {
+					ok: false,
+				},
+			},
+		},
+	})
+})
+