Correct node creation & update (discrimination type)

apps/backend-e2e/src/backend/http/v1/graph/graph-arcs.http.spec.ts

@@ -4,7 +4,7 @@ import { DbE2eHelper } from "~/app/backend/e2e/db-e2e/db-e2e.helper";
 import { GraphHttpClient } from "~/app/backend/e2e/http/clients";
 import { GraphArcQueryDto } from "~/lib/common/app/graph/dtos/arc";
 import { generateGraphArcsEndpoint } from "~/lib/common/app/graph/endpoints";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { BASE_SEED } from "~/lib/common/seeds";
 
 describe("Backend HTTP GraphArcs", () => {

apps/backend-e2e/src/backend/http/v1/graph/graph-nodes.http.spec.ts

@@ -5,7 +5,7 @@ import { GraphHttpClient } from "~/app/backend/e2e/http/clients";
 import { GraphNodeKindUpdateDto } from "~/lib/common/app/graph/dtos/node";
 import { generateGraphNodesEndpoint } from "~/lib/common/app/graph/endpoints";
 import { NodeQueryDto, NodeUpdateDto } from "~/lib/common/app/node/dtos";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { omit } from "~/lib/common/utils/object-fns";
 
 describe("Backend HTTP GraphNodes", () => {

apps/backend-e2e/src/backend/http/v1/nodes.http.spec.ts

@@ -0,0 +1,64 @@
+import { DbE2eHelper } from "~/app/backend/e2e/db-e2e/db-e2e.helper";
+import { NodeHttpClient } from "~/app/backend/e2e/http/clients/node.http-client";
+import { NodeCreateDto, NodeUpdateDto } from "~/lib/common/app/node/dtos";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
+import { NodeKindEdgeDto } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
+import { BASE_SEED } from "~/lib/common/seeds";
+import { jsonify } from "~/lib/common/utils/jsonify";
+
+describe("Backend HTTP Nodes", () => {
+	const client = new NodeHttpClient();
+
+	const dbHelper = DbE2eHelper.getHelper("base");
+	const db = jsonify(BASE_SEED);
+
+	beforeAll(async () => {
+		const [{ email, password }] = db.users;
+
+		await dbHelper.refresh();
+		await client.setAuth(email, password);
+	});
+
+	describe("POST", () => {
+		beforeEach(() => dbHelper.refresh());
+
+		it("should create a node (different `kinds`)", async () => {
+			for (const toCreate of [
+				{
+					behavior: { type: NodeBehaviorType.VARIABLE, value: 1 },
+					kind: { __graph: 1, position: { x: 0, y: 0 }, type: NodeKindType.EDGE },
+					name: "-new node1"
+				},
+				{
+					behavior: { type: NodeBehaviorType.VARIABLE, value: 1 },
+					kind: { active: false, type: NodeKindType.TEMPLATE },
+					name: "-new node2"
+				}
+			] satisfies NodeCreateDto[]) {
+				const { behavior, kind, name } = await client.create(toCreate);
+
+				expect(name).toBe(toCreate.name);
+				expect(behavior).toStrictEqual(toCreate.behavior);
+				expect(kind).toStrictEqual(toCreate.kind);
+			}
+		});
+	});
+
+	describe("PATCH", () => {
+		beforeEach(() => dbHelper.refresh());
+
+		it("should update a node (kind = edge)", async () => {
+			const node = db.graph.nodes[0];
+
+			const toUpdate = {
+				kind: { position: { x: 250, y: 250 }, type: NodeKindType.EDGE }
+			} as const satisfies NodeUpdateDto;
+			const updated = await client.update(node._id, toUpdate);
+
+			const { position } = updated.kind as NodeKindEdgeDto;
+			expect(position.x).toBe(toUpdate.kind.position.x);
+			expect(position.y).toBe(toUpdate.kind.position.y);
+		});
+	});
+});

apps/backend-e2e/src/support/http/clients/node.http-client.ts

@@ -0,0 +1,10 @@
+import { NodeDto } from "~/lib/common/app/node/dtos";
+import { NODES_ENDPOINT_PREFIX } from "~/lib/common/app/node/endpoints";
+
+import { EntityHttpClient } from "./_lib/entity.http-client";
+
+export class NodeHttpClient extends EntityHttpClient<NodeDto> {
+	public override getEndpoint(): string {
+		return NODES_ENDPOINT_PREFIX;
+	}
+}

apps/backend/src/app/graph/arc/graph-arc.controller.ts

@@ -18,7 +18,7 @@ import {
 	GraphArcResultsDto
 } from "~/lib/common/app/graph/dtos/arc";
 import { generateGraphArcsEndpoint, GraphArcEndpoint } from "~/lib/common/app/graph/endpoints";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { EntityId } from "~/lib/common/dtos/entity";
 import { UnshiftParameters } from "~/lib/common/types";
 

apps/backend/src/app/graph/arc/graph-arc.service.spec.ts

@@ -6,8 +6,8 @@ import {
 import { MethodNotAllowedException } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
 import { GraphArcCreateDto } from "~/lib/common/app/graph/dtos/arc";
-import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { BASE_SEED, MockSeed } from "~/lib/common/seeds";
 
 import { GraphArcDifferentGraphException } from "./exceptions";

apps/backend/src/app/graph/arc/graph-arc.service.ts

@@ -10,7 +10,7 @@ import {
 import { graphHasCycle } from "~/lib/common/app/graph/algorithms";
 import { GraphArcCreateDto } from "~/lib/common/app/graph/dtos/arc";
 import { getAdjacencyList } from "~/lib/common/app/graph/transformations";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { EntityId } from "~/lib/common/dtos/entity";
 import { EntitiesToPopulate, EntityFilter, EntityFindParams } from "~/lib/common/endpoints";
 

apps/backend/src/app/graph/exceptions/graph.exception.ts

@@ -13,9 +13,6 @@ export class GraphException extends BadLogicException {
 	 * @param message An additional message to the exception
 	 */
 	public constructor(code: GraphErrorCode, message?: string) {
-		super({
-			code,
-			message
-		});
+		super({ code, message });
 	}
 }

apps/backend/src/app/graph/executor/graph.executor.spec.ts

@@ -1,7 +1,7 @@
 import { Test } from "@nestjs/testing";
 import { lastValueFrom, toArray } from "rxjs";
-import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { BASE_SEED } from "~/lib/common/seeds";
 
 import { GraphExecutorStartingNodeException } from "./exceptions";

apps/backend/src/app/graph/node/graph-node.controller.ts

@@ -17,7 +17,7 @@ import { GraphNodeUpdateDto } from "~/lib/common/app/graph/dtos/node";
 import { GraphNodeCreateDto } from "~/lib/common/app/graph/dtos/node/graph-node.create.dto";
 import { generateGraphNodesEndpoint, GraphNodeEndpoint } from "~/lib/common/app/graph/endpoints";
 import { NodeDto, NodeQueryDto } from "~/lib/common/app/node/dtos";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { EntityId } from "~/lib/common/dtos/entity";
 import { UnshiftParameters } from "~/lib/common/types";
 

apps/backend/src/app/node/behaviors/node-behavior.base.ts

@@ -1,9 +1,9 @@
 import { Entity, EntityOptions, Enum, OneToOne } from "@mikro-orm/core";
 import {
 	NodeBehaviorBaseDto,
-	NodeBehaviorDiscriminatorKey,
-	NodeBehaviorType
+	NodeBehaviorDiscriminatorKey
 } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeEntity } from "../node.entity";
 

apps/backend/src/app/node/behaviors/node-behavior.code.ts

@@ -1,5 +1,6 @@
 import { Entity, Property } from "@mikro-orm/core";
-import { NodeBehaviorCodeDto as DTO, NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorCodeDto as DTO } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeBehaviorBase } from "./node-behavior.base";
 

apps/backend/src/app/node/behaviors/node-behavior.function.ts

@@ -1,9 +1,7 @@
 import { Entity, OneToOne } from "@mikro-orm/core";
 import { applyDecorators } from "@nestjs/common";
-import {
-	NodeBehaviorFunctionDto as DTO,
-	NodeBehaviorType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorFunctionDto as DTO } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeBehaviorBase } from "./node-behavior.base";
 import { ManyToOneParams } from "../../_lib/entity/decorators";

apps/backend/src/app/node/behaviors/node-behavior.reference.ts

@@ -1,9 +1,7 @@
 import { Entity } from "@mikro-orm/core";
 import { NodeDto } from "~/lib/common/app/node/dtos";
-import {
-	NodeBehaviorReferenceDto as DTO,
-	NodeBehaviorType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorReferenceDto as DTO } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 import { EntityId } from "~/lib/common/dtos/entity";
 
 import { NodeBehaviorBase } from "./node-behavior.base";

apps/backend/src/app/node/behaviors/node-behavior.trigger.ts

@@ -1,8 +1,6 @@
 import { Embedded, Entity } from "@mikro-orm/core";
-import {
-	NodeBehaviorTriggerDto as DTO,
-	NodeBehaviorType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorTriggerDto as DTO } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeBehaviorBase } from "./node-behavior.base";
 import { NODE_TRIGGER_ENTITIES, NodeTriggerEntity } from "./triggers";

apps/backend/src/app/node/behaviors/parameters/node-behavior.parameter-base.ts

@@ -1,8 +1,6 @@
 import { Entity } from "@mikro-orm/core";
-import {
-	NodeBehaviorParameterBaseDto,
-	NodeBehaviorParameterType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorParameterBaseDto } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorParameterType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NODE_BEHAVIOR_ENTITY_OPTIONS, NodeBehaviorBase } from "../node-behavior.base";
 
@@ -14,4 +12,4 @@ export abstract class NodeBehaviorParameterBase<
 		T extends NodeBehaviorParameterType = NodeBehaviorParameterType
 	>
 	extends NodeBehaviorBase<T>
-	implements NodeBehaviorParameterBaseDto {}
+	implements NodeBehaviorParameterBaseDto<T> {}

apps/backend/src/app/node/behaviors/parameters/node-behavior.parameter-input.ts

@@ -1,8 +1,6 @@
 import { Entity } from "@mikro-orm/core";
-import {
-	NodeBehaviorParameterInputDto,
-	NodeBehaviorType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorParameterInputDto } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeBehaviorParameterBase } from "./node-behavior.parameter-base";
 import { ManyToOneFactory } from "../../../_lib/entity/decorators";

