Merge pull request #649 from trycompai/claudio/comp-127-drop-entityid-and-entitytype-from-tasks

[dev] [claudfuen] claudio/comp-127-drop-entityid-and-entitytype-from-tasks

Author: claudfuen

apps/app/src/actions/organization/lib/utils.ts

@@ -6,7 +6,6 @@ import {
 	type PolicyStatus,
 	RequirementId,
 	TaskStatus,
-	TaskEntityType,
 	TaskFrequency,
 	Departments,
 	ArtifactType,

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts

@@ -2,7 +2,6 @@
 
 import { auth } from "@/utils/auth";
 import { db } from "@comp/db";
-import { TaskEntityType } from "@comp/db/types";
 import { ArtifactType } from "@prisma/client";
 import { headers } from "next/headers";
 
@@ -110,15 +109,8 @@ export const getOrganizationControlProgress = async (controlId: string) => {
 
 		progress.byType["control"].total++;
 
-		// Check completion based on task type
-		let isCompleted = false;
-		switch (task.entityType) {
-			case TaskEntityType.control:
-				isCompleted = task.status === "done";
-				break;
-			default:
-				isCompleted = false;
-		}
+		// Check completion based on task status (all tasks here are implicitly control-related)
+		const isCompleted = task.status === "done";
 
 		if (isCompleted) {
 			progress.completed++;

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getRelatedTasks.ts

@@ -6,7 +6,6 @@ import { SingleControl } from "./components/SingleControl";
 import { getControl } from "./data/getControl";
 import { getOrganizationControlProgress } from "./data/getOrganizationControlProgress";
 import type { ControlProgressResponse } from "./data/getOrganizationControlProgress";
-import { getRelatedTasks } from "./data/getRelatedTasks";
 import { getRelatedArtifacts } from "./data/getRelatedArtifacts";
 
 interface ControlPageProps {

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/page.tsx

@@ -6,11 +6,11 @@ import { Progress } from "@comp/ui/progress";
 import { getFrameworkDetails } from "../../lib/getFrameworkDetails";
 import { getControlStatus } from "../../lib/utils";
 import { FrameworkInstanceWithControls } from "../../types";
-import { Task } from "@comp/db/types";
+import { Control, Task } from "@comp/db/types";
 
 interface FrameworkOverviewProps {
 	frameworkInstanceWithControls: FrameworkInstanceWithControls;
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function FrameworkOverview({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx

@@ -7,7 +7,7 @@ import { getFrameworkDetails } from "../lib/getFrameworkDetails";
 import { FrameworkOverview } from "./components/FrameworkOverview";
 import { FrameworkRequirements } from "./components/FrameworkRequirements";
 import { db } from "@comp/db";
-import { TaskEntityType } from "@comp/db/types";
+
 interface PageProps {
 	params: Promise<{
 		frameworkInstanceId: string;
@@ -48,7 +48,14 @@ export default async function FrameworkPage({ params }: PageProps) {
 	const tasks = await db.task.findMany({
 		where: {
 			organizationId,
-			entityType: TaskEntityType.control,
+			controls: {
+				some: {
+					id: frameworkInstanceWithControls.id,
+				},
+			},
+		},
+		include: {
+			controls: true,
 		},
 	});
 

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx

@@ -6,13 +6,13 @@ import { FrameworkId } from "@comp/db/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import { FrameworkInstanceWithControls } from "../../../../types";
 import { RequirementControlsTable } from "./table/RequirementControlsTable";
-import type { Task } from "@comp/db/types";
+import type { Control, Task } from "@comp/db/types";
 
 interface RequirementControlsProps {
 	requirement: Requirement;
 	requirementKey: string;
 	frameworkInstanceWithControls: FrameworkInstanceWithControls;
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function RequirementControls({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx

@@ -27,7 +27,7 @@ interface RequirementControlsTableProps {
 			policy: Policy | null;
 		})[];
 	})[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function RequirementControlsTable({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx

@@ -26,7 +26,7 @@ type OrganizationControlType = Control & {
 export function RequirementControlsTableColumns({
 	tasks,
 }: {
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }): ColumnDef<OrganizationControlType>[] {
 	const t = useI18n();
 	const { orgId } = useParams<{ orgId: string }>();

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx

@@ -7,7 +7,6 @@ import { getFrameworkDetails } from "../../../lib/getFrameworkDetails";
 import { getFrameworkRequirements } from "../../../lib/getFrameworkRequirements";
 import { RequirementControls } from "./components/RequirementControls";
 import { db } from "@comp/db";
-import { TaskEntityType } from "@comp/db/types";
 
 interface PageProps {
 	params: Promise<{
@@ -70,7 +69,14 @@ export default async function RequirementPage({ params }: PageProps) {
 		(await db.task.findMany({
 			where: {
 				organizationId,
-				entityType: TaskEntityType.control,
+				controls: {
+					some: {
+						id: frameworkInstanceWithControls.id,
+					},
+				},
+			},
+			include: {
+				controls: true,
 			},
 		})) || [];