@knpkv/codecommit-core 0.14.0 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CacheService/Database.d.ts +1 -1
- package/dist/CacheService/Database.d.ts.map +1 -1
- package/dist/CacheService/Database.js +10 -2
- package/dist/CacheService/Database.js.map +1 -1
- package/dist/CacheService/diff.d.ts +5 -2
- package/dist/CacheService/diff.d.ts.map +1 -1
- package/dist/CacheService/diff.js +31 -13
- package/dist/CacheService/diff.js.map +1 -1
- package/dist/CacheService/migrations/0017_sandbox_region.d.ts +5 -0
- package/dist/CacheService/migrations/0017_sandbox_region.d.ts.map +1 -0
- package/dist/CacheService/migrations/0017_sandbox_region.js +4 -0
- package/dist/CacheService/migrations/0017_sandbox_region.js.map +1 -0
- package/dist/CacheService/migrations/0018_pull_request_coordinates.d.ts +6 -0
- package/dist/CacheService/migrations/0018_pull_request_coordinates.d.ts.map +1 -0
- package/dist/CacheService/migrations/0018_pull_request_coordinates.js +82 -0
- package/dist/CacheService/migrations/0018_pull_request_coordinates.js.map +1 -0
- package/dist/CacheService/migrations/0019_dependent_pr_coordinates.d.ts +6 -0
- package/dist/CacheService/migrations/0019_dependent_pr_coordinates.d.ts.map +1 -0
- package/dist/CacheService/migrations/0019_dependent_pr_coordinates.js +57 -0
- package/dist/CacheService/migrations/0019_dependent_pr_coordinates.js.map +1 -0
- package/dist/CacheService/migrations/0020_notification_coordinates.d.ts +6 -0
- package/dist/CacheService/migrations/0020_notification_coordinates.d.ts.map +1 -0
- package/dist/CacheService/migrations/0020_notification_coordinates.js +22 -0
- package/dist/CacheService/migrations/0020_notification_coordinates.js.map +1 -0
- package/dist/CacheService/repos/CommentRepo.d.ts +6 -2
- package/dist/CacheService/repos/CommentRepo.d.ts.map +1 -1
- package/dist/CacheService/repos/CommentRepo.js +46 -7
- package/dist/CacheService/repos/CommentRepo.js.map +1 -1
- package/dist/CacheService/repos/NotificationRepo.d.ts +2 -0
- package/dist/CacheService/repos/NotificationRepo.d.ts.map +1 -1
- package/dist/CacheService/repos/NotificationRepo.js +10 -3
- package/dist/CacheService/repos/NotificationRepo.js.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/index.d.ts +42 -7
- package/dist/CacheService/repos/PullRequestRepo/index.d.ts.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/index.js +2 -0
- package/dist/CacheService/repos/PullRequestRepo/index.js.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/mutations.d.ts +9 -5
- package/dist/CacheService/repos/PullRequestRepo/mutations.d.ts.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/mutations.js +61 -17
- package/dist/CacheService/repos/PullRequestRepo/mutations.js.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/queries.d.ts +48 -4
- package/dist/CacheService/repos/PullRequestRepo/queries.d.ts.map +1 -1
- package/dist/CacheService/repos/PullRequestRepo/queries.js +40 -5
- package/dist/CacheService/repos/PullRequestRepo/queries.js.map +1 -1
- package/dist/CacheService/repos/SandboxRepo.d.ts +45 -1
- package/dist/CacheService/repos/SandboxRepo.d.ts.map +1 -1
- package/dist/CacheService/repos/SandboxRepo.js +53 -8
- package/dist/CacheService/repos/SandboxRepo.js.map +1 -1
- package/dist/CacheService/repos/StatsRepo/index.d.ts +3 -0
- package/dist/CacheService/repos/StatsRepo/index.d.ts.map +1 -1
- package/dist/CacheService/repos/StatsRepo/internal.d.ts +6 -0
- package/dist/CacheService/repos/StatsRepo/internal.d.ts.map +1 -1
- package/dist/CacheService/repos/StatsRepo/internal.js +5 -5
- package/dist/CacheService/repos/StatsRepo/internal.js.map +1 -1
- package/dist/CacheService/repos/StatsRepo/queries.d.ts +1 -0
- package/dist/CacheService/repos/StatsRepo/queries.d.ts.map +1 -1
- package/dist/CacheService/repos/StatsRepo/queries.js +5 -4
- package/dist/CacheService/repos/StatsRepo/queries.js.map +1 -1
- package/dist/CacheService/repos/StatsRepo/reviewerData.d.ts +2 -0
- package/dist/CacheService/repos/StatsRepo/reviewerData.d.ts.map +1 -1
- package/dist/CacheService/repos/StatsRepo/reviewerData.js +38 -15
- package/dist/CacheService/repos/StatsRepo/reviewerData.js.map +1 -1
- package/dist/CacheService/repos/SubscriptionRepo.d.ts +11 -5
- package/dist/CacheService/repos/SubscriptionRepo.d.ts.map +1 -1
- package/dist/CacheService/repos/SubscriptionRepo.js +106 -12
- package/dist/CacheService/repos/SubscriptionRepo.js.map +1 -1
- package/dist/ChildEnv.d.ts.map +1 -1
- package/dist/ChildEnv.js +1 -0
- package/dist/ChildEnv.js.map +1 -1
- package/dist/Domain.d.ts +1 -0
- package/dist/Domain.d.ts.map +1 -1
- package/dist/Domain.js +1 -0
- package/dist/Domain.js.map +1 -1
- package/dist/PRService/index.d.ts +15 -8
- package/dist/PRService/index.d.ts.map +1 -1
- package/dist/PRService/index.js +5 -5
- package/dist/PRService/index.js.map +1 -1
- package/dist/PRService/refreshDiffs.d.ts.map +1 -1
- package/dist/PRService/refreshDiffs.js +12 -3
- package/dist/PRService/refreshDiffs.js.map +1 -1
- package/dist/PRService/refreshEnrich.d.ts.map +1 -1
- package/dist/PRService/refreshEnrich.js +28 -11
- package/dist/PRService/refreshEnrich.js.map +1 -1
- package/dist/PRService/refreshFetch.d.ts.map +1 -1
- package/dist/PRService/refreshFetch.js +25 -13
- package/dist/PRService/refreshFetch.js.map +1 -1
- package/dist/PRService/refreshHistory.d.ts +1 -1
- package/dist/PRService/refreshHistory.d.ts.map +1 -1
- package/dist/PRService/refreshHistory.js +6 -4
- package/dist/PRService/refreshHistory.js.map +1 -1
- package/dist/PRService/refreshResolve.d.ts +4 -1
- package/dist/PRService/refreshResolve.d.ts.map +1 -1
- package/dist/PRService/refreshResolve.js +19 -6
- package/dist/PRService/refreshResolve.js.map +1 -1
- package/dist/PRService/refreshScore.d.ts.map +1 -1
- package/dist/PRService/refreshScore.js +4 -1
- package/dist/PRService/refreshScore.js.map +1 -1
- package/dist/PRService/refreshSinglePR.d.ts +9 -2
- package/dist/PRService/refreshSinglePR.d.ts.map +1 -1
- package/dist/PRService/refreshSinglePR.js +99 -33
- package/dist/PRService/refreshSinglePR.js.map +1 -1
- package/dist/SandboxService/DockerService.d.ts +2 -0
- package/dist/SandboxService/DockerService.d.ts.map +1 -1
- package/dist/SandboxService/DockerService.js +47 -16
- package/dist/SandboxService/DockerService.js.map +1 -1
- package/dist/SandboxService/SandboxService.d.ts +4 -0
- package/dist/SandboxService/SandboxService.d.ts.map +1 -1
- package/dist/SandboxService/SandboxService.js +112 -25
- package/dist/SandboxService/SandboxService.js.map +1 -1
- package/dist/StatsService/WeeklyStats.d.ts +7 -0
- package/dist/StatsService/WeeklyStats.d.ts.map +1 -1
- package/dist/StatsService/WeeklyStats.js +3 -0
- package/dist/StatsService/WeeklyStats.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,12 +10,14 @@ import { NotificationRepo } from "../CacheService/repos/NotificationRepo.js";
|
|
|
10
10
|
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
11
11
|
import { AwsProfileName, AwsRegion } from "../Domain.js";
|
|
12
12
|
import { countAllComments } from "./internal.js";
|
|
13
|
+
import { isSubscribedForCoordinates } from "./refreshResolve.js";
|
|
13
14
|
const decodeAwsProfileName = Schema.decodeSync(AwsProfileName);
|
|
14
15
|
const decodeAwsRegion = Schema.decodeSync(AwsRegion);
|
|
15
16
|
const enrichSinglePR = (row, subscribedSnapshot) => Effect.gen(function* () {
|
|
16
17
|
const awsClient = yield* AwsClient;
|
|
17
18
|
const commentRepo = yield* CommentRepo;
|
|
18
19
|
const notificationRepo = yield* NotificationRepo;
|
|
20
|
+
const prRepo = yield* PullRequestRepo;
|
|
19
21
|
const awsAccountId = row.awsAccountId;
|
|
20
22
|
const prId = row.id;
|
|
21
23
|
const locs = yield* awsClient.getCommentsForPullRequest({
|
|
@@ -25,28 +27,43 @@ const enrichSinglePR = (row, subscribedSnapshot) => Effect.gen(function* () {
|
|
|
25
27
|
},
|
|
26
28
|
pullRequestId: prId,
|
|
27
29
|
repositoryName: row.repositoryName
|
|
28
|
-
}).pipe(Effect.catch(() => Effect.
|
|
29
|
-
if (locs && awsAccountId) {
|
|
30
|
+
}).pipe(Effect.catch(() => Effect.void.pipe(Effect.as(undefined))));
|
|
31
|
+
if (locs !== undefined && awsAccountId !== "") {
|
|
30
32
|
// Diff comments for subscribed PRs
|
|
31
|
-
|
|
32
|
-
|
|
33
|
+
const coordinates = {
|
|
34
|
+
repositoryName: row.repositoryName,
|
|
35
|
+
accountRegion: row.accountRegion
|
|
36
|
+
};
|
|
37
|
+
if (yield* isSubscribedForCoordinates(prRepo, subscribedSnapshot, awsAccountId, prId, row.repositoryName, row.accountRegion)) {
|
|
38
|
+
const cachedComments = yield* commentRepo.find(awsAccountId, prId, coordinates).pipe(Effect.catch(() => Effect.succeed(Option.none())));
|
|
33
39
|
if (Option.isSome(cachedComments)) {
|
|
34
|
-
const notifications = diffComments(cachedComments.value, locs, prId, awsAccountId);
|
|
40
|
+
const notifications = diffComments(cachedComments.value, locs, prId, awsAccountId, row.repositoryName, row.accountRegion);
|
|
35
41
|
yield* Effect.forEach(notifications, (n) => notificationRepo.add(n), { discard: true }).pipe(Effect.catch(() => Effect.void));
|
|
36
42
|
}
|
|
37
43
|
}
|
|
38
44
|
// Cache comments
|
|
39
|
-
yield* commentRepo.upsert(awsAccountId, prId, JSON.stringify(locs)).pipe(Effect.catch(() => Effect.void));
|
|
45
|
+
yield* commentRepo.upsert(awsAccountId, prId, JSON.stringify(locs), coordinates).pipe(Effect.catch(() => Effect.void));
|
|
40
46
|
}
|
|
41
47
|
// Fallback: use cached comment count from DB
|
|
42
|
-
let commentCount = locs ? countAllComments(locs) : 0;
|
|
43
|
-
if (
|
|
44
|
-
const cached = yield* commentRepo.find(awsAccountId, prId
|
|
48
|
+
let commentCount = locs !== undefined ? countAllComments(locs) : 0;
|
|
49
|
+
if (locs === undefined && awsAccountId !== "") {
|
|
50
|
+
const cached = yield* commentRepo.find(awsAccountId, prId, {
|
|
51
|
+
repositoryName: row.repositoryName,
|
|
52
|
+
accountRegion: row.accountRegion
|
|
53
|
+
}).pipe(Effect.catch(() => Effect.succeed(Option.none())));
|
|
45
54
|
if (Option.isSome(cached)) {
|
|
46
55
|
commentCount = countAllComments(cached.value);
|
|
47
56
|
}
|
|
48
57
|
}
|
|
49
|
-
return awsAccountId
|
|
58
|
+
return awsAccountId !== ""
|
|
59
|
+
? Option.some({
|
|
60
|
+
awsAccountId,
|
|
61
|
+
commentCount,
|
|
62
|
+
id: prId,
|
|
63
|
+
repositoryName: row.repositoryName,
|
|
64
|
+
accountRegion: row.accountRegion
|
|
65
|
+
})
|
|
66
|
+
: Option.none();
|
|
50
67
|
});
|
|
51
68
|
export const enrichComments = (params) => Effect.gen(function* () {
|
|
52
69
|
const prRepo = yield* PullRequestRepo;
|
|
@@ -69,7 +86,7 @@ export const enrichComments = (params) => Effect.gen(function* () {
|
|
|
69
86
|
}), { concurrency: 2 });
|
|
70
87
|
yield* Effect.forEach(enrichments, (r) => Option.match(r, {
|
|
71
88
|
onNone: () => Effect.void,
|
|
72
|
-
onSome: ({ awsAccountId, commentCount, id }) => prRepo.updateCommentCount(awsAccountId, id, commentCount).pipe(Effect.catch(() => Effect.void))
|
|
89
|
+
onSome: ({ accountRegion, awsAccountId, commentCount, id, repositoryName }) => prRepo.updateCommentCount(awsAccountId, id, commentCount, { repositoryName, accountRegion }).pipe(Effect.catch(() => Effect.void))
|
|
73
90
|
}), { discard: true });
|
|
74
91
|
// Derive commented_by from cached pr_comments
|
|
75
92
|
yield* prRepo.refreshCommentedBy().pipe(Effect.catch(() => Effect.void));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshEnrich.js","sourceRoot":"","sources":["../../src/PRService/refreshEnrich.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,SAAS,EAA0B,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAgB,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"refreshEnrich.js","sourceRoot":"","sources":["../../src/PRService/refreshEnrich.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,cAAc,EAAE,SAAS,EAA0B,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAgB,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAEhE,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;AAC9D,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AAEpD,MAAM,cAAc,GAAG,CAAC,GAAsB,EAAE,kBAA+B,EAAE,EAAE,CACjF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;IAClC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,WAAW,CAAA;IACtC,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAA;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAErC,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAA;IACrC,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAA;IAEnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC;QACtD,OAAO,EAAE;YACP,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,cAAc,CAAC;YACjD,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC;SAC3C;QACD,aAAa,EAAE,IAAI;QACnB,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAEnE,IAAI,IAAI,KAAK,SAAS,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;QAC9C,mCAAmC;QACnC,MAAM,WAAW,GAAG;YAClB,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAA;QACD,IACE,KAAK,CAAC,CAAC,0BAA0B,CAC/B,MAAM,EACN,kBAAkB,EAClB,YAAY,EACZ,IAAI,EACJ,GAAG,CAAC,cAAc,EAClB,GAAG,CAAC,aAAa,CAClB,EACD,CAAC;YACD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAClF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAoC,CAAC,CAAC,CACpF,CAAA;YACD,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAClC,MAAM,aAAa,GAAG,YAAY,CAChC,cAAc,CAAC,KAAK,EACpB,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,GAAG,CAAC,cAAc,EAClB,GAAG,CAAC,aAAa,CAClB,CAAA;gBACD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAC1F,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC,CAAA;YACH,CAAC;QACH,CAAC;QACD,iBAAiB;QACjB,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,IAAI,CACnF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC,CAAA;IACH,CAAC;IAED,6CAA6C;IAC7C,IAAI,YAAY,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAClE,IAAI,IAAI,KAAK,SAAS,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YACzD,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAoC,CAAC,CAAC,CACpF,CAAA;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,YAAY,KAAK,EAAE;QACxB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YACZ,YAAY;YACZ,YAAY;YACZ,EAAE,EAAE,IAAI;YACR,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAC;QACF,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;AACnB,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAG9B,EAA4F,EAAE,CAC7F,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAErC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;IAEvC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAA2B,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/G,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACxD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEtC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,GAAG,CAAC;QACJ,YAAY,EAAE,wBAAwB,QAAQ,CAAC,MAAM,GAAG;KACzD,CAAC,CAAC,CAAA;IAEH,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACvC,QAAQ,EACR,CAAC,GAAG,EAAE,EAAE,CACN,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;QAC7D,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5D,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,CAAC;YACJ,YAAY,EAAE,sBAAsB,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG;SAC5D,CAAC,CAAC,CAAA;QACH,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,EACJ,EAAE,WAAW,EAAE,CAAC,EAAE,CACnB,CAAA;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,WAAW,EACX,CAAC,CAAC,EAAE,EAAE,CACJ,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;QACd,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;QACzB,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAC5E,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC,IAAI,CAC/F,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC;KACJ,CAAC,EACJ,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAA;IAED,8CAA8C;IAC9C,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,IAAI,CACrC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC,CAAA;AACH,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAC/F,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshFetch.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshFetch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAS,MAAM,EAAqB,GAAG,EAA2B,MAAM,QAAQ,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAEL,eAAe,EAEhB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,KAAK,OAAO,EAAmB,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"refreshFetch.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshFetch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAS,MAAM,EAAqB,GAAG,EAA2B,MAAM,QAAQ,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAEL,eAAe,EAEhB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,KAAK,OAAO,EAAmB,MAAM,eAAe,CAAA;AA0B7D,eAAO,MAAM,iBAAiB,WAAY;IACxC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;IACtD,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1C,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;CAChC,KAAG,MAAM,CAAC,MAAM,CACf,aAAa,CAAC,uBAAuB,CAAC,EACtC,KAAK,EACL,SAAS,GAAG,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,CAqNhE,CAAA"}
|
|
@@ -13,10 +13,11 @@ import { NotificationRepo } from "../CacheService/repos/NotificationRepo.js";
|
|
|
13
13
|
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
14
14
|
import { SubscriptionRepo } from "../CacheService/repos/SubscriptionRepo.js";
|
|
15
15
|
import { prToUpsertInput } from "./internal.js";
|
|
16
|
+
import { isSubscribedForCoordinates, subscriptionKey } from "./refreshResolve.js";
|
|
16
17
|
/** Resolve a stale cached PR: retain contradictory OPEN evidence, update a definitive merged/closed status. */
|
|
17
|
-
const resolveStaleStatus = (prRepo, detail, awsAccountId, id) => detail.status === "OPEN"
|
|
18
|
+
const resolveStaleStatus = (prRepo, detail, awsAccountId, id, repositoryName, accountRegion) => detail.status === "OPEN"
|
|
18
19
|
? Effect.void
|
|
19
|
-
: prRepo.updateStatusAndClosedAt(awsAccountId, id, detail.status, detail.lastActivityDate.toISOString(), detail.mergedBy, detail.approvedBy);
|
|
20
|
+
: prRepo.updateStatusAndClosedAt(awsAccountId, id, detail.status, detail.lastActivityDate.toISOString(), detail.mergedBy, detail.approvedBy, { repositoryName, accountRegion });
|
|
20
21
|
const accountRegionKey = (profile, region) => `${profile}\0${region}`;
|
|
21
22
|
export const fetchAndUpsertPRs = (params) => Effect.gen(function* () {
|
|
22
23
|
const awsClient = yield* AwsClient;
|
|
@@ -27,7 +28,7 @@ export const fetchAndUpsertPRs = (params) => Effect.gen(function* () {
|
|
|
27
28
|
// Stale rows are safe to reconcile only when their owning list operation
|
|
28
29
|
// completed successfully. A failed account stream says nothing about which
|
|
29
30
|
// cached PRs remain open and must never turn into cache deletion.
|
|
30
|
-
const successfullyFetchedScopes = yield* Ref.make(new Set(enabledAccounts.flatMap((account) => accountIdMap.
|
|
31
|
+
const successfullyFetchedScopes = yield* Ref.make(new Set(enabledAccounts.flatMap((account) => accountIdMap.has(account.profile)
|
|
31
32
|
? (account.regions ?? []).map((region) => accountRegionKey(account.profile, region))
|
|
32
33
|
: [])));
|
|
33
34
|
const withholdScopeSuccess = (profile, region) => Ref.update(successfullyFetchedScopes, (scopes) => {
|
|
@@ -76,24 +77,29 @@ export const fetchAndUpsertPRs = (params) => Effect.gen(function* () {
|
|
|
76
77
|
yield* Stream.mergeAll(streams, { concurrency: 2 }).pipe(Stream.runForEach(({ awsAccountId, label, pr }) => Effect.gen(function* () {
|
|
77
78
|
// Diff subscribed PRs against cache
|
|
78
79
|
const subscribed = yield* Ref.get(subscribedRef);
|
|
79
|
-
if (awsAccountId
|
|
80
|
-
|
|
80
|
+
if (awsAccountId !== "" &&
|
|
81
|
+
(yield* isSubscribedForCoordinates(prRepo, subscribed, awsAccountId, pr.id, pr.repositoryName, pr.account.region))) {
|
|
82
|
+
const cached = yield* prRepo.findByCoordinates(awsAccountId, pr.id, pr.repositoryName, pr.account.region).pipe(Effect.catch(() => Effect.succeed(Option.none())));
|
|
81
83
|
if (Option.isSome(cached)) {
|
|
82
84
|
const notifications = diffPR(cached.value, prToUpsertInput(pr, awsAccountId), awsAccountId);
|
|
83
|
-
const poolNotifications = diffApprovalPools(cached.value.approvalRules ?? [], pr.approvalRules, currentUser, pr.id, awsAccountId, pr.title, pr.account.profile);
|
|
85
|
+
const poolNotifications = diffApprovalPools(cached.value.approvalRules ?? [], pr.approvalRules, currentUser, pr.id, awsAccountId, pr.title, pr.account.profile, pr.repositoryName, pr.account.region);
|
|
84
86
|
yield* Effect.forEach([...notifications, ...poolNotifications], (n) => notificationRepo.add(n), {
|
|
85
87
|
discard: true
|
|
86
88
|
}).pipe(Effect.catch(() => Effect.void));
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
// Upsert to cache + auto-subscribe current user's PRs
|
|
90
|
-
if (awsAccountId) {
|
|
92
|
+
if (awsAccountId !== "") {
|
|
91
93
|
yield* prRepo.upsert(prToUpsertInput(pr, awsAccountId)).pipe(Effect.tapError((e) => Effect.logWarning("cache upsert error", e)), Effect.catch(() => withholdScopeSuccess(pr.account.profile, pr.account.region)));
|
|
92
|
-
const isAuthor = currentUser && pr.author === currentUser;
|
|
93
|
-
const isApprover = currentUser &&
|
|
94
|
+
const isAuthor = currentUser !== undefined && currentUser !== "" && pr.author === currentUser;
|
|
95
|
+
const isApprover = currentUser !== undefined && currentUser !== "" &&
|
|
96
|
+
pr.approvalRules.some((r) => r.poolMembers.includes(currentUser));
|
|
94
97
|
if (isAuthor || isApprover) {
|
|
95
|
-
yield* subscriptionRepo.subscribe(awsAccountId, pr.id
|
|
96
|
-
|
|
98
|
+
yield* subscriptionRepo.subscribe(awsAccountId, pr.id, {
|
|
99
|
+
repositoryName: pr.repositoryName,
|
|
100
|
+
accountRegion: pr.account.region
|
|
101
|
+
}).pipe(Effect.catch(() => Effect.void));
|
|
102
|
+
yield* Ref.update(subscribedRef, (s) => new Set(s).add(subscriptionKey(awsAccountId, pr.id, pr.repositoryName, pr.account.region)));
|
|
97
103
|
}
|
|
98
104
|
}
|
|
99
105
|
else {
|
|
@@ -112,13 +118,19 @@ export const fetchAndUpsertPRs = (params) => Effect.gen(function* () {
|
|
|
112
118
|
account: { profile: pr.accountProfile, region: pr.accountRegion },
|
|
113
119
|
pullRequestId: pr.id
|
|
114
120
|
})
|
|
115
|
-
.pipe(Effect.flatMap((detail) =>
|
|
121
|
+
.pipe(Effect.flatMap((detail) => detail.repositoryName === pr.repositoryName
|
|
122
|
+
? resolveStaleStatus(prRepo, detail, pr.awsAccountId, pr.id, pr.repositoryName, pr.accountRegion)
|
|
123
|
+
: Effect.void), Effect.catch(() => withholdScopeSuccess(pr.accountProfile, pr.accountRegion).pipe(Effect.andThen(prRepo.deleteOne(pr.awsAccountId, pr.id, {
|
|
124
|
+
repositoryName: pr.repositoryName,
|
|
125
|
+
accountRegion: pr.accountRegion
|
|
126
|
+
}).pipe(Effect.catch(() => Effect.void)))))), { concurrency: 5, discard: true })), Effect.catch(() => Ref.set(successfullyFetchedScopes, new Set())));
|
|
116
127
|
// Propagate repoAccountId from any PR that has it to all PRs that don't
|
|
117
128
|
yield* prRepo.propagateRepoAccountId().pipe(Effect.catch(() => Effect.void));
|
|
118
129
|
const reconciledScopes = yield* Ref.get(successfullyFetchedScopes);
|
|
119
130
|
return enabledAccounts.flatMap((account) => (account.regions ?? []).flatMap((region) => {
|
|
120
131
|
const awsAccountId = accountIdMap.get(account.profile);
|
|
121
|
-
return awsAccountId &&
|
|
132
|
+
return awsAccountId !== undefined && awsAccountId !== "" &&
|
|
133
|
+
reconciledScopes.has(accountRegionKey(account.profile, region))
|
|
122
134
|
? [{ profile: account.profile, region, awsAccountId }]
|
|
123
135
|
: [];
|
|
124
136
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshFetch.js","sourceRoot":"","sources":["../../src/PRService/refreshFetch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAEL,eAAe,EAEhB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAG5E,OAAO,EAAgB,eAAe,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"refreshFetch.js","sourceRoot":"","sources":["../../src/PRService/refreshFetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,5 +15,5 @@ import { AwsClient } from "../AwsClient/index.js";
|
|
|
15
15
|
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
16
16
|
import { ConfigService } from "../ConfigService/index.js";
|
|
17
17
|
import { type PRState } from "./internal.js";
|
|
18
|
-
export declare const syncWeek: (state: PRState, week: string) => Effect.Effect<void,
|
|
18
|
+
export declare const syncWeek: (state: PRState, week: string) => Effect.Effect<void, import("../CacheService/CacheError.ts").CacheError | import("../AwsClient/index.js").AwsClientError, AwsClient | ConfigService | PullRequestRepo>;
|
|
19
19
|
//# sourceMappingURL=refreshHistory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshHistory.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshHistory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAwC,MAAM,QAAQ,CAAA;AACrE,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAGzD,OAAO,EAAkB,KAAK,OAAO,EAAmB,MAAM,eAAe,CAAA;AAe7E,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"refreshHistory.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshHistory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAwC,MAAM,QAAQ,CAAA;AACrE,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAGzD,OAAO,EAAkB,KAAK,OAAO,EAAmB,MAAM,eAAe,CAAA;AAe7E,eAAO,MAAM,QAAQ,yMAsKpB,CAAA"}
|
|
@@ -27,15 +27,15 @@ const emptyCachedPullRequestDomains = () => [];
|
|
|
27
27
|
export const syncWeek = Effect.fn("syncWeek")(function* (state, week) {
|
|
28
28
|
yield* Effect.gen(function* () {
|
|
29
29
|
const range = Option.getOrUndefined(parseISOWeek(week));
|
|
30
|
-
if (
|
|
30
|
+
if (range === undefined) {
|
|
31
31
|
yield* Effect.logWarning(`syncWeek: invalid week format "${week}"`);
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
const awsClient = yield* AwsClient;
|
|
35
35
|
const prRepo = yield* PullRequestRepo;
|
|
36
36
|
const configService = yield* ConfigService;
|
|
37
|
-
const config = yield* configService.load.pipe(Effect.
|
|
38
|
-
if (
|
|
37
|
+
const config = yield* configService.load.pipe(Effect.catch(() => Effect.void.pipe(Effect.as(undefined))));
|
|
38
|
+
if (config === undefined) {
|
|
39
39
|
yield* Effect.logWarning("syncWeek: no config found");
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
@@ -81,9 +81,11 @@ export const syncWeek = Effect.fn("syncWeek")(function* (state, week) {
|
|
|
81
81
|
pullRequestId: pr.id
|
|
82
82
|
})
|
|
83
83
|
.pipe(Effect.flatMap((detail) => {
|
|
84
|
+
if (detail.repositoryName !== pr.repositoryName)
|
|
85
|
+
return Effect.void;
|
|
84
86
|
if (detail.status !== "OPEN") {
|
|
85
87
|
return prRepo
|
|
86
|
-
.updateStatusAndClosedAt(pr.awsAccountId, pr.id, detail.status, detail.lastActivityDate.toISOString(), detail.mergedBy, detail.approvedBy)
|
|
88
|
+
.updateStatusAndClosedAt(pr.awsAccountId, pr.id, detail.status, detail.lastActivityDate.toISOString(), detail.mergedBy, detail.approvedBy, { repositoryName: pr.repositoryName, accountRegion: pr.accountRegion })
|
|
87
89
|
.pipe(Effect.tap(() => Ref.updateAndGet(transitionedRef, (n) => n + 1).pipe(Effect.flatMap((n) => SubscriptionRef.update(state, (s) => ({
|
|
88
90
|
...s,
|
|
89
91
|
statusDetail: `syncing ${week} — ${n} status updates`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshHistory.js","sourceRoot":"","sources":["../../src/PRService/refreshHistory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACrE,OAAO,EAAE,SAAS,EAAuB,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,OAAO,EAAE,cAAc,EAAgB,eAAe,EAAE,MAAM,eAAe,CAAA;AAI7E,MAAM,aAAa,GAAc,SAAS,CAAA;AAC1C,MAAM,UAAU,GAAc,MAAM,CAAA;AACpC,MAAM,WAAW,GAAc,OAAO,CAAA;AAEtC,MAAM,gBAAgB,GAAG,CAAC,SAAiB,EAAkB,EAAE,CAAC,CAAC;IAC/D,SAAS;IACT,QAAQ,EAAE,EAAE;CACb,CAAC,CAAA;AAEF,MAAM,6BAA6B,GAAG,GAAmC,EAAE,CAAC,EAAE,CAAA;AAE9E,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAC3C,QAAQ,CAAC,EAAC,KAAc,EAAE,IAAY;IACpC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;QACvD,IAAI,
|
|
1
|
+
{"version":3,"file":"refreshHistory.js","sourceRoot":"","sources":["../../src/PRService/refreshHistory.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,14 @@
|
|
|
5
5
|
import { Effect, Ref } from "effect";
|
|
6
6
|
import { AwsClient } from "../AwsClient/index.js";
|
|
7
7
|
import { NotificationRepo } from "../CacheService/repos/NotificationRepo.js";
|
|
8
|
-
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
8
|
+
import { PullRequestRepo, type PullRequestRepoContract } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
9
9
|
import { SubscriptionRepo } from "../CacheService/repos/SubscriptionRepo.js";
|
|
10
10
|
import { ConfigService } from "../ConfigService/index.js";
|
|
11
11
|
import type { AccountConfig } from "../ConfigService/internal.js";
|
|
12
12
|
import { type PRState } from "./internal.js";
|
|
13
|
+
export declare const subscriptionKey: (awsAccountId: string, pullRequestId: string, repositoryName?: string | null, accountRegion?: string | null) => string;
|
|
14
|
+
/** Resolve a legacy subscription only when the account/PR pair identifies one exact cached row. */
|
|
15
|
+
export declare const isSubscribedForCoordinates: (prRepo: Pick<PullRequestRepoContract, "findByAccountAndId">, subscribed: ReadonlySet<string>, awsAccountId: string, pullRequestId: string, repositoryName: string, accountRegion: string) => Effect.Effect<boolean, never>;
|
|
13
16
|
export interface ResolvedAccounts {
|
|
14
17
|
readonly enabledAccounts: ReadonlyArray<AccountConfig>;
|
|
15
18
|
readonly accountIdMap: Map<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshResolve.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshResolve.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmB,MAAM,
|
|
1
|
+
{"version":3,"file":"refreshResolve.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshResolve.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmB,MAAM,EAAU,GAAG,EAA2B,MAAM,QAAQ,CAAA;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,eAAe,EAAE,KAAK,uBAAuB,EAAE,MAAM,gDAAgD,CAAA;AAC9G,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5D,eAAO,MAAM,eAAe,iBACZ,MAAM,iBACL,MAAM,mBACJ,MAAM,GAAG,IAAI,kBACd,MAAM,GAAG,IAAI,KAC5B,MAA2F,CAAA;AAE9F,mGAAmG;AACnG,eAAO,MAAM,0BAA0B,WAC7B,IAAI,CAAC,uBAAuB,EAAE,oBAAoB,CAAC,cAC/C,WAAW,CAAC,MAAM,CAAC,gBACjB,MAAM,iBACL,MAAM,kBACL,MAAM,iBACP,MAAM,KACpB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAY9B,CAAA;AAaD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;IACtD,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1C,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CACzC;AAqCD,eAAO,MAAM,eAAe,UAAW,OAAO;;;;;;;;;0GAgF1C,CAAA"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @internal
|
|
3
3
|
* Phases 1+2: Load cached PRs, resolve config/identity/subscriptions.
|
|
4
4
|
*/
|
|
5
|
-
import { Clock, DateTime, Effect, Ref, Schema, SubscriptionRef } from "effect";
|
|
5
|
+
import { Clock, DateTime, Effect, Option, Ref, Schema, SubscriptionRef } from "effect";
|
|
6
6
|
import { AwsClient } from "../AwsClient/index.js";
|
|
7
7
|
import { NotificationRepo } from "../CacheService/repos/NotificationRepo.js";
|
|
8
8
|
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
@@ -10,6 +10,19 @@ import { SubscriptionRepo } from "../CacheService/repos/SubscriptionRepo.js";
|
|
|
10
10
|
import { ConfigService } from "../ConfigService/index.js";
|
|
11
11
|
import { AwsRegion } from "../Domain.js";
|
|
12
12
|
import { decodeCachedPR } from "./internal.js";
|
|
13
|
+
export const subscriptionKey = (awsAccountId, pullRequestId, repositoryName, accountRegion) => `${awsAccountId}:${pullRequestId}:${repositoryName ?? ""}:${accountRegion ?? ""}`;
|
|
14
|
+
/** Resolve a legacy subscription only when the account/PR pair identifies one exact cached row. */
|
|
15
|
+
export const isSubscribedForCoordinates = (prRepo, subscribed, awsAccountId, pullRequestId, repositoryName, accountRegion) => {
|
|
16
|
+
if (subscribed.has(subscriptionKey(awsAccountId, pullRequestId, repositoryName, accountRegion))) {
|
|
17
|
+
return Effect.succeed(true);
|
|
18
|
+
}
|
|
19
|
+
if (!subscribed.has(subscriptionKey(awsAccountId, pullRequestId)))
|
|
20
|
+
return Effect.succeed(false);
|
|
21
|
+
return prRepo.findByAccountAndId(awsAccountId, pullRequestId).pipe(Effect.map(Option.match({
|
|
22
|
+
onNone: () => false,
|
|
23
|
+
onSome: (row) => row.repositoryName === repositoryName && row.accountRegion === accountRegion
|
|
24
|
+
})), Effect.catch(() => Effect.succeed(false)));
|
|
25
|
+
};
|
|
13
26
|
const decodeAwsRegion = Schema.decodeSync(AwsRegion);
|
|
14
27
|
const defaultAwsRegion = decodeAwsRegion("us-east-1");
|
|
15
28
|
const emptyAwsRegion = decodeAwsRegion("");
|
|
@@ -24,8 +37,8 @@ const resolveIdentity = (accountIdRef, account, region, options) => Effect.gen(f
|
|
|
24
37
|
const identity = yield* awsClient.getCallerIdentity({
|
|
25
38
|
profile: account.profile,
|
|
26
39
|
region
|
|
27
|
-
}).pipe(Effect.catchIf(() => true, () => Effect.
|
|
28
|
-
if (
|
|
40
|
+
}).pipe(Effect.catchIf(() => true, () => Effect.void));
|
|
41
|
+
if (identity === undefined) {
|
|
29
42
|
yield* notificationRepo.addSystem({
|
|
30
43
|
type: "error",
|
|
31
44
|
title: `${account.profile} (${region})`,
|
|
@@ -33,12 +46,12 @@ const resolveIdentity = (accountIdRef, account, region, options) => Effect.gen(f
|
|
|
33
46
|
profile: account.profile,
|
|
34
47
|
deduplicate: true
|
|
35
48
|
});
|
|
36
|
-
if (clearCurrentUser)
|
|
49
|
+
if (clearCurrentUser !== undefined)
|
|
37
50
|
yield* clearCurrentUser;
|
|
38
51
|
return;
|
|
39
52
|
}
|
|
40
53
|
yield* Ref.update(accountIdRef, (m) => new Map(m).set(account.profile, identity.accountId));
|
|
41
|
-
if (updateCurrentUser)
|
|
54
|
+
if (updateCurrentUser !== undefined)
|
|
42
55
|
yield* updateCurrentUser(identity.username);
|
|
43
56
|
});
|
|
44
57
|
export const resolveAccounts = (state) => Effect.gen(function* () {
|
|
@@ -89,7 +102,7 @@ export const resolveAccounts = (state) => Effect.gen(function* () {
|
|
|
89
102
|
const accountIdMap = yield* Ref.get(accountIdRef);
|
|
90
103
|
// Load subscriptions for diff
|
|
91
104
|
const subscriptions = yield* subscriptionRepo.findAll().pipe(Effect.catchIf(() => true, () => Effect.succeed([])));
|
|
92
|
-
const subscribedRef = yield* Ref.make(new Set(subscriptions.map((s) =>
|
|
105
|
+
const subscribedRef = yield* Ref.make(new Set(subscriptions.map((s) => subscriptionKey(s.awsAccountId, s.pullRequestId, s.repositoryName, s.accountRegion))));
|
|
93
106
|
const currentUser = (yield* SubscriptionRef.get(state)).currentUser;
|
|
94
107
|
return { accountIdMap, currentUser, enabledAccounts, subscribedRef };
|
|
95
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshResolve.js","sourceRoot":"","sources":["../../src/PRService/refreshResolve.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"refreshResolve.js","sourceRoot":"","sources":["../../src/PRService/refreshResolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshScore.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshScore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAA0B,MAAM,EAAmB,MAAM,QAAQ,CAAA;AACxE,OAAO,EAA0B,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAExG,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5D,eAAO,MAAM,qBAAqB,UACzB,OAAO,KACb,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"refreshScore.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshScore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAA0B,MAAM,EAAmB,MAAM,QAAQ,CAAA;AACxE,OAAO,EAA0B,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAExG,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5D,eAAO,MAAM,qBAAqB,UACzB,OAAO,KACb,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,CA2B3C,CAAA"}
|
|
@@ -18,7 +18,10 @@ export const calculateHealthScores = (state) => (Effect.gen(function* () {
|
|
|
18
18
|
yield* Effect.forEach(scoredPRs, (row) => {
|
|
19
19
|
const pr = decodeCachedPR(row);
|
|
20
20
|
const score = scoreTotalOr(pr, scoreNow, 0);
|
|
21
|
-
return prRepo.updateHealthScore(row.awsAccountId, row.id, score
|
|
21
|
+
return prRepo.updateHealthScore(row.awsAccountId, row.id, score, {
|
|
22
|
+
repositoryName: row.repositoryName,
|
|
23
|
+
accountRegion: row.accountRegion
|
|
24
|
+
}).pipe(Effect.catch(() => Effect.void));
|
|
22
25
|
}, { discard: true });
|
|
23
26
|
}).pipe(Effect.tapCauseIf(Cause.hasDies, (cause) => Effect.logWarning("calculateHealthScores failed", cause))));
|
|
24
27
|
//# sourceMappingURL=refreshScore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshScore.js","sourceRoot":"","sources":["../../src/PRService/refreshScore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxE,OAAO,EAA0B,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAgB,MAAM,eAAe,CAAA;AAE5D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAc,EAC+B,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACrE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAErC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,GAAG,CAAC;QACJ,YAAY,EAAE,2BAA2B;KAC1C,CAAC,CAAC,CAAA;IAEH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAA2B,EAAE,CAAC,CAAC,CAAC,CAAA;IAChH,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAA;IACjD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;IACjE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,SAAS,EACT,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"refreshScore.js","sourceRoot":"","sources":["../../src/PRService/refreshScore.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxE,OAAO,EAA0B,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAgB,MAAM,eAAe,CAAA;AAE5D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAc,EAC+B,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACrE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAErC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,GAAG,CAAC;QACJ,YAAY,EAAE,2BAA2B;KAC1C,CAAC,CAAC,CAAA;IAEH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAA2B,EAAE,CAAC,CAAC,CAAC,CAAA;IAChH,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAA;IACjD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;IACjE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,SAAS,EACT,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE;YAC/D,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAChC,CAAA;IACH,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAA;AACH,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC,CACtG,CAAC,CAAA"}
|
|
@@ -15,7 +15,7 @@ import { NotificationRepo } from "../CacheService/repos/NotificationRepo.js";
|
|
|
15
15
|
import { PullRequestRepo } from "../CacheService/repos/PullRequestRepo/index.js";
|
|
16
16
|
import { SubscriptionRepo } from "../CacheService/repos/SubscriptionRepo.js";
|
|
17
17
|
import { ConfigService } from "../ConfigService/index.js";
|
|
18
|
-
import { type PullRequestId } from "../Domain.js";
|
|
18
|
+
import { AwsRegion, type PullRequestId, type RepositoryName } from "../Domain.js";
|
|
19
19
|
import { type AwsClientError, RefreshError } from "../Errors.js";
|
|
20
20
|
import { type PRState } from "./internal.js";
|
|
21
21
|
type RefreshSinglePREnv = AwsClient | PullRequestRepo | CommentRepo | NotificationRepo | SubscriptionRepo | ConfigService;
|
|
@@ -24,6 +24,13 @@ export interface RefreshSinglePRResult {
|
|
|
24
24
|
readonly sourceCommit: string;
|
|
25
25
|
}
|
|
26
26
|
export type RefreshSinglePRError = AwsClientError | RefreshError;
|
|
27
|
-
|
|
27
|
+
/** Exact repository and region used when a browser route disambiguates a PR. */
|
|
28
|
+
export interface RefreshSinglePRCoordinates {
|
|
29
|
+
readonly repositoryName: RepositoryName;
|
|
30
|
+
readonly region: AwsRegion;
|
|
31
|
+
/** Coordinate tokens carry a durable account identity, not a profile alias. */
|
|
32
|
+
readonly accountIdSource?: "coordinate-token";
|
|
33
|
+
}
|
|
34
|
+
export declare const makeRefreshSinglePR: (state: PRState) => (awsAccountId: string, prId: PullRequestId, coordinates?: RefreshSinglePRCoordinates) => Effect.Effect<RefreshSinglePRResult, RefreshSinglePRError, RefreshSinglePREnv>;
|
|
28
35
|
export {};
|
|
29
36
|
//# sourceMappingURL=refreshSinglePR.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshSinglePR.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshSinglePR.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"refreshSinglePR.d.ts","sourceRoot":"","sources":["../../src/PRService/refreshSinglePR.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAS,MAAM,EAAmC,MAAM,QAAQ,CAAA;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAM5E,OAAO,EAA6B,eAAe,EAAE,MAAM,gDAAgD,CAAA;AAC3G,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAEL,SAAS,EAGT,KAAK,aAAa,EAElB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,KAAK,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAChE,OAAO,EAAoB,KAAK,OAAO,EAAE,MAAM,eAAe,CAAA;AAiB9D,KAAK,kBAAkB,GACnB,SAAS,GACT,eAAe,GACf,WAAW,GACX,gBAAgB,GAChB,gBAAgB,GAChB,aAAa,CAAA;AAEjB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAC9B;AACD,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,YAAY,CAAA;AAEhE,gFAAgF;AAChF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;IACvC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,kBAAkB,CAAA;CAC9C;AAsFD,eAAO,MAAM,mBAAmB,UACvB,OAAO,oBA0KE,MAAM,QACd,aAAa,gBACL,0BAA0B,KACvC,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,CAEjF,CAAA"}
|