apps/backend/src/app/node/behaviors/parameters/node-behavior.parameter-output.ts

@@ -1,8 +1,6 @@
 import { Entity } from "@mikro-orm/core";
-import {
-	NodeBehaviorParameterOutputDto,
-	NodeBehaviorType
-} from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorParameterOutputDto } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 
 import { NodeBehaviorParameterBase } from "./node-behavior.parameter-base";
 import { ManyToOneFactory } from "../../../_lib/entity/decorators";

apps/backend/src/app/node/behaviors/parameters/node-behavior.variable.ts

@@ -1,5 +1,6 @@
 import { Entity, Property } from "@mikro-orm/core";
-import { NodeBehaviorType, NodeBehaviorVariableDto } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorVariableDto } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 import { NodeIoValue } from "~/lib/common/app/node/io";
 
 import { NodeBehaviorParameterBase } from "./node-behavior.parameter-base";

apps/backend/src/app/node/exceptions/index.ts

@@ -0,0 +1,2 @@
+export * from "./node.exception";
+export * from "./node.readonly-kind-type.exception";

apps/backend/src/app/node/exceptions/node.exception.ts

@@ -0,0 +1,18 @@
+import { NodeErrorCode } from "~/lib/common/app/node/error-codes";
+
+import { BadLogicException } from "../../_lib/exceptions";
+
+/**
+ * An exception to use when related to "graph"
+ */
+export class NodeException extends BadLogicException {
+	/**
+	 * Creates the exception
+	 *
+	 * @param code Error code for the exception
+	 * @param message An additional message to the exception
+	 */
+	public constructor(code: NodeErrorCode, message?: string) {
+		super({ code, message });
+	}
+}

