Fix base project validation

backend/src/components/project/base.ts

@@ -94,6 +94,31 @@ export async function validateUpsertProject(
 ) {
   const validationErrors: FormErrors<UpsertProject> = { errors: {} };
 
+  if (values?.id) {
+    const estimateRange = await getPool().maybeOne(sql.untyped`
+    SELECT
+      extract(year FROM ${values?.startDate}::date) <= min(cost_estimate.year) AS "validStartDate",
+      extract(year FROM ${values?.endDate}::date) >= max(cost_estimate.year) AS "validEndDate"
+    FROM app.cost_estimate
+    WHERE project_id = ${values?.id}
+    GROUP BY project_id;
+  `);
+
+    if (estimateRange?.validStartDate === false) {
+      validationErrors.errors['startDate'] = fieldError('project.error.costEstimateNotIncluded');
+    }
+
+    if (estimateRange?.validEndDate === false) {
+      validationErrors.errors['endDate'] = fieldError('project.error.costEstimateNotIncluded');
+    }
+  }
+
+  // Check that project start date is not after end date
+  if (values.startDate >= values.endDate) {
+    validationErrors.errors['startDate'] = fieldError('project.error.endDateBeforeStartDate');
+    validationErrors.errors['endDate'] = fieldError('project.error.endDateBeforeStartDate');
+  }
+
   // Check that SAP project ID is not changed if project has project objects
   // with selected SAP WBS elements
   if (values?.id) {

backend/src/components/project/detailplan.ts

@@ -4,9 +4,14 @@ import { z } from 'zod';
 
 import { addAuditEvent } from '@backend/components/audit';
 import { codeIdFragment } from '@backend/components/code';
-import { baseProjectUpsert } from '@backend/components/project/base';
+import {
+  baseProjectUpsert,
+  validateUpsertProject as baseProjectValidate,
+} from '@backend/components/project/base';
 import { getPool, sql } from '@backend/db';
+import { logger } from '@backend/logging';
 
+import { hasErrors } from '@shared/formerror';
 import { projectIdSchema } from '@shared/schema/project/base';
 import { DetailplanProject, dbDetailplanSchema } from '@shared/schema/project/detailplan';
 import { User } from '@shared/schema/user';
@@ -65,6 +70,11 @@ export async function getProject(id: string, tx?: DatabaseTransactionConnection)
 
 export async function projectUpsert(project: DetailplanProject, user: User) {
   return await getPool().transaction(async (tx) => {
+    if (hasErrors(await baseProjectValidate(tx, project))) {
+      logger.error('projectUpsert: validation failed', { project });
+      throw new Error('Invalid project data');
+    }
+
     const id = await baseProjectUpsert(tx, project, user);
     await addAuditEvent(tx, {
       eventType: 'detailplanProject.upsertProject',
@@ -110,7 +120,10 @@ export async function projectUpsert(project: DetailplanProject, user: User) {
   });
 }
 
-export async function validateUpsertProject(input: DetailplanProject) {
-  // !FIXME: implement, first validate base project, then detailplan project
-  return { errors: {} };
+export async function validateUpsertProject(
+  project: DetailplanProject,
+  tx: DatabaseTransactionConnection | null
+) {
+  const conn = tx ?? getPool();
+  return baseProjectValidate(conn, project);
 }

backend/src/components/project/investment.ts

@@ -4,9 +4,14 @@ import { z } from 'zod';
 
 import { addAuditEvent } from '@backend/components/audit';
 import { codeIdFragment } from '@backend/components/code';
-import { baseProjectUpsert } from '@backend/components/project/base';
+import {
+  baseProjectUpsert,
+  validateUpsertProject as baseProjectValidate,
+} from '@backend/components/project/base';
 import { getPool, sql } from '@backend/db';
+import { logger } from '@backend/logging';
 
+import { hasErrors } from '@shared/formerror';
 import { projectIdSchema } from '@shared/schema/project/base';
 import { InvestmentProject, dbInvestmentProjectSchema } from '@shared/schema/project/investment';
 import { User } from '@shared/schema/user';
@@ -51,6 +56,11 @@ export async function getProject(id: string, tx?: DatabaseTransactionConnection)
 
 export async function projectUpsert(project: InvestmentProject, user: User) {
   return getPool().transaction(async (tx) => {
+    if (hasErrors(await validateUpsertProject(project, tx))) {
+      logger.error('Invalid project', { project });
+      throw new Error('Invalid project');
+    }
+
     const id = await baseProjectUpsert(tx, project, user);
     await addAuditEvent(tx, {
       eventType: 'investmentProject.upsertProject',
@@ -100,33 +110,10 @@ export async function projectUpsert(project: InvestmentProject, user: User) {
   });
 }
 
-export async function validateUpsertProject(input: InvestmentProject) {
-  // !FIXME: implement, first validate base project, then common project
-  /*
-  if (values?.id) {
-    const estimateRange = await getPool().maybeOne(sql.untyped`
-    SELECT
-      extract(year FROM ${values?.startDate}::date) <= min(cost_estimate.year) AS "validStartDate",
-      extract(year FROM ${values?.endDate}::date) >= max(cost_estimate.year) AS "validEndDate"
-    FROM app.cost_estimate
-    WHERE project_id = ${values?.id}
-    GROUP BY project_id;
-  `);
-
-    if (estimateRange?.validStartDate === false) {
-      validationErrors.errors['startDate'] = fieldError('project.error.costEstimateNotIncluded');
-    }
-
-    if (estimateRange?.validEndDate === false) {
-      validationErrors.errors['endDate'] = fieldError('project.error.costEstimateNotIncluded');
-    }
-  }
-
-  // Check that project start date is not after end date
-  if (values.startDate >= values.endDate) {
-    validationErrors.errors['startDate'] = fieldError('project.error.endDateBeforeStartDate');
-    validationErrors.errors['endDate'] = fieldError('project.error.endDateBeforeStartDate');
-  }
-  */
-  return { errors: {} };
+export async function validateUpsertProject(
+  project: InvestmentProject,
+  tx: DatabaseTransactionConnection | null
+) {
+  const conn = tx ?? getPool();
+  return baseProjectValidate(conn, project);
 }

backend/src/router/project/detailplan.ts

@@ -36,7 +36,7 @@ async function getNotificationMailTemplate(
 export const createDetailplanProjectRouter = (t: TRPC) =>
   t.router({
     upsertValidate: t.procedure.input(z.any()).query(async ({ input }) => {
-      return validateUpsertProject(input);
+      return validateUpsertProject(input, null);
     }),
 
     upsert: t.procedure.input(detailplanProjectSchema).mutation(async ({ input, ctx }) => {

backend/src/router/project/investment.ts

@@ -13,7 +13,7 @@ import { investmentProjectSchema } from '@shared/schema/project/investment';
 export const createInvestmentProjectRouter = (t: TRPC) =>
   t.router({
     upsertValidate: t.procedure.input(z.any()).query(async ({ input }) => {
-      return validateUpsertProject(input);
+      return validateUpsertProject(input, null);
     }),
 
     upsert: t.procedure.input(investmentProjectSchema).mutation(async ({ input, ctx }) => {

frontend/src/views/DetailplanProject/DetailplanProjectForm.tsx

@@ -97,7 +97,7 @@ export function DetailplanProjectForm(props: Props) {
       const errors = await Promise.all([serverErrors, shapeErrors]);
       return {
         values,
-        errors: mergeErrors<DbDetailplanProject>(errors).errors,
+        errors: mergeErrors(errors).errors,
       };
     };
   }, []);

frontend/src/views/Project/InvestmentProjectForm.tsx

@@ -83,7 +83,7 @@ export function InvestmentProjectForm(props: InvestmentProjectFormProps) {
       const errors = await Promise.all([serverErrors, shapeErrors]);
       return {
         values,
-        errors: mergeErrors<InvestmentProject>(errors).errors,
+        errors: mergeErrors(errors).errors,
       };
     };
   }, []);