rename hook func

ctrlplanedev · Dec 5, 2024 · 028a860 · 028a860
1 parent 9572d88
commit 028a860
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/api/src/router/job.ts b/packages/api/src/router/job.ts
@@ -155,7 +155,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
             and(
               eq(schema.system.workspaceId, input.workspaceId),
               isNull(schema.resource.deletedAt),
-              schema.jobMatchesCondition(ctx.db, input.filter),
+              schema.releaseJobMatchesCondition(ctx.db, input.filter),
             ),
           )
           .orderBy(asc(schema.releaseJobTrigger.createdAt))
@@ -220,7 +220,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
             and(
               eq(schema.system.workspaceId, input.workspaceId),
               isNull(schema.resource.deletedAt),
-              schema.jobMatchesCondition(ctx.db, input.filter),
+              schema.releaseJobMatchesCondition(ctx.db, input.filter),
             ),
           )
           .then(takeFirst)
@@ -365,7 +365,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
           and(
             eq(schema.release.id, input.releaseId),
             isNull(schema.resource.deletedAt),
-            schema.jobMatchesCondition(ctx.db, input.filter),
+            schema.releaseJobMatchesCondition(ctx.db, input.filter),
           ),
         )
         .orderBy(desc(schema.releaseJobTrigger.createdAt))

diff --git a/packages/api/src/router/release.ts b/packages/api/src/router/release.ts
@@ -21,11 +21,11 @@ import {
   environmentPolicyReleaseChannel,
   environmentReleaseChannel,
   job,
-  jobMatchesCondition,
   jobMetadata,
   release,
   releaseChannel,
   releaseDependency,
+  releaseJobMatchesCondition,
   releaseJobTrigger,
   releaseMatchesCondition,
   releaseMetadata,
@@ -116,7 +116,7 @@ export const releaseRouter = createTRPCRouter({
             and(
               eq(releaseJobTrigger.resourceId, resource.id),
               isNull(resource.deletedAt),
-              jobMatchesCondition(ctx.db, input.jobFilter),
+              releaseJobMatchesCondition(ctx.db, input.jobFilter),
             ),
           )
           .where(

diff --git a/packages/db/src/schema/job.ts b/packages/db/src/schema/job.ts
@@ -227,6 +227,7 @@ const buildVersionCondition = (cond: VersionCondition): SQL => {
     return ilike(release.version, `%${cond.value}%`);
   return sql`${release.version} ~ ${cond.value}`;
 };
+
 const buildCondition = (tx: Tx, cond: JobCondition): SQL => {
   if (cond.type === FilterType.Metadata)
     return buildMetadataCondition(tx, cond);
@@ -267,7 +268,7 @@ const buildRunbookCondition = (tx: Tx, cond: JobCondition): SQL | undefined => {
   return cond.not ? not(con) : con;
 };
 
-export function jobMatchesCondition(
+export function releaseJobMatchesCondition(
   tx: Tx,
   condition?: JobCondition,
 ): SQL<unknown> | undefined {