apps/backend/src/app/node/exceptions/node.readonly-kind-type.exception.ts

@@ -0,0 +1,15 @@
+import { NodeErrorCode } from "~/lib/common/app/node/error-codes";
+
+import { NodeException } from "./node.exception";
+
+/**
+ * An exception when someone tries to change the node-kind type
+ */
+export class NodeReadonlyKindTypeException extends NodeException {
+	/**
+	 * Creates the exception
+	 */
+	public constructor() {
+		super(NodeErrorCode.KIND_TYPE_READONLY, "The kind-type of a node can not be changed");
+	}
+}

apps/backend/src/app/node/executor/node.executor.spec.ts

@@ -1,7 +1,7 @@
 import { Test } from "@nestjs/testing";
-import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 import { NodeTriggerType } from "~/lib/common/app/node/dtos/behaviors/triggers";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { BASE_SEED } from "~/lib/common/seeds";
 
 import { NodeExecutorMissingInputException } from "./exceptions";

apps/backend/src/app/node/executor/node.executor.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable } from "@nestjs/common";
 import { filter, lastValueFrom, toArray } from "rxjs";
-import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 import { NodeTriggerType } from "~/lib/common/app/node/dtos/behaviors/triggers";
 import { castNodeIoValueTo, NODE_IO_VOID, NodeIoType, NodeIoValue } from "~/lib/common/app/node/io";
 import { EntityId } from "~/lib/common/dtos/entity";

