diff --git a/apps/api/src/frameworks/frameworks-scores.helper.ts b/apps/api/src/frameworks/frameworks-scores.helper.ts index 4401fefb3..a5e9bc3c5 100644 --- a/apps/api/src/frameworks/frameworks-scores.helper.ts +++ b/apps/api/src/frameworks/frameworks-scores.helper.ts @@ -2,6 +2,7 @@ import { evidenceFormDefinitionList, meetingSubTypeValues, toDbEvidenceFormType, + toExternalEvidenceFormType, } from '@comp/company'; import { db } from '@trycompai/db'; import { filterComplianceMembers } from '../utils/compliance-filters'; @@ -142,7 +143,7 @@ async function computeDocumentsScore(organizationId: string) { } async function getOrganizationFindings(organizationId: string) { - return db.finding.findMany({ + const findings = await db.finding.findMany({ where: { organizationId }, include: { task: { select: { id: true, title: true } }, @@ -150,6 +151,19 @@ async function getOrganizationFindings(organizationId: string) { }, orderBy: [{ status: 'asc' }, { createdAt: 'desc' }], }); + + return findings.map((finding) => ({ + ...finding, + evidenceFormType: toExternalEvidenceFormType(finding.evidenceFormType), + evidenceSubmission: finding.evidenceSubmission + ? { + ...finding.evidenceSubmission, + formType: + toExternalEvidenceFormType(finding.evidenceSubmission.formType) ?? + 'meeting', + } + : null, + })); } export async function getCurrentMember( diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/components/FindingsOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/FindingsOverview.tsx index 79cb9b5fd..648c6fad9 100644 --- a/apps/app/src/app/(app)/[orgId]/frameworks/components/FindingsOverview.tsx +++ b/apps/app/src/app/(app)/[orgId]/frameworks/components/FindingsOverview.tsx @@ -61,9 +61,9 @@ function FindingsList({ {finding.task?.title ?? (finding.evidenceFormType - ? `Document: ${finding.evidenceFormType}` + ? `Document: ${finding.evidenceFormType.replace(/-/g, ' ')}` : finding.evidenceSubmission - ? `Document: ${finding.evidenceSubmission.formType}` + ? `Document: ${finding.evidenceSubmission.formType.replace(/-/g, ' ')}` : 'Finding')}