@@ -14,44 +14,35 @@ const getReleaseTargetInsertsForSystem = async (
14
14
deployments : SCHEMA . Deployment [ ] ;
15
15
} ,
16
16
) : Promise < ReleaseTargetIdentifier [ ] > => {
17
- logger . info ( `processing system ${ system . id } - ${ system . name } ` ) ;
18
-
19
17
const envs = system . environments . filter ( ( e ) => isPresent ( e . resourceSelector ) ) ;
20
18
const { deployments } = system ;
21
19
22
20
const maybeTargetsPromises = envs . flatMap ( ( env ) =>
23
21
deployments . map ( async ( dep ) => {
24
- logger . info (
25
- `processing pair deployment ${ dep . id } - ${ dep . name } with env ${ env . id } - ${ env . name } ` ,
26
- ) ;
27
- // const resource = await db.query.resource.findFirst({
28
- // where: and(
29
- // eq(SCHEMA.resource.id, resourceId),
30
- // SCHEMA.resourceMatchesMetadata(db, env.resourceSelector),
31
- // SCHEMA.resourceMatchesMetadata(db, dep.resourceSelector),
32
- // ),
33
- // });
22
+ const resource = await db . query . resource . findFirst ( {
23
+ where : and (
24
+ eq ( SCHEMA . resource . id , resourceId ) ,
25
+ SCHEMA . resourceMatchesMetadata ( db , env . resourceSelector ) ,
26
+ SCHEMA . resourceMatchesMetadata ( db , dep . resourceSelector ) ,
27
+ ) ,
28
+ } ) ;
34
29
35
- // if (resource == null) return null;
36
- // return { environmentId: env.id, deploymentId: dep.id };
30
+ if ( resource == null ) return null ;
31
+ return { environmentId : env . id , deploymentId : dep . id } ;
37
32
} ) ,
38
33
) ;
39
34
40
- return [ ] ;
41
-
42
- // const targets = await Promise.all(maybeTargetsPromises).then((results) =>
43
- // results.filter(isPresent),
44
- // );
35
+ const targets = await Promise . all ( maybeTargetsPromises ) . then ( ( results ) =>
36
+ results . filter ( isPresent ) ,
37
+ ) ;
45
38
46
- // return targets.map((t) => ({ ...t, resourceId }));
39
+ return targets . map ( ( t ) => ( { ...t , resourceId } ) ) ;
47
40
} ;
48
41
49
42
export const upsertReleaseTargets = async (
50
43
db : Tx ,
51
44
resource : SCHEMA . Resource ,
52
45
) => {
53
- logger . info ( `Upserting release targets for resource ${ resource . id } ` ) ;
54
-
55
46
const workspace = await db . query . workspace . findFirst ( {
56
47
where : eq ( SCHEMA . workspace . id , resource . workspaceId ) ,
57
48
with : { systems : { with : { environments : true , deployments : true } } } ,
@@ -62,9 +53,7 @@ export const upsertReleaseTargets = async (
62
53
workspace . systems . map ( ( system ) =>
63
54
getReleaseTargetInsertsForSystem ( db , resource . id , system ) ,
64
55
) ,
65
- ) ;
66
-
67
- // .then((results) => results.flat());
56
+ ) . then ( ( results ) => results . flat ( ) ) ;
68
57
69
58
// if (releaseTargetInserts.length === 0) return [];
70
59
// return db
0 commit comments