apps/backend/src/app/node/kind/node-kind.base.entity.ts

@@ -1,9 +1,6 @@
 import { Entity, Enum, OneToOne } from "@mikro-orm/core";
-import {
-	NodeKindBaseDto,
-	NodeKindDiscriminatorKey,
-	NodeKindType
-} from "~/lib/common/app/node/dtos/kind";
+import { NodeKindBaseDto, NodeKindDiscriminatorKey } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 
 import { NodeEntity } from "../node.entity";
 

apps/backend/src/app/node/kind/node-kind.edge.entity.ts

@@ -1,5 +1,6 @@
 import { Embedded, Entity } from "@mikro-orm/core";
-import { NodeKindEdgeDto, NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindEdgeDto } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { EntityId } from "~/lib/common/dtos/entity";
 
 import { NodeKindBaseEntity } from "./node-kind.base.entity";

apps/backend/src/app/node/kind/node-kind.template.entity.ts

@@ -1,5 +1,6 @@
 import { Entity, Property } from "@mikro-orm/core";
-import { NodeKindTemplateDto, NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindTemplateDto } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 
 import { NodeKindBaseEntity } from "./node-kind.base.entity";
 

apps/backend/src/app/node/node.service.spec.ts

@@ -2,11 +2,12 @@ import { NotFoundError } from "@mikro-orm/core";
 import { Test, TestingModule } from "@nestjs/testing";
 import { GraphNode } from "~/lib/common/app/graph/endpoints";
 import { NodeCreateDto, NodeUpdateDto } from "~/lib/common/app/node/dtos";
-import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors";
+import { NodeBehaviorType } from "~/lib/common/app/node/dtos/behaviors/node-behavior.type";
 import { NodeTriggerType } from "~/lib/common/app/node/dtos/behaviors/triggers";
-import { NodeKindType } from "~/lib/common/app/node/dtos/kind";
+import { NodeKindType } from "~/lib/common/app/node/dtos/kind/node-kind.type";
 import { BASE_SEED } from "~/lib/common/seeds";
 
+import { NodeReadonlyKindTypeException } from "./exceptions";
 import { NodeInputRepository } from "./input";
 import { NodeKindEdgeEntity } from "./kind";
 import { NodeModule } from "./node.module";
@@ -292,6 +293,19 @@ describe("NodeService", () => {
 		});
 	});
 
+	describe("Kind", () => {
+		beforeEach(() => dbTest.refresh());
+
+		it("should not allow to change the type on an update", async () => {
+			const node = await service.findById(db.graph.nodes[0]._id);
+			expect(node.kind.type).toBe(NodeKindType.EDGE);
+
+			await expect(() =>
+				service.update(node._id, { kind: { active: true, type: NodeKindType.TEMPLATE } })
+			).rejects.toThrow(NodeReadonlyKindTypeException);
+		});
+	});
+
 	describe("CRUD basic", () => {
 		describe("Read", () => {
 			beforeEach(() => dbTest.refresh());