@@ -519,26 +519,52 @@ export const versionRouter = createTRPCRouter({
519519 } ) ,
520520 } )
521521 . query ( ( { input : { versionId, environmentId } } ) =>
522+ // db
523+ // .selectDistinctOn([SCHEMA.releaseJobTrigger.resourceId])
524+ // .from(SCHEMA.job)
525+ // .innerJoin(
526+ // SCHEMA.releaseJobTrigger,
527+ // eq(SCHEMA.job.id, SCHEMA.releaseJobTrigger.jobId),
528+ // )
529+ // .innerJoin(
530+ // SCHEMA.resource,
531+ // eq(SCHEMA.releaseJobTrigger.resourceId, SCHEMA.resource.id),
532+ // )
533+ // .orderBy(
534+ // SCHEMA.releaseJobTrigger.resourceId,
535+ // desc(SCHEMA.job.createdAt),
536+ // )
537+ // .where(
538+ // and(
539+ // eq(SCHEMA.releaseJobTrigger.versionId, versionId),
540+ // eq(SCHEMA.releaseJobTrigger.environmentId, environmentId),
541+ // isNull(SCHEMA.resource.deletedAt),
542+ // ),
543+ // ),
544+
522545 db
523- . selectDistinctOn ( [ SCHEMA . releaseJobTrigger . resourceId ] )
546+ . selectDistinctOn ( [ SCHEMA . releaseTarget . resourceId ] )
524547 . from ( SCHEMA . job )
525548 . innerJoin (
526- SCHEMA . releaseJobTrigger ,
527- eq ( SCHEMA . job . id , SCHEMA . releaseJobTrigger . jobId ) ,
549+ SCHEMA . releaseJob ,
550+ eq ( SCHEMA . job . id , SCHEMA . releaseJob . jobId ) ,
528551 )
529552 . innerJoin (
530- SCHEMA . resource ,
531- eq ( SCHEMA . releaseJobTrigger . resourceId , SCHEMA . resource . id ) ,
553+ SCHEMA . release ,
554+ eq ( SCHEMA . releaseJob . releaseId , SCHEMA . release . id ) ,
532555 )
533- . orderBy (
534- SCHEMA . releaseJobTrigger . resourceId ,
535- desc ( SCHEMA . job . createdAt ) ,
556+ . innerJoin (
557+ SCHEMA . versionRelease ,
558+ eq ( SCHEMA . release . versionReleaseId , SCHEMA . versionRelease . id ) ,
559+ )
560+ . innerJoin (
561+ SCHEMA . releaseTarget ,
562+ eq ( SCHEMA . versionRelease . releaseTargetId , SCHEMA . releaseTarget . id ) ,
536563 )
537564 . where (
538565 and (
539- eq ( SCHEMA . releaseJobTrigger . versionId , versionId ) ,
540- eq ( SCHEMA . releaseJobTrigger . environmentId , environmentId ) ,
541- isNull ( SCHEMA . resource . deletedAt ) ,
566+ eq ( SCHEMA . releaseTarget . environmentId , environmentId ) ,
567+ eq ( SCHEMA . versionRelease . versionId , versionId ) ,
542568 ) ,
543569 ) ,
544570 ) ,
0 commit comments