Skip to content

fix: Trigger releaseId -> versionId refactor #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2025
Merged

fix: Trigger releaseId -> versionId refactor #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c5d3e7
fix: Trigger releaseId -> versionId refactor
adityachoudhari26 Mar 12, 2025
7db642f
format
adityachoudhari26 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/event-worker/src/job-dispatch/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const getReleaseJobAgentConfig = (jobId: string) =>
.from(SCHEMA.deploymentVersion)
.innerJoin(
SCHEMA.releaseJobTrigger,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.where(eq(SCHEMA.releaseJobTrigger.jobId, jobId))
.then(takeFirstOrNull)
Expand Down
2 changes: 1 addition & 1 deletion apps/jobs/src/policy-checker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const run = async () => {
),
eq(
schema.environmentPolicyApproval.releaseId,
schema.releaseJobTrigger.releaseId,
schema.releaseJobTrigger.versionId,
),
),
)
Expand Down
2 changes: 1 addition & 1 deletion apps/jobs/src/timeout-checker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const run = async () =>
)
.innerJoin(
SCHEMA.releaseJobTrigger,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.innerJoin(SCHEMA.job, eq(SCHEMA.releaseJobTrigger.jobId, SCHEMA.job.id))
.where(
Expand Down
2 changes: 1 addition & 1 deletion apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const ReleaseCell: React.FC<{
const params = useParams<{ workspaceSlug: string; systemSlug: string }>();
return (
<Link
href={`/${params.workspaceSlug}/systems/${params.systemSlug}/deployments/${deployment.slug}/releases/${releaseJobTrigger.releaseId}`}
href={`/${params.workspaceSlug}/systems/${params.systemSlug}/deployments/${deployment.slug}/releases/${releaseJobTrigger.versionId}`}
className="flex items-center gap-2"
>
<ReleaseIcon job={releaseJobTrigger.job} />
Expand Down
2 changes: 1 addition & 1 deletion apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const GET = async (
)
.leftJoin(
SCHEMA.deploymentVersion,
eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.releaseId),
eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.versionId),
)
.leftJoin(
SCHEMA.releaseMetadata,
Expand Down
2 changes: 1 addition & 1 deletion apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const GET = request()
)
.leftJoin(
schema.deploymentVersion,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.leftJoin(
schema.deployment,
Expand Down
6 changes: 3 additions & 3 deletions packages/api/src/router/deployment-stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export const deploymentStatsRouter = createTRPCRouter({
)
.leftJoin(
schema.releaseJobTrigger,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.leftJoin(schema.job, eq(schema.job.id, schema.releaseJobTrigger.jobId))
.innerJoin(
Expand Down Expand Up @@ -243,7 +243,7 @@ export const deploymentStatsRouter = createTRPCRouter({
)
.innerJoin(
schema.deploymentVersion,
eq(schema.deploymentVersion.id, schema.releaseJobTrigger.releaseId),
eq(schema.deploymentVersion.id, schema.releaseJobTrigger.versionId),
)
.innerJoin(
schema.deployment,
Expand Down Expand Up @@ -298,7 +298,7 @@ export const deploymentStatsRouter = createTRPCRouter({
)
.innerJoin(
schema.deploymentVersion,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.where(
and(
Expand Down
8 changes: 4 additions & 4 deletions packages/api/src/router/deployment-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ export const versionRouter = createTRPCRouter({
)
.where(
and(
eq(SCHEMA.releaseJobTrigger.releaseId, releaseId),
eq(SCHEMA.releaseJobTrigger.versionId, releaseId),
eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
isNull(SCHEMA.resource.deletedAt),
),
Expand Down Expand Up @@ -440,7 +440,7 @@ export const versionRouter = createTRPCRouter({
)
.innerJoin(
SCHEMA.deploymentVersion,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.orderBy(
SCHEMA.releaseJobTrigger.resourceId,
Expand Down Expand Up @@ -487,7 +487,7 @@ export const versionRouter = createTRPCRouter({
.where(
and(
eq(
SCHEMA.releaseJobTrigger.releaseId,
SCHEMA.releaseJobTrigger.versionId,
SCHEMA.deploymentVersion.id,
),
eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
Expand All @@ -511,7 +511,7 @@ export const versionRouter = createTRPCRouter({
.where(
and(
eq(
SCHEMA.releaseJobTrigger.releaseId,
SCHEMA.releaseJobTrigger.versionId,
SCHEMA.deploymentVersion.id,
),
eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/router/deployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ export const deploymentRouter = createTRPCRouter({
)
.innerJoin(
SCHEMA.deploymentVersion,
eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.releaseId),
eq(SCHEMA.deploymentVersion.id, SCHEMA.releaseJobTrigger.versionId),
)
.innerJoin(
SCHEMA.resource,
Expand Down Expand Up @@ -652,7 +652,7 @@ export const deploymentRouter = createTRPCRouter({
and(
eq(SCHEMA.releaseJobTrigger.resourceId, SCHEMA.resource.id),
eq(
SCHEMA.releaseJobTrigger.releaseId,
SCHEMA.releaseJobTrigger.versionId,
SCHEMA.deploymentVersion.id,
),
eq(
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/router/environment-approval.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const approvalRouter = createTRPCRouter({
)
.innerJoin(
SCHEMA.deploymentVersion,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.where(
and(
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/router/environment-stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const environmentStatsRouter = createTRPCRouter({
)
.innerJoin(
SCHEMA.deploymentVersion,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.innerJoin(
SCHEMA.deployment,
Expand Down
10 changes: 5 additions & 5 deletions packages/api/src/router/job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const releaseJobTriggerQuery = (tx: Tx) =>
)
.innerJoin(
schema.deploymentVersion,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.innerJoin(
schema.deployment,
Expand Down Expand Up @@ -230,7 +230,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
)
.innerJoin(
schema.deploymentVersion,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.innerJoin(
schema.deployment,
Expand Down Expand Up @@ -350,7 +350,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
)
.innerJoin(
schema.deploymentVersion,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.where(
and(
Expand Down Expand Up @@ -457,7 +457,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
)
.where(
and(
eq(schema.releaseJobTrigger.releaseId, input.releaseId),
eq(schema.releaseJobTrigger.versionId, input.releaseId),
eq(schema.releaseJobTrigger.environmentId, input.environmentId),
),
)
Expand Down Expand Up @@ -782,7 +782,7 @@ const metadataKeysRouter = createTRPCRouter({
.from(schema.deploymentVersion)
.innerJoin(
schema.releaseJobTrigger,
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
)
.innerJoin(
schema.job,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/router/resource-stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const healthRouter = createTRPCRouter({
.from(SCHEMA.deploymentVersion)
.innerJoin(
SCHEMA.releaseJobTrigger,
eq(SCHEMA.releaseJobTrigger.releaseId, SCHEMA.deploymentVersion.id),
eq(SCHEMA.releaseJobTrigger.versionId, SCHEMA.deploymentVersion.id),
)
.innerJoin(
SCHEMA.job,
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/router/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const latestActiveReleaseByResourceAndEnvironmentId = (
.from(schema.deploymentVersion)
.innerJoin(
schema.releaseJobTrigger,
eq(schema.deploymentVersion.id, schema.releaseJobTrigger.releaseId),
eq(schema.deploymentVersion.id, schema.releaseJobTrigger.versionId),
)
.as("rank_subquery");

Expand All @@ -123,7 +123,7 @@ const latestActiveReleaseByResourceAndEnvironmentId = (
.innerJoin(
schema.releaseJobTrigger,
and(
eq(schema.releaseJobTrigger.releaseId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.versionId, schema.deploymentVersion.id),
eq(schema.releaseJobTrigger.environmentId, schema.environment.id),
),
)
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/src/utils/rbac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ const getJobScopes = async (id: string) => {
.innerJoin(environment, eq(releaseJobTrigger.environmentId, environment.id))
.innerJoin(
deploymentVersion,
eq(releaseJobTrigger.releaseId, deploymentVersion.id),
eq(releaseJobTrigger.versionId, deploymentVersion.id),
)
.innerJoin(deployment, eq(deploymentVersion.deploymentId, deployment.id))
.innerJoin(system, eq(deployment.systemId, system.id))
Expand Down
Loading
Loading