Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

Merge branch 'main' into feat/custom-fields-configuration

LAZIC Erwaneca83fee0806
diff --cc apps/api/src/task/controllers/create-task.ts
index 0e6061da4,e6e0da418..f10d5b691
--- a/apps/api/src/task/controllers/create-task.ts
+++ b/apps/api/src/task/controllers/create-task.ts
@@@ -1,41 -1,15 +1,45 @@@
import { and, eq, max } from "drizzle-orm";
import { HTTPException } from "hono/http-exception";
import db from "../../database";
-import { columnTable, taskTable, userTable } from "../../database/schema";
+import {
+ columnTable,
+ customFieldDefinitionTable,
+ customFieldValueTable,
+ taskTable,
+ userTable,
+} from "../../database/schema";
import { publishEvent } from "../../events";
+ import {
+ assertAssignableUser,
+ getProjectWorkspaceId,
+ } from "../../utils/assert-assignable-user";
-import { assertValidTaskStatus } from "../validate-task-fields";
+import {
+ assertRequiredCustomFields,
+ assertValidTaskStatus,
+} from "../validate-task-fields";
import { claimTaskNumber } from "./claim-task-numbers";
+type CustomFieldInput = {
+ fieldId: string;
+ value: string;
+};
+
+function deduplicateCustomFields(
+ customFields?: CustomFieldInput[],
+): CustomFieldInput[] | undefined {
+ if (!customFields) {
+ return undefined;
+ }
+
+ const fieldsById = new Map<string, CustomFieldInput>();
+
+ for (const customField of customFields) {
+ fieldsById.set(customField.fieldId, customField);
+ }
+
+ return Array.from(fieldsById.values());
+}
+
async function createTask({
projectId,
currentUserId,
@@@ -67,39 -38,18 +71,42 @@@
await assertValidTaskStatus(resolvedStatus, projectId);
+ const allFields = await db
+ .select()
+ .from(customFieldDefinitionTable)
+ .where(eq(customFieldDefinitionTable.projectId, projectId));
+
+ const mergedCustomFields: CustomFieldInput[] = normalizedCustomFields ?? [];
+ const providedFieldIds = new Set(mergedCustomFields.map((f) => f.fieldId));
+
+ for (const field of allFields) {
+ if (
+ !providedFieldIds.has(field.id) &&
+ field.required &&
+ field.defaultValue != null &&
+ field.defaultValue.trim() !== ""
+ ) {
+ mergedCustomFields.push({
+ fieldId: field.id,
+ value: field.defaultValue,
+ });
+ }
+ }
+
+ await assertRequiredCustomFields(projectId, mergedCustomFields);
+
- const [assignee] = await db
- .select({ name: userTable.name })
- .from(userTable)
- .where(eq(userTable.id, normalizedUserId ?? ""));
+ let assignee: { name: string } | undefined;
- if (normalizedUserId && !assignee) {
- throw new HTTPException(404, {
- message: "Assignee not found",
- });
+ if (normalizedUserId) {
+ await assertAssignableUser(
+ normalizedUserId,
+ await getProjectWorkspaceId(projectId),
+ );
+
+ [assignee] = await db
+ .select({ name: userTable.name })
+ .from(userTable)
+ .where(eq(userTable.id, normalizedUserId));
}
const column = await db.query.columnTable.findFirst({
@@@ -177,4 -117,4 +184,4 @@@
};
}
--export default createTask;
++export default createTask;