refactor(marketing-pages): binders take BindContext arg

This commit is contained in:
2026-05-09 12:42:29 +02:00
parent fe85976440
commit fe6c41b69d
3 changed files with 17 additions and 31 deletions

View File

@@ -61,7 +61,7 @@ describe("bindDevSeedMarketingPages", () => {
}); });
it("populates the pages repository with the dev pages", async () => { it("populates the pages repository with the dev pages", async () => {
await bindDevSeedMarketingPages(noop.tracer, noop.logger, new RecordingEventBus(), new RecordingJobQueue(), new RecordingRealtimeBroadcaster(), new RealtimeHandlerRegistry()); await bindDevSeedMarketingPages({ ...noop, bus: new RecordingEventBus(), queue: new RecordingJobQueue(), realtime: new RecordingRealtimeBroadcaster(), realtimeRegistry: new RealtimeHandlerRegistry() });
const repo = marketingPagesContainer.get<IPagesRepository>( const repo = marketingPagesContainer.get<IPagesRepository>(
MARKETING_PAGES_SYMBOLS.IPagesRepository, MARKETING_PAGES_SYMBOLS.IPagesRepository,
@@ -72,7 +72,7 @@ describe("bindDevSeedMarketingPages", () => {
}); });
it("seeds site settings with a non-default site name", async () => { it("seeds site settings with a non-default site name", async () => {
await bindDevSeedMarketingPages(noop.tracer, noop.logger, new RecordingEventBus(), new RecordingJobQueue(), new RecordingRealtimeBroadcaster(), new RealtimeHandlerRegistry()); await bindDevSeedMarketingPages({ ...noop, bus: new RecordingEventBus(), queue: new RecordingJobQueue(), realtime: new RecordingRealtimeBroadcaster(), realtimeRegistry: new RealtimeHandlerRegistry() });
const settingsRepo = marketingPagesContainer.get<ISiteSettingsRepository>( const settingsRepo = marketingPagesContainer.get<ISiteSettingsRepository>(
MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository, MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
@@ -84,13 +84,13 @@ describe("bindDevSeedMarketingPages", () => {
}); });
it("is idempotent — calling twice rebuilds fresh populated repos", async () => { it("is idempotent — calling twice rebuilds fresh populated repos", async () => {
await bindDevSeedMarketingPages(noop.tracer, noop.logger, new RecordingEventBus(), new RecordingJobQueue(), new RecordingRealtimeBroadcaster(), new RealtimeHandlerRegistry()); await bindDevSeedMarketingPages({ ...noop, bus: new RecordingEventBus(), queue: new RecordingJobQueue(), realtime: new RecordingRealtimeBroadcaster(), realtimeRegistry: new RealtimeHandlerRegistry() });
const before = marketingPagesContainer.get<IPagesRepository>( const before = marketingPagesContainer.get<IPagesRepository>(
MARKETING_PAGES_SYMBOLS.IPagesRepository, MARKETING_PAGES_SYMBOLS.IPagesRepository,
); );
const beforeCount = (await before.getPages()).length; const beforeCount = (await before.getPages()).length;
await bindDevSeedMarketingPages(noop.tracer, noop.logger, new RecordingEventBus(), new RecordingJobQueue(), new RecordingRealtimeBroadcaster(), new RealtimeHandlerRegistry()); await bindDevSeedMarketingPages({ ...noop, bus: new RecordingEventBus(), queue: new RecordingJobQueue(), realtime: new RecordingRealtimeBroadcaster(), realtimeRegistry: new RealtimeHandlerRegistry() });
const after = marketingPagesContainer.get<IPagesRepository>( const after = marketingPagesContainer.get<IPagesRepository>(
MARKETING_PAGES_SYMBOLS.IPagesRepository, MARKETING_PAGES_SYMBOLS.IPagesRepository,
); );

View File

@@ -5,8 +5,7 @@ import {
type ITracer, type ITracer,
type ILogger, type ILogger,
} from "@repo/core-shared/instrumentation"; } from "@repo/core-shared/instrumentation";
import type { IEventBus } from "@repo/core-events"; import type { BindContext } from "@repo/core-shared/di";
import type { IRealtimeBroadcaster, IRealtimeHandlerRegistry } from "@repo/core-realtime";
import type { IJobQueue } from "@repo/core-shared/jobs"; import type { IJobQueue } from "@repo/core-shared/jobs";
import { marketingPagesContainer } from "./container.js"; import { marketingPagesContainer } from "./container.js";
import { MARKETING_PAGES_SYMBOLS } from "./symbols.js"; import { MARKETING_PAGES_SYMBOLS } from "./symbols.js";
@@ -34,14 +33,9 @@ import type { IMailerService } from "../application/services/mailer.service.inte
* Idempotent: safe to call multiple times; each call rebuilds fresh populated * Idempotent: safe to call multiple times; each call rebuilds fresh populated
* repos and rebinds both symbols. * repos and rebinds both symbols.
*/ */
export async function bindDevSeedMarketingPages( export async function bindDevSeedMarketingPages(ctx: BindContext): Promise<void> {
tracer: ITracer, const { tracer, logger, bus, queue, realtime, realtimeRegistry } = ctx;
logger: ILogger,
bus: IEventBus,
queue: IJobQueue,
realtime: IRealtimeBroadcaster,
realtimeRegistry: IRealtimeHandlerRegistry,
): Promise<void> {
// Bind shared instrumentation into feature container // Bind shared instrumentation into feature container
if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) { if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) {
marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER); marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER);
@@ -156,14 +150,14 @@ export async function bindDevSeedMarketingPages(
layer: "event-handler", layer: "event-handler",
name: "marketing-pages.onAuthUserSignedUpHandler", name: "marketing-pages.onAuthUserSignedUpHandler",
}, },
onAuthUserSignedUpHandler(queue), onAuthUserSignedUpHandler(queue as IJobQueue),
), ),
); );
if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler)) { if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler)) {
marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler); marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler);
} }
marketingPagesContainer.bind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler).toConstantValue(wrappedAuthUserSignedUp); marketingPagesContainer.bind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler).toConstantValue(wrappedAuthUserSignedUp);
bus.subscribe(userSignedUpEvent, "marketing-pages", wrappedAuthUserSignedUp); bus?.subscribe(userSignedUpEvent, "marketing-pages", wrappedAuthUserSignedUp);
// <gen:jobs> // <gen:jobs>
const wrappedSendWelcomeEmail = withSpan( const wrappedSendWelcomeEmail = withSpan(
tracer, tracer,
@@ -185,7 +179,7 @@ export async function bindDevSeedMarketingPages(
// Register the dev-seed in-memory queue handler so enqueue() actually fires // Register the dev-seed in-memory queue handler so enqueue() actually fires
// the wrapped job. Production binding skips this — the Payload task does it. // the wrapped job. Production binding skips this — the Payload task does it.
if ("register" in queue && typeof (queue as { register?: unknown }).register === "function") { if (queue && "register" in queue && typeof (queue as { register?: unknown }).register === "function") {
(queue as { register: (slug: string, h: (input: unknown) => Promise<void>) => void }).register( (queue as { register: (slug: string, h: (input: unknown) => Promise<void>) => void }).register(
"marketing-pages.send-welcome-email", "marketing-pages.send-welcome-email",
async (input) => { async (input) => {

View File

@@ -1,4 +1,3 @@
import type { SanitizedConfig } from "payload";
import { import {
withSpan, withSpan,
withCapture, withCapture,
@@ -6,8 +5,7 @@ import {
type ITracer, type ITracer,
type ILogger, type ILogger,
} from "@repo/core-shared/instrumentation"; } from "@repo/core-shared/instrumentation";
import type { IEventBus } from "@repo/core-events"; import type { BindProductionContext } from "@repo/core-shared/di";
import type { IRealtimeBroadcaster, IRealtimeHandlerRegistry } from "@repo/core-realtime";
import type { IJobQueue } from "@repo/core-shared/jobs"; import type { IJobQueue } from "@repo/core-shared/jobs";
import { marketingPagesContainer } from "./container"; import { marketingPagesContainer } from "./container";
import { MARKETING_PAGES_SYMBOLS } from "./symbols"; import { MARKETING_PAGES_SYMBOLS } from "./symbols";
@@ -23,15 +21,9 @@ import { sendWelcomeEmailJob } from "../jobs/send-welcome-email.job";
import { RecordingMailerService } from "../infrastructure/services/recording-mailer.service"; import { RecordingMailerService } from "../infrastructure/services/recording-mailer.service";
import type { IMailerService } from "../application/services/mailer.service.interface"; import type { IMailerService } from "../application/services/mailer.service.interface";
export function bindProductionMarketingPages( export function bindProductionMarketingPages(ctx: BindProductionContext): void {
config: SanitizedConfig, const { config, tracer, logger, bus, queue, realtime, realtimeRegistry } = ctx;
tracer: ITracer,
logger: ILogger,
bus: IEventBus,
queue: IJobQueue,
realtime: IRealtimeBroadcaster,
realtimeRegistry: IRealtimeHandlerRegistry,
): void {
// Bind shared instrumentation into feature container // Bind shared instrumentation into feature container
if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) { if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) {
marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER); marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER);
@@ -148,14 +140,14 @@ export function bindProductionMarketingPages(
layer: "event-handler", layer: "event-handler",
name: "marketing-pages.onAuthUserSignedUpHandler", name: "marketing-pages.onAuthUserSignedUpHandler",
}, },
onAuthUserSignedUpHandler(queue), onAuthUserSignedUpHandler(queue as IJobQueue),
), ),
); );
if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler)) { if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler)) {
marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler); marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler);
} }
marketingPagesContainer.bind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler).toConstantValue(wrappedAuthUserSignedUp); marketingPagesContainer.bind(MARKETING_PAGES_SYMBOLS.IOnAuthUserSignedUpHandler).toConstantValue(wrappedAuthUserSignedUp);
bus.subscribe(userSignedUpEvent, "marketing-pages", wrappedAuthUserSignedUp); bus?.subscribe(userSignedUpEvent, "marketing-pages", wrappedAuthUserSignedUp);
// <gen:jobs> // <gen:jobs>
const wrappedSendWelcomeEmail = withSpan( const wrappedSendWelcomeEmail = withSpan(
tracer, tracer,