Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

ralph(M15-119): Per-module fixes: packages/core/src/modules/organization - R11 and the findings no rule covers

ralph290c36364bd2
diff --git a/packages/core/src/modules/organization/organization.jobs.ts b/packages/core/src/modules/organization/organization.jobs.ts
index 1e3aee59b..2d5479bd1 100644
--- a/packages/core/src/modules/organization/organization.jobs.ts
+++ b/packages/core/src/modules/organization/organization.jobs.ts
@@ -51,7 +51,9 @@ export const organizationCronJobs = {
* Two reaches stay dynamic. The sibling service's two ClickHouse counts are
* not on `OrganizationService`, and `src/win-back-pitch.ts` pulls the agent
* runtime — a static edge from here would drag either into jobs.registry.ts's
- * eager import graph, which every core test file walks.
+ * eager import graph, which every core test file walks. M15-119 (R11) ruled
+ * this the ADR-022 "legitimate lazy asset load" exception, not the sibling-
+ * service defect R6 forbids: kept as is.
*/
async function windDownDeps(ctx: Ctx, logger: Logger): Promise<WindDownDeps> {
const [
diff --git a/packages/core/src/modules/organization/organization.service.test.ts b/packages/core/src/modules/organization/organization.service.test.ts
index 28d81f780..05ff2868a 100644
--- a/packages/core/src/modules/organization/organization.service.test.ts
+++ b/packages/core/src/modules/organization/organization.service.test.ts
@@ -187,9 +187,17 @@ const project = {
return rows;
}
),
- delete: mock(async ({ where: { id } }: { where: { id: string } }) => {
- projectStore.delete(id);
- }),
+ deleteMany: mock(
+ async ({ where: { id } }: { where: { id: { in: string[] } } }) => {
+ let count = 0;
+ for (const projectId of id.in) {
+ if (projectStore.delete(projectId)) {
+ count++;
+ }
+ }
+ return { count };
+ }
+ ),
updateMany: mock(
async ({
where: { organizationId },
diff --git a/packages/core/src/modules/organization/organization.service.ts b/packages/core/src/modules/organization/organization.service.ts
index 53e9251c7..4b5907147 100644
--- a/packages/core/src/modules/organization/organization.service.ts
+++ b/packages/core/src/modules/organization/organization.service.ts
@@ -2,13 +2,16 @@
// packages/db/src/services/delete.service.ts (M6-001, folded together per the
// module map: "delete.service in organization"). The mutation bodies inline
// in packages/trpc/src/routers/organization.ts (update/delete/cancelDeletion/
-// inviteUser/revokeInvite/removeMember/updateMemberAccess) move here too, so
-// V1's router and core's own organization.rpc.ts share one implementation
-// (DELEGATE PATTERN). packages/db keeps a re-export shim for
-// organization.service.ts: its own engine + several analytics services
-// (`getSettingsForProject`) still reach it directly. packages/db loses
-// delete.service.ts entirely — nothing outside apps/worker's cron job
-// (now delegating here) reached it through @openpanel/db's barrel.
+// inviteUser/revokeInvite/removeMember/updateMemberAccess) moved here too, so
+// V1's router and core's own organization.rpc.ts shared one implementation
+// (DELEGATE PATTERN) until packages/trpc was retired. packages/db carries no
+// re-export shim for this file — its services/ directory holds only
+// access.service.ts today. `getSettingsForProject` is instead value-imported
+// directly by ten sibling packages/core modules; that's the tree-wide R3
+// sibling-access gap the composition-root fix wave tracks, not something
+// local to this file. packages/db lost delete.service.ts entirely — nothing
+// outside the `delete` cron job (now here) reached it through
+// @openpanel/db's barrel.
//
// M10-009: every exported function takes `ServiceDeps` and reaches Postgres
// as `deps.db` and ClickHouse as `deps.ch` (through core's own `chQuery`), so
@@ -208,20 +211,6 @@ export async function getMembers(
})) as IServiceMember[];
}
-export async function getMember(
- deps: ServiceDeps,
- organizationId: string,
- userId: string
-) {
- const db = deps.db;
- return db.member.findFirst({
- where: {
- organizationId,
- userId,
- },
- });
-}
-
export async function connectUserToOrganization(
deps: ServiceDeps,
{
@@ -520,13 +509,13 @@ export async function deleteProjects(deps: ServiceDeps, projectIds: string[]) {
return;
}
- for (const project of projects) {
- await db.project.delete({
- where: {
- id: project.id,
+ await db.project.deleteMany({
+ where: {
+ id: {
+ in: projects.map((project) => project.id),
},
- });
- }
+ },
+ });
return projects;
}