fix: Break out release channel into subquery

ctrlplanedev · Feb 28, 2025 · b92854e · b92854e
1 parent bf81f69
commit b92854e
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/packages/job-dispatch/src/policies/release-sequencing.ts b/packages/job-dispatch/src/policies/release-sequencing.ts
@@ -85,6 +85,24 @@ const isReleaseLatestActiveForEnvironment = async (
   release: schema.Release,
   environmentId: string,
 ) => {
+  const releaseChannelSubquery = db
+    .select()
+    .from(schema.environmentPolicyReleaseChannel)
+    .innerJoin(
+      schema.releaseChannel,
+      eq(
+        schema.environmentPolicyReleaseChannel.channelId,
+        schema.releaseChannel.id,
+      ),
+    )
+    .where(
+      eq(
+        schema.environmentPolicyReleaseChannel.deploymentId,
+        release.deploymentId,
+      ),
+    )
+    .as("release_channel");
+
   const environment = await db
     .select()
     .from(schema.environment)
@@ -93,20 +111,10 @@ const isReleaseLatestActiveForEnvironment = async (
       eq(schema.environment.policyId, schema.environmentPolicy.id),
     )
     .leftJoin(
-      schema.environmentPolicyReleaseChannel,
+      releaseChannelSubquery,
       eq(
-        schema.environmentPolicyReleaseChannel.policyId,
         schema.environmentPolicy.id,
-      ),
-    )
-    .leftJoin(
-      schema.releaseChannel,
-      and(
-        eq(
-          schema.environmentPolicyReleaseChannel.channelId,
-          schema.releaseChannel.id,
-        ),
-        eq(schema.releaseChannel.deploymentId, release.deploymentId),
+        releaseChannelSubquery.environment_policy_release_channel.policyId,
       ),
     )
     .where(eq(schema.environment.id, environmentId))
@@ -144,7 +152,7 @@ const isReleaseLatestActiveForEnvironment = async (
         eq(schema.releaseJobTrigger.environmentId, environmentId),
         schema.releaseMatchesCondition(
           db,
-          environment.release_channel?.releaseFilter,
+          environment.release_channel?.release_channel.releaseFilter,
         ),
       ),
     )