fix: Deployment version channel refactor

apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment-drawer/policy-override/UpdateOverride.tsx

@@ -10,7 +10,7 @@ import { EnvironmentDrawerTab } from "../tabs";
 import { useUpdateOverridePolicy } from "./useOverridePolicy";
 
 type Deployment = SCHEMA.Deployment & {
-  releaseChannels: SCHEMA.ReleaseChannel[];
+  releaseChannels: SCHEMA.DeploymentVersionChannel[];
 };
 
 type Policy = NonNullable<

apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment-policy-drawer/EnvironmentPolicyDrawer.tsx

@@ -116,7 +116,7 @@ const PolicyDropdownMenu: React.FC<{
 type ViewProps = {
   environmentPolicy: SCHEMA.EnvironmentPolicy & {
     releaseWindows: SCHEMA.EnvironmentPolicyReleaseWindow[];
-    releaseChannels: SCHEMA.ReleaseChannel[];
+    releaseChannels: SCHEMA.DeploymentVersionChannel[];
   };
   activeTab: EnvironmentPolicyDrawerTab;
 };

apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy-form-components/ReleaseChannels.tsx

@@ -14,10 +14,10 @@ import {
 import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover";
 
 type Deployment = SCHEMA.Deployment & {
-  releaseChannels: SCHEMA.ReleaseChannel[];
+  releaseChannels: SCHEMA.DeploymentVersionChannel[];
 };
 
-type Policy = { releaseChannels: SCHEMA.ReleaseChannel[] };
+type Policy = { releaseChannels: SCHEMA.DeploymentVersionChannel[] };
 
 type DeploymentSelectProps = {
   deployment: Deployment;

apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-channel-drawer/Overview.tsx

@@ -38,7 +38,7 @@ import { useReleaseFilter } from "../release-condition/useReleaseFilter";
 import { ReleaseBadgeList } from "../ReleaseBadgeList";
 
 type OverviewProps = {
-  releaseChannel: SCHEMA.ReleaseChannel;
+  releaseChannel: SCHEMA.DeploymentVersionChannel;
 };
 
 const getFinalFilter = (filter: ReleaseCondition | null) =>

apps/webservice/src/app/[workspaceSlug]/(app)/_components/release-condition/ReleaseConditionDialog.tsx

@@ -43,7 +43,7 @@ type ReleaseConditionDialogProps = {
     condition: ReleaseCondition | null,
     releaseChannelId?: string | null,
   ) => void;
-  releaseChannels?: SCHEMA.ReleaseChannel[];
+  releaseChannels?: SCHEMA.DeploymentVersionChannel[];
   children: React.ReactNode;
 };
 

apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx

@@ -175,7 +175,7 @@ type DeploymentPageContentProps = {
   deployment: Deployment;
   environments: schema.Environment[];
   directories: { path: string; environments: schema.Environment[] }[];
-  releaseChannel: schema.ReleaseChannel | null;
+  releaseChannel: schema.DeploymentVersionChannel | null;
 };
 
 export const DeploymentPageContent: React.FC<DeploymentPageContentProps> = ({

apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx

@@ -15,7 +15,7 @@ import {
 import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer";
 import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge";
 
-type ReleaseChannel = SCHEMA.ReleaseChannel & { total: number };
+type ReleaseChannel = SCHEMA.DeploymentVersionChannel & { total: number };
 
 type ReleaseChannelTableProps = { releaseChannels: ReleaseChannel[] };
 

apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Overview.tsx

@@ -38,7 +38,7 @@ import { ReleaseBadgeList } from "~/app/[workspaceSlug]/(appv2)/_components/rele
 import { api } from "~/trpc/react";
 
 type OverviewProps = {
-  releaseChannel: SCHEMA.ReleaseChannel;
+  releaseChannel: SCHEMA.DeploymentVersionChannel;
 };
 
 const getFinalFilter = (filter: ReleaseCondition | null) =>

apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog.tsx

@@ -43,7 +43,7 @@ type ReleaseConditionDialogProps = {
     condition: ReleaseCondition | null,
     releaseChannelId?: string | null,
   ) => void;
-  releaseChannels?: SCHEMA.ReleaseChannel[];
+  releaseChannels?: SCHEMA.DeploymentVersionChannel[];
   children: React.ReactNode;
 };
 

apps/webservice/src/app/api/v1/deployments/[deploymentId]/release-channels/name/[name]/route.ts

@@ -20,11 +20,14 @@ export const DELETE = request()
     async (ctx, { params }) => {
       try {
         await ctx.db
-          .delete(schema.releaseChannel)
+          .delete(schema.deploymentVersionChannel)
           .where(
             and(
-              eq(schema.releaseChannel.deploymentId, params.deploymentId),
-              eq(schema.releaseChannel.name, params.name),
+              eq(
+                schema.deploymentVersionChannel.deploymentId,
+                params.deploymentId,
+              ),
+              eq(schema.deploymentVersionChannel.name, params.name),
             ),
           );
 

apps/webservice/src/app/api/v1/environments/route.ts

@@ -52,8 +52,8 @@ export const POST = request()
 
           const channels = await tx
             .select()
-            .from(schema.releaseChannel)
-            .where(inArray(schema.releaseChannel.id, releaseChannels))
+            .from(schema.deploymentVersionChannel)
+            .where(inArray(schema.deploymentVersionChannel.id, releaseChannels))
             .then((rows) =>
               _.uniqBy(rows, (r) => r.deploymentId).map((r) => ({
                 channelId: r.id,

apps/webservice/src/app/api/v1/release-channels/route.ts

@@ -2,7 +2,7 @@ import type { z } from "zod";
 import { NextResponse } from "next/server";
 
 import { and, eq, takeFirst, takeFirstOrNull } from "@ctrlplane/db";
-import { createReleaseChannel } from "@ctrlplane/db/schema";
+import { createDeploymentVersionChannel } from "@ctrlplane/db/schema";
 import * as SCHEMA from "@ctrlplane/db/schema";
 import { Permission } from "@ctrlplane/validators/auth";
 
@@ -12,23 +12,23 @@ import { request } from "../middleware";
 
 export const POST = request()
   .use(authn)
-  .use(parseBody(createReleaseChannel))
+  .use(parseBody(createDeploymentVersionChannel))
   .use(
     authz(({ ctx, can }) =>
       can
         .perform(Permission.ReleaseChannelCreate)
         .on({ type: "deployment", id: ctx.body.deploymentId }),
     ),
   )
-  .handle<{ body: z.infer<typeof createReleaseChannel> }>(
+  .handle<{ body: z.infer<typeof createDeploymentVersionChannel> }>(
     async ({ db, body }) => {
       const releaseChannel = await db
         .select()
-        .from(SCHEMA.releaseChannel)
+        .from(SCHEMA.deploymentVersionChannel)
         .where(
           and(
-            eq(SCHEMA.releaseChannel.deploymentId, body.deploymentId),
-            eq(SCHEMA.releaseChannel.name, body.name),
+            eq(SCHEMA.deploymentVersionChannel.deploymentId, body.deploymentId),
+            eq(SCHEMA.deploymentVersionChannel.name, body.name),
           ),
         )
         .then(takeFirstOrNull);
@@ -40,7 +40,7 @@ export const POST = request()
         );
 
       return db
-        .insert(SCHEMA.releaseChannel)
+        .insert(SCHEMA.deploymentVersionChannel)
         .values(body)
         .returning()
         .then(takeFirst)

packages/api/src/router/deployment-version.ts

@@ -254,18 +254,19 @@ export const versionRouter = createTRPCRouter({
     .query(async ({ input }) => {
       const policyRCSubquery = db
         .select({
-          releaseChannelId: SCHEMA.releaseChannel.id,
+          releaseChannelId: SCHEMA.deploymentVersionChannel.id,
           releaseChannelPolicyId:
             SCHEMA.environmentPolicyReleaseChannel.policyId,
-          releaseChannelDeploymentId: SCHEMA.releaseChannel.deploymentId,
-          releaseChannelFilter: SCHEMA.releaseChannel.releaseFilter,
+          releaseChannelDeploymentId:
+            SCHEMA.deploymentVersionChannel.deploymentId,
+          releaseChannelFilter: SCHEMA.deploymentVersionChannel.releaseFilter,
         })
         .from(SCHEMA.environmentPolicyReleaseChannel)
         .innerJoin(
-          SCHEMA.releaseChannel,
+          SCHEMA.deploymentVersionChannel,
           eq(
             SCHEMA.environmentPolicyReleaseChannel.channelId,
-            SCHEMA.releaseChannel.id,
+            SCHEMA.deploymentVersionChannel.id,
           ),
         )
         .as("policyRCSubquery");
@@ -588,10 +589,10 @@ export const versionRouter = createTRPCRouter({
             ),
           )
           .leftJoin(
-            SCHEMA.releaseChannel,
+            SCHEMA.deploymentVersionChannel,
             eq(
               SCHEMA.environmentPolicyReleaseChannel.channelId,
-              SCHEMA.releaseChannel.id,
+              SCHEMA.deploymentVersionChannel.id,
             ),
           )
           .where(eq(SCHEMA.environment.id, environmentId))

packages/api/src/router/deployment.ts

@@ -29,7 +29,7 @@ import { versionRouter } from "./deployment-version";
 
 const releaseChannelRouter = createTRPCRouter({
   create: protectedProcedure
-    .input(SCHEMA.createReleaseChannel)
+    .input(SCHEMA.createDeploymentVersionChannel)
     .meta({
       authorizationCheck: ({ canUser, input }) =>
         canUser.perform(Permission.ReleaseChannelCreate).on({
@@ -38,12 +38,15 @@ const releaseChannelRouter = createTRPCRouter({
         }),
     })
     .mutation(({ ctx, input }) =>
-      ctx.db.insert(SCHEMA.releaseChannel).values(input).returning(),
+      ctx.db.insert(SCHEMA.deploymentVersionChannel).values(input).returning(),
     ),
 
   update: protectedProcedure
     .input(
-      z.object({ id: z.string().uuid(), data: SCHEMA.updateReleaseChannel }),
+      z.object({
+        id: z.string().uuid(),
+        data: SCHEMA.updateDeploymentVersionChannel,
+      }),
     )
     .meta({
       authorizationCheck: ({ canUser, input }) =>
@@ -53,9 +56,9 @@ const releaseChannelRouter = createTRPCRouter({
     })
     .mutation(({ ctx, input }) =>
       ctx.db
-        .update(SCHEMA.releaseChannel)
+        .update(SCHEMA.deploymentVersionChannel)
         .set(input.data)
-        .where(eq(SCHEMA.releaseChannel.id, input.id))
+        .where(eq(SCHEMA.deploymentVersionChannel.id, input.id))
         .returning(),
     ),
 
@@ -69,8 +72,8 @@ const releaseChannelRouter = createTRPCRouter({
     })
     .mutation(({ ctx, input }) =>
       ctx.db
-        .delete(SCHEMA.releaseChannel)
-        .where(eq(SCHEMA.releaseChannel.id, input)),
+        .delete(SCHEMA.deploymentVersionChannel)
+        .where(eq(SCHEMA.deploymentVersionChannel.id, input)),
     ),
 
   list: createTRPCRouter({
@@ -85,8 +88,8 @@ const releaseChannelRouter = createTRPCRouter({
       .query(async ({ ctx, input }) => {
         const channels = await ctx.db
           .select()
-          .from(SCHEMA.releaseChannel)
-          .where(eq(SCHEMA.releaseChannel.deploymentId, input));
+          .from(SCHEMA.deploymentVersionChannel)
+          .where(eq(SCHEMA.deploymentVersionChannel.deploymentId, input));
 
         const promises = channels.map(async (channel) => {
           const filter = channel.releaseFilter ?? undefined;
@@ -116,8 +119,8 @@ const releaseChannelRouter = createTRPCRouter({
           .on({ type: "releaseChannel", id: input }),
     })
     .query(async ({ ctx, input }) => {
-      const rc = await ctx.db.query.releaseChannel.findFirst({
-        where: eq(SCHEMA.releaseChannel.id, input),
+      const rc = await ctx.db.query.deploymentVersionChannel.findFirst({
+        where: eq(SCHEMA.deploymentVersionChannel.id, input),
         with: {
           environmentPolicyReleaseChannels: {
             with: { environmentPolicy: true },
@@ -530,8 +533,11 @@ export const deploymentRouter = createTRPCRouter({
           eq(SCHEMA.jobAgent.id, SCHEMA.deployment.jobAgentId),
         )
         .leftJoin(
-          SCHEMA.releaseChannel,
-          eq(SCHEMA.releaseChannel.deploymentId, SCHEMA.deployment.id),
+          SCHEMA.deploymentVersionChannel,
+          eq(
+            SCHEMA.deploymentVersionChannel.deploymentId,
+            SCHEMA.deployment.id,
+          ),
         )
         .where(
           and(
@@ -567,8 +573,11 @@ export const deploymentRouter = createTRPCRouter({
         .select()
         .from(SCHEMA.deployment)
         .leftJoin(
-          SCHEMA.releaseChannel,
-          eq(SCHEMA.releaseChannel.deploymentId, SCHEMA.deployment.id),
+          SCHEMA.deploymentVersionChannel,
+          eq(
+            SCHEMA.deploymentVersionChannel.deploymentId,
+            SCHEMA.deployment.id,
+          ),
         )
         .innerJoin(
           SCHEMA.system,

packages/api/src/router/environment-policy.ts

@@ -14,12 +14,12 @@ import {
 import {
   createEnvironmentPolicy,
   createEnvironmentPolicyDeployment,
+  deploymentVersionChannel,
   environment,
   environmentPolicy,
   environmentPolicyDeployment,
   environmentPolicyReleaseChannel,
   environmentPolicyReleaseWindow,
-  releaseChannel,
   updateEnvironmentPolicy,
 } from "@ctrlplane/db/schema";
 import { handleEnvironmentPolicyReleaseChannelUpdate } from "@ctrlplane/job-dispatch";
@@ -37,8 +37,11 @@ const basePolicyQuery = (db: Tx) =>
       eq(environmentPolicyReleaseChannel.policyId, environmentPolicy.id),
     )
     .leftJoin(
-      releaseChannel,
-      eq(environmentPolicyReleaseChannel.channelId, releaseChannel.id),
+      deploymentVersionChannel,
+      eq(
+        environmentPolicyReleaseChannel.channelId,
+        deploymentVersionChannel.id,
+      ),
     )
     .leftJoin(
       environmentPolicyReleaseWindow,

packages/api/src/router/environment.ts

@@ -16,12 +16,12 @@ import {
 } from "@ctrlplane/db";
 import {
   createEnvironment,
+  deploymentVersionChannel,
   environment,
   environmentMetadata,
   environmentPolicy,
   environmentPolicyReleaseChannel,
   environmentPolicyReleaseWindow,
-  releaseChannel,
   resource,
   resourceMatchesMetadata,
   system,
@@ -58,16 +58,19 @@ export const environmentRouter = createTRPCRouter({
       const policyRCSubquery = ctx.db
         .select({
           releaseChannelPolicyId: environmentPolicyReleaseChannel.policyId,
-          releaseChannelDeploymentId: releaseChannel.deploymentId,
-          releaseChannelDescription: releaseChannel.description,
-          releaseChannelFilter: releaseChannel.releaseFilter,
-          releaseChannelId: releaseChannel.id,
-          releaseChannelName: releaseChannel.name,
+          releaseChannelDeploymentId: deploymentVersionChannel.deploymentId,
+          releaseChannelDescription: deploymentVersionChannel.description,
+          releaseChannelFilter: deploymentVersionChannel.releaseFilter,
+          releaseChannelId: deploymentVersionChannel.id,
+          releaseChannelName: deploymentVersionChannel.name,
         })
         .from(environmentPolicyReleaseChannel)
         .innerJoin(
-          releaseChannel,
-          eq(environmentPolicyReleaseChannel.channelId, releaseChannel.id),
+          deploymentVersionChannel,
+          eq(
+            environmentPolicyReleaseChannel.channelId,
+            deploymentVersionChannel.id,
+          ),
         )
         .as("policyRCSubquery");
 

packages/auth/src/utils/rbac.ts

@@ -13,12 +13,12 @@ import {
   deployment,
   deploymentVariable,
   deploymentVersion,
+  deploymentVersionChannel,
   entityRole,
   environment,
   environmentPolicy,
   job,
   jobAgent,
-  releaseChannel,
   releaseJobTrigger,
   resource,
   resourceMetadataGroup,
@@ -115,8 +115,11 @@ const getReleaseChannelScopes = async (id: string) => {
     .from(workspace)
     .innerJoin(system, eq(system.workspaceId, workspace.id))
     .innerJoin(deployment, eq(deployment.systemId, system.id))
-    .innerJoin(releaseChannel, eq(releaseChannel.deploymentId, deployment.id))
-    .where(eq(releaseChannel.id, id))
+    .innerJoin(
+      deploymentVersionChannel,
+      eq(deploymentVersionChannel.deploymentId, deployment.id),
+    )
+    .where(eq(deploymentVersionChannel.id, id))
     .then(takeFirst);
 
   return [