@aurorajs.dev/catalyst-cli 1.1.3 → 2.0.0

package/dist/templates/backend/packages/queue-manager/src/@api/queue-manager/flows/resolvers/queue-manager.resolver.auth-metadata.spec.ts

@@ -14,40 +14,19 @@
  * This file loads the REAL @Auth decorator and asserts the metadata is stamped
  * on the class itself.
  *
- * ESM workaround: auth.decorator.ts imports AuthenticationJwtGuard, whose module
- * barrel re-exports authentication.module.ts, which imports AuroraHubConsumerAdapter
- * (uses jwks-rsa, an ESM-only package ts-jest cannot transform). We mock only
- * that adapter — not @Auth itself — so Permissions(...) still runs and stamps
- * the class-level metadata we need to assert.
- *
  * TDD regression proof: if @Auth were moved back to method level, the
  * Permissions(...) call would set metadata on the METHOD descriptor, not on the
  * class constructor. Reflect.getMetadata('permissions', TheClass) would return
  * undefined, and every assertion in this file would fail.
  */
 
-// Mock the ESM-importing adapter BEFORE any imports that load the decorator chain.
-jest.mock(
-  '@aurora/modules/authentication/infrastructure/strategies/aurora-hub/aurora-hub-consumer.adapter',
-  () => ({
-    AuroraHubConsumerAdapter: class AuroraHubConsumerAdapterMock {
-      getPassportOptions() {
-        return { jwtFromRequest: () => null, secretOrKey: 'mock' };
-      }
-      validate(): Promise<Record<string, never>> {
-        return Promise.resolve({});
-      }
-    },
-  }),
-);
-
 import 'reflect-metadata';
 import {
   QueueManagerAuthorResolver,
   QueueManagerDestroyResolver,
   QueueManagerOperateResolver,
   QueueManagerReadResolver,
-} from './queue-manager.resolver';
+} from './queue-manager.resolver.js';
 
 describe('@Auth class-level metadata — authorization bypass regression', () => {
   /**

package/dist/templates/backend/packages/queue-manager/src/@api/queue-manager/flows/resolvers/queue-manager.resolver.spec.ts

@@ -2,30 +2,20 @@
  * Task 4.2 / 4.6 — Resolver permission-gating unit tests.
  *
  * TDD: tests the business logic guards (obliterate-paused, retry-state).
- * Direct instantiation pattern from catalyst-backend-testing SKILL (avoids
- * @Auth/ESM ts-jest limitation).
- *
- * @Auth pulls in jwks-rsa (ESM) which ts-jest cannot transform.
- * We mock the decorator at module level so the resolver file can load in Jest.
+ * Direct instantiation pattern from catalyst-backend-testing SKILL: the resolvers
+ * are constructed directly, never through a TestingModule, so `@Auth`'s guards
+ * (only invoked by a real HTTP/GraphQL pipeline) never need to be provided here.
  * Permission enforcement is tested at integration level via the seed pattern.
  */
 
-// Mock @Auth before any import that loads the decorator chain.
-// This replaces the real @Auth (which uses jwks-rsa ESM) with a no-op.
-jest.mock('@aurora/decorators/auth.decorator', () => ({
-  Auth:
-    (..._permissions: string[]) =>
-    () =>
-      undefined,
-}));
-
-import type { IQueueInspectorPort, QueueManagerJobJson } from '@app/queue-manager/domain/ports';
+import type { Mocked } from 'vitest';
+import type { IQueueInspectorPort, QueueManagerJobJson } from '@app/queue-manager/domain/ports/index.js';
 import {
   QueueManagerAuthorResolver,
   QueueManagerDestroyResolver,
   QueueManagerOperateResolver,
   QueueManagerReadResolver,
-} from './queue-manager.resolver';
+} from './queue-manager.resolver.js';
 
 const makeJobJson = (overrides: Partial<QueueManagerJobJson> = {}): QueueManagerJobJson => ({
   id: 'j1',
@@ -44,32 +34,32 @@ const makeJobJson = (overrides: Partial<QueueManagerJobJson> = {}): QueueManager
   ...overrides,
 });
 
-const mockPort: jest.Mocked<IQueueInspectorPort> = {
-  getQueues: jest.fn(),
-  findQueue: jest.fn(),
-  paginateJobs: jest.fn(),
-  findJob: jest.fn(),
-  getRedisStats: jest.fn(),
-  getMetrics: jest.fn(),
-  retryJob: jest.fn(),
-  retryAllJobs: jest.fn(),
-  promoteJob: jest.fn(),
-  promoteAllJobs: jest.fn(),
-  pauseQueue: jest.fn(),
-  resumeQueue: jest.fn(),
-  addJob: jest.fn(),
-  duplicateJob: jest.fn(),
-  updateJobData: jest.fn(),
-  cleanQueue: jest.fn(),
-  emptyQueue: jest.fn(),
-  obliterateQueue: jest.fn(),
+const mockPort: Mocked<IQueueInspectorPort> = {
+  getQueues: vi.fn(),
+  findQueue: vi.fn(),
+  paginateJobs: vi.fn(),
+  findJob: vi.fn(),
+  getRedisStats: vi.fn(),
+  getMetrics: vi.fn(),
+  retryJob: vi.fn(),
+  retryAllJobs: vi.fn(),
+  promoteJob: vi.fn(),
+  promoteAllJobs: vi.fn(),
+  pauseQueue: vi.fn(),
+  resumeQueue: vi.fn(),
+  addJob: vi.fn(),
+  duplicateJob: vi.fn(),
+  updateJobData: vi.fn(),
+  cleanQueue: vi.fn(),
+  emptyQueue: vi.fn(),
+  obliterateQueue: vi.fn(),
 };
 
 describe('QueueManagerReadResolver', () => {
   let resolver: QueueManagerReadResolver;
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     resolver = new QueueManagerReadResolver(mockPort);
   });
 
@@ -97,7 +87,7 @@ describe('QueueManagerOperateResolver — retry state guard', () => {
   let resolver: QueueManagerOperateResolver;
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     resolver = new QueueManagerOperateResolver(mockPort);
   });
 
@@ -134,7 +124,7 @@ describe('QueueManagerDestroyResolver — obliterate guard', () => {
   let resolver: QueueManagerDestroyResolver;
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     resolver = new QueueManagerDestroyResolver(mockPort);
   });
 
@@ -197,7 +187,7 @@ describe('QueueManagerAuthorResolver', () => {
   let resolver: QueueManagerAuthorResolver;
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     resolver = new QueueManagerAuthorResolver(mockPort);
   });
 

package/dist/templates/backend/packages/queue-manager/src/@api/queue-manager/flows/resolvers/queue-manager.resolver.ts

@@ -19,9 +19,9 @@ import type {
   QueueManagerPaginatedJobs,
   QueueManagerQueueSummary,
   QueueManagerRedisStats,
-} from '@app/queue-manager/domain/ports';
-import { QUEUE_INSPECTOR_PORT } from '@app/queue-manager/domain/ports';
-import { Auth } from '@aurora/decorators';
+} from '@app/queue-manager/domain/ports/index.js';
+import { QUEUE_INSPECTOR_PORT } from '@app/queue-manager/domain/ports/index.js';
+import { Auth } from '@aurora/decorators/index.js';
 import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 

package/dist/templates/backend/packages/queue-manager/src/@api/queue-manager/queue-manager.module.ts

@@ -16,15 +16,15 @@
  * HR-MODULES-001 COMPLY: real new BC module (not a shadow module).
  * HR-FLOWS-001 COMPLY: providers registered by barrel-and-spread.
  */
-import { QUEUE_INSPECTOR_PORT } from '@app/queue-manager/domain/ports';
-import { BullBoardQueueInspectorAdapter } from '@app/queue-manager/infrastructure';
-import { QUEUE_REGISTRY_PROVIDERS } from '@app/queue-manager/queue-registry.providers';
-import { SharedModule } from '@aurora/shared.module';
+import { QUEUE_INSPECTOR_PORT } from '@app/queue-manager/domain/ports/index.js';
+import { BullBoardQueueInspectorAdapter } from '@app/queue-manager/infrastructure/index.js';
+import { QUEUE_REGISTRY_PROVIDERS } from '@app/queue-manager/queue-registry.providers.js';
+import { SharedModule } from '@aurora/shared.module.js';
 import { BullModule } from '@nestjs/bullmq';
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { QueueManagerFlowsApiResolvers } from './flows';
-import { QueueManagerSeeder } from './queue-manager.seeder';
+import { QueueManagerFlowsApiResolvers } from './flows/index.js';
+import { QueueManagerSeeder } from './queue-manager.seeder.js';
 
 @Module({
   imports: [

package/dist/templates/backend/packages/queue-manager/src/@api/queue-manager/queue-manager.seeder.ts

@@ -2,12 +2,12 @@
  * QueueManagerSeeder — seeds the four tiered permissions at application bootstrap.
  * Mirrors the pattern of SapIntegrationSeeder (sap-integration.seeder.ts).
  */
-import { boundedContexts, permissions } from '@app/queue-manager/queue-manager.seed';
+import { boundedContexts, permissions } from '@app/queue-manager/queue-manager.seed.js';
 import {
   IAM_BOUNDED_CONTEXT_SEEDER,
   type IIamBoundedContextSeeder,
-} from '@bridges/iam/bounded-context/ports';
-import { IAM_PERMISSION_SEEDER, type IIamPermissionSeeder } from '@bridges/iam/permission/ports';
+} from '@bridges/iam/bounded-context/ports/index.js';
+import { IAM_PERMISSION_SEEDER, type IIamPermissionSeeder } from '@bridges/iam/permission/ports/index.js';
 import { Inject, Injectable, OnApplicationBootstrap } from '@nestjs/common';
 
 @Injectable()

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/domain/ports/index.ts

@@ -1,4 +1,4 @@
-export { QUEUE_INSPECTOR_PORT } from './queue-inspector.port';
+export { QUEUE_INSPECTOR_PORT } from './queue-inspector.port.js';
 export type {
   IQueueInspectorPort,
   QueueManagerJob,
@@ -12,9 +12,9 @@ export type {
   QueueManagerRedisStats,
   QueueManagerRetentionWindow,
   QueueRetentionPolicy,
-} from './queue-inspector.port';
+} from './queue-inspector.port.js';
 export {
   QUEUE_NAMES_TOKEN,
   QUEUE_REGISTRY_AGGREGATOR_TOKEN,
   QUEUE_RETENTION_TOKEN,
-} from './queue-registry.token';
+} from './queue-registry.token.js';

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/infrastructure/adapters/bull-board-queue-inspector.adapter.spec.ts

@@ -7,39 +7,52 @@
  *
  * Design D3: build Queue by name + global connection, map results to DTOs.
  */
+import type { Mock } from 'vitest';
+import { Logger } from '@nestjs/common';
+import { Queue } from 'bullmq';
 import type {
   QueueManagerJobJson,
   QueueManagerQueueSummary,
   QueueManagerRedisStats,
-} from '../../domain/ports';
-import { BullBoardQueueInspectorAdapter } from './bull-board-queue-inspector.adapter';
+} from '../../domain/ports/index.js';
+import { BullBoardQueueInspectorAdapter } from './bull-board-queue-inspector.adapter.js';
 
 // Minimal stubs for bull-board adapter methods — no real Redis connection needed.
 const mockBullMQAdapterInstance = {
-  getJobCounts: jest.fn(),
-  isPaused: jest.fn(),
-  getName: jest.fn(),
-  getJobs: jest.fn(),
-  getRedisInfo: jest.fn(),
-  getJobLogs: jest.fn(),
-  getMetrics: jest.fn(),
-  pause: jest.fn(),
-  resume: jest.fn(),
-  empty: jest.fn(),
-  obliterate: jest.fn(),
-  promoteAll: jest.fn(),
-  clean: jest.fn(),
-  addJob: jest.fn(),
+  getJobCounts: vi.fn(),
+  isPaused: vi.fn(),
+  getName: vi.fn(),
+  getJobs: vi.fn(),
+  getRedisInfo: vi.fn(),
+  getJobLogs: vi.fn(),
+  getMetrics: vi.fn(),
+  pause: vi.fn(),
+  resume: vi.fn(),
+  empty: vi.fn(),
+  obliterate: vi.fn(),
+  promoteAll: vi.fn(),
+  clean: vi.fn(),
+  addJob: vi.fn(),
 };
 
-jest.mock('@bull-board/api/bullMQAdapter', () => ({
-  BullMQAdapter: jest.fn().mockImplementation(() => mockBullMQAdapterInstance),
+vi.mock('@bull-board/api/bullMQAdapter', () => ({
+  // A regular `function`, not an arrow — see the `bullmq` mock below for why.
+  BullMQAdapter: vi.fn().mockImplementation(function () {
+    return mockBullMQAdapterInstance;
+  }),
 }));
 
-jest.mock('bullmq', () => ({
-  Queue: jest.fn().mockImplementation(() => ({
-    name: 'sap-sync',
-  })),
+vi.mock('bullmq', () => ({
+  // A regular `function`, not an arrow: the adapter calls `new Queue(...)`, and unlike
+  // Jest's mock functions, Vitest's `vi.fn()` delegates a `new` call straight to
+  // `Reflect.construct` on the current implementation — an arrow function has no
+  // `[[Construct]]` slot at all and throws "is not a constructor" (measured).
+  Queue: vi.fn().mockImplementation(function (name: string) {
+    return {
+      name,
+      close: vi.fn().mockResolvedValue(undefined),
+    };
+  }),
 }));
 
 describe('BullBoardQueueInspectorAdapter', () => {
@@ -62,7 +75,7 @@ describe('BullBoardQueueInspectorAdapter', () => {
   };
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
 
     adapter = new BullBoardQueueInspectorAdapter(
       ['sap-sync'], // injected via QUEUE_REGISTRY_AGGREGATOR_TOKEN
@@ -110,7 +123,7 @@ describe('BullBoardQueueInspectorAdapter', () => {
       };
 
       const fakeJob = {
-        toJSON: jest.fn().mockReturnValue(fakeJobJson),
+        toJSON: vi.fn().mockReturnValue(fakeJobJson),
       };
 
       mockBullMQAdapterInstance.getJobs.mockResolvedValue([fakeJob]);
@@ -169,4 +182,80 @@ describe('BullBoardQueueInspectorAdapter', () => {
       });
     });
   });
+
+  describe('onApplicationShutdown — closes every underlying BullMQ Queue connection', () => {
+    const queueNames = ['sap-sync', 'iam-audit', 'hub-notifications'];
+
+    // The module-level `Queue` mock records every call, including the one the outer `beforeEach`
+    // makes. Reading the results of THIS construction only keeps each test independent of how
+    // many adapters were built before it.
+    const buildAdapter = (): {
+      adapter: BullBoardQueueInspectorAdapter;
+      queues: { close: Mock }[];
+    } => {
+      const queueMock = Queue as unknown as Mock;
+      const firstOwnCall = queueMock.mock.results.length;
+      const adapter = new BullBoardQueueInspectorAdapter(
+        queueNames,
+        { host: '127.0.0.1', port: 6379 },
+        fakeRetention,
+      );
+      const queues = queueMock.mock.results
+        .slice(firstOwnCall)
+        .map((result) => result.value as { close: Mock });
+      return { adapter, queues };
+    };
+
+    it('closes each Queue created for the registered queue names', async () => {
+      const { adapter: localAdapter, queues } = buildAdapter();
+
+      await localAdapter.onApplicationShutdown();
+
+      expect(queues).toHaveLength(queueNames.length);
+      queues.forEach((queue) => {
+        expect(queue.close).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it('waits for every close to settle before resolving', async () => {
+      const { adapter: localAdapter, queues } = buildAdapter();
+      let releaseFirstClose!: () => void;
+      queues[0].close.mockReturnValue(
+        new Promise<void>((resolve) => {
+          releaseFirstClose = resolve;
+        }),
+      );
+      let settled = false;
+
+      const shutdown = localAdapter.onApplicationShutdown().then(() => {
+        settled = true;
+      });
+      await Promise.resolve();
+
+      // Catches a fire-and-forget regression: without the await, `app.close()` returns while the
+      // Redis sockets are still open — the exact hang this adapter's hook exists to prevent.
+      expect(settled).toBe(false);
+      releaseFirstClose();
+      await shutdown;
+    });
+
+    it('closes the remaining queues when one close rejects', async () => {
+      const { adapter: localAdapter, queues } = buildAdapter();
+      const reason = new Error('redis went away');
+      queues[0].close.mockRejectedValue(reason);
+      const warn = vi.spyOn(Logger.prototype, 'warn').mockImplementation();
+
+      // NestJS walks the shutdown hooks module by module with no try/catch, so letting this
+      // rejection escape would skip the teardown of every module after this one.
+      await expect(localAdapter.onApplicationShutdown()).resolves.toBeUndefined();
+
+      queues.forEach((queue) => {
+        expect(queue.close).toHaveBeenCalledTimes(1);
+      });
+      // Pins the name/outcome alignment: the warning must blame the queue that actually failed.
+      expect(warn).toHaveBeenCalledTimes(1);
+      expect(warn).toHaveBeenCalledWith(expect.stringContaining(queueNames[0]), reason.stack);
+      warn.mockRestore();
+    });
+  });
 });

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/infrastructure/adapters/bull-board-queue-inspector.adapter.ts

@@ -12,7 +12,7 @@
  */
 import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import type { JobCounts, QueueJobJson } from '@bull-board/api/typings/app';
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, Logger, OnApplicationShutdown } from '@nestjs/common';
 import type { ConnectionOptions } from 'bullmq';
 import { Queue } from 'bullmq';
 import type {
@@ -25,8 +25,8 @@ import type {
   QueueManagerQueueSummary,
   QueueManagerRedisStats,
   QueueRetentionPolicy,
-} from '../../domain/ports';
-import { QUEUE_REGISTRY_AGGREGATOR_TOKEN, QUEUE_RETENTION_TOKEN } from '../../domain/ports';
+} from '../../domain/ports/index.js';
+import { QUEUE_REGISTRY_AGGREGATOR_TOKEN, QUEUE_RETENTION_TOKEN } from '../../domain/ports/index.js';
 
 // Redis-info raw fields we parse for the stats DTO
 const REDIS_INFO_KEYS = {
@@ -115,8 +115,12 @@ function hasUpdateData(job: unknown): job is JobWithUpdateData {
 }
 
 @Injectable()
-export class BullBoardQueueInspectorAdapter implements IQueueInspectorPort {
+export class BullBoardQueueInspectorAdapter implements IQueueInspectorPort, OnApplicationShutdown {
+  private readonly logger = new Logger(BullBoardQueueInspectorAdapter.name);
   private readonly adapters: Map<string, BullMQAdapter>;
+  // BullMQAdapter keeps its Queue private and exposes no close(), so the raw handles have to be
+  // kept alongside the wrappers to be able to shut their ioredis sockets down.
+  private readonly queues: Queue[];
 
   constructor(
     @Inject(QUEUE_REGISTRY_AGGREGATOR_TOKEN) private readonly queueNames: string[],
@@ -125,12 +129,44 @@ export class BullBoardQueueInspectorAdapter implements IQueueInspectorPort {
     private readonly retentionByQueue: Record<string, QueueRetentionPolicy>,
   ) {
     this.adapters = new Map<string, BullMQAdapter>();
+    this.queues = [];
     for (const name of queueNames) {
       const queue = new Queue(name, { connection });
+      this.queues.push(queue);
       this.adapters.set(name, new BullMQAdapter(queue));
     }
   }
 
+  /**
+   * These Queues are built by hand for bull-board inspection only, never through
+   * `BullModule.registerQueueAsync`, so NestJS wires no teardown for them: without this hook their
+   * ioredis sockets survive `app.close()` and hold the Node event loop open, hanging the whole
+   * acceptance suite. Mirrors `ReportEngineModule`'s fix for the identical leak class.
+   *
+   * `onApplicationShutdown`, not `onModuleDestroy`: the destroy hooks run BEFORE `dispose()` closes
+   * the HTTP server, so closing here would leave in-flight queue-manager requests reading from a
+   * closed Queue. It is also the phase @nestjs/bullmq uses for the queues it owns.
+   *
+   * `allSettled`, not `all`: `Queue.close()` rethrows non-connection errors, and `callShutdownHook`
+   * walks the modules sequentially with no try/catch, so one unreachable queue would skip the
+   * shutdown hook of every module after this one — including the pool `ReportEngineModule` ends.
+   *
+   * Note this only runs where something calls `app.close()`, which today means the e2e teardown:
+   * the app never calls `enableShutdownHooks()`, so a SIGTERM in production closes nothing.
+   */
+  async onApplicationShutdown(): Promise<void> {
+    const outcomes = await Promise.allSettled(this.queues.map((queue) => queue.close()));
+    for (const [index, outcome] of outcomes.entries()) {
+      if (outcome.status === 'rejected') {
+        // `queues` is pushed one per iteration over `queueNames`, so the indexes stay aligned.
+        this.logger.warn(
+          `Failed to close the inspection queue "${this.queueNames[index]}"`,
+          outcome.reason instanceof Error ? outcome.reason.stack : String(outcome.reason),
+        );
+      }
+    }
+  }
+
   private getAdapter(queueName: string): BullMQAdapter {
     const adapter = this.adapters.get(queueName);
     if (!adapter) {

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/infrastructure/adapters/index.ts

@@ -1 +1 @@
-export { BullBoardQueueInspectorAdapter } from './bull-board-queue-inspector.adapter';
+export { BullBoardQueueInspectorAdapter } from './bull-board-queue-inspector.adapter.js';

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/infrastructure/index.ts

@@ -1 +1 @@
-export { BullBoardQueueInspectorAdapter } from './adapters';
+export { BullBoardQueueInspectorAdapter } from './adapters/index.js';

package/dist/templates/backend/packages/queue-manager/src/@app/queue-manager/queue-registry.providers.ts

@@ -16,12 +16,12 @@
  * declaration keeps them structurally coupled.
  */
 import { Provider } from '@nestjs/common';
-import type { QueueRetentionPolicy } from './domain/ports';
+import type { QueueRetentionPolicy } from './domain/ports/index.js';
 import {
   QUEUE_NAMES_TOKEN,
   QUEUE_REGISTRY_AGGREGATOR_TOKEN,
   QUEUE_RETENTION_TOKEN,
-} from './domain/ports';
+} from './domain/ports/index.js';
 
 export const QUEUE_REGISTRY_PROVIDERS: Provider[] = [
   { provide: QUEUE_NAMES_TOKEN, useValue: [] as string[] },

package/dist/templates/codegen/backend/@api/__bounded_context_name__.module.ts.eta

@@ -2,9 +2,9 @@
 * @aurora-catalyst-generated
 * @source cliter/<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>
 */
-import { SharedModule } from '<%= it.config.AURORA_LOCAL_PACKAGE %>/shared.module';
+import { SharedModule } from '<%= it.config.AURORA_LOCAL_PACKAGE %>/shared.module.js';
 import { Module } from '@nestjs/common';
-import { <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Seeder } from './<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>.seeder';
+import { <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Seeder } from './<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>.seeder.js';
 
 @Module({
   imports: [

package/dist/templates/codegen/backend/@api/__bounded_context_name__.seeder.ts.eta

@@ -5,9 +5,9 @@
 <%_ const bcKebab = it.fmt.toKebabCase(it.schema.boundedContextName); _%>
 <%_ const bcPascal = it.fmt.toPascalCase(it.schema.boundedContextName); _%>
 <%_ const importsArray = [
-    { items: ['boundedContexts', 'permissions'], path: `${it.config.APP_CONTAINER}/${bcKebab}/${bcKebab}.seed` },
-    { items: ['IAM_BOUNDED_CONTEXT_SEEDER', 'type IIamBoundedContextSeeder'], path: '@bridges/iam/bounded-context/ports' },
-    { items: ['IAM_PERMISSION_SEEDER', 'type IIamPermissionSeeder'], path: '@bridges/iam/permission/ports' },
+    { items: ['boundedContexts', 'permissions'], path: `${it.config.APP_CONTAINER}/${bcKebab}/${bcKebab}.seed.js` },
+    { items: ['IAM_BOUNDED_CONTEXT_SEEDER', 'type IIamBoundedContextSeeder'], path: '@bridges/iam/bounded-context/ports/index.js' },
+    { items: ['IAM_PERMISSION_SEEDER', 'type IIamPermissionSeeder'], path: '@bridges/iam/permission/ports/index.js' },
     { items: ['Inject', 'Injectable', 'OnApplicationBootstrap'], path: '@nestjs/common' },
 ]; _%>
 <%~ it.gen.importManager({ imports: importsArray }) %>

package/dist/templates/codegen/backend/@api/__module_name__/controllers/__bounded_context_name__-count-__module_name__.controller.ts.eta

@@ -11,19 +11,19 @@
       items: [
         `${it.fmt.toPascalCase(it.schema.boundedContextName)}Count${it.fmt.toPascalCase(it.schema.moduleName)}Handler`,
       ],
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/index.js`,
     },
   ];
 _%>
+<%_
+  const tenantProperty = it.schema.hasTenant ? it.filters.getTenantProperty(it.schema.aggregateProperties ?? []) : undefined;
+_%>
 <% if (it.schema.hasTenant) { -%>
-<%_ importsArray.push(
-  { items: 'IamAccountResponse', path: `${it.config.APP_CONTAINER}/iam/account` },
-  { items: 'TenantConstraint', path: `${it.config.API_CONTAINER}/iam/shared` },
-  { items: 'CurrentAccount', path: it.config.AURORA_CORE_BACK },
-); _%>
+<%_ importsArray.push({ items: ['CurrentAccount', 'TenantConstraint'], path: it.config.AURORA_CORE_BACK }); _%>
+<%_ importsArray.push({ items: 'IamAccount', path: '@api/graphql.js' }); _%>
 <% } -%>
 <% if (it.schema.hasOAuth) { -%>
-<%_ importsArray.push({ items: 'Auth', path: '@aurora/decorators' }); _%>
+<%_ importsArray.push({ items: 'Auth', path: '@aurora/decorators/index.js' }); _%>
 <% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @ApiTags('[<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>] <%= it.fmt.toKebabCase(it.schema.moduleName) %>')
@@ -44,11 +44,11 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Count<%= it
   @ApiQuery({ name: 'queryStatement', type: Object })
   @ApiQuery({ name: 'constraint', type: Object })
   <% if (it.schema.hasTenant) { -%>
-  @TenantConstraint()
+  @TenantConstraint({ accountIndex: 0, constraintIndex: 2, targetProperty: '<%= tenantProperty.name %>', isArray: <%= tenantProperty.isArray %>, nullable: <%= tenantProperty.nullable %> })
   <% } -%>
   async main(
     <% if (it.schema.hasTenant) { -%>
-    @CurrentAccount() account: IamAccountResponse,
+    @CurrentAccount() account: IamAccount,
     <% } -%>
     @Body('query') queryStatement?: QueryStatement,
     @Body('constraint') constraint?: QueryStatement,

package/dist/templates/codegen/backend/@api/__module_name__/controllers/__bounded_context_name__-create-__module_name__.controller.ts.eta

@@ -13,28 +13,28 @@
         `${it.schema.aggregateName}Dto`,
         `${it.fmt.toPascalCase(it.schema.boundedContextName)}Create${it.fmt.toPascalCase(it.schema.moduleName)}Dto`,
       ],
-      path: `${it.config.API_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+      path: `${it.config.API_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/index.js`,
     },
     {
       items: [
         `${it.fmt.toPascalCase(it.schema.boundedContextName)}Create${it.fmt.toPascalCase(it.schema.moduleName)}Handler`,
       ],
-      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}`,
+      path: `${it.config.APP_CONTAINER}/${it.fmt.toKebabCase(it.schema.boundedContextName)}/${it.fmt.toKebabCase(it.schema.moduleName)}/index.js`,
     },
   ];
 _%>
 <% if (it.schema.hasOAuth) { -%>
-<%_ importsArray.push({ items: 'Auth', path: '@aurora/decorators' }); _%>
+<%_ importsArray.push({ items: 'Auth', path: '@aurora/decorators/index.js' }); _%>
 <% } -%>
 <% if (it.schema.hasAuditing) { -%>
 <%_ importsArray.push({ items: ['Auditing', 'AuditingMeta'], path: it.config.AURORA_CORE_BACK }); _%>
 <% } -%>
+<%_
+  const tenantProperty = it.schema.hasTenant ? it.filters.getTenantProperty(it.schema.aggregateProperties ?? []) : undefined;
+_%>
 <% if (it.schema.hasTenant) { -%>
-<%_ importsArray.push(
-  { items: 'IamAccountResponse', path: `${it.config.APP_CONTAINER}/iam/account` },
-  { items: 'TenantPolicy', path: `${it.config.API_CONTAINER}/iam/shared` },
-  { items: 'CurrentAccount', path: it.config.AURORA_CORE_BACK },
-); _%>
+<%_ importsArray.push({ items: ['CurrentAccount', 'TenantPolicy'], path: it.config.AURORA_CORE_BACK }); _%>
+<%_ importsArray.push({ items: 'IamAccount', path: '@api/graphql.js' }); _%>
 <% } -%>
 <%~ it.gen.importManager({ imports: importsArray }) %>
 @ApiTags('[<%= it.fmt.toKebabCase(it.schema.boundedContextName) %>] <%= it.fmt.toKebabCase(it.schema.moduleName) %>')
@@ -52,12 +52,12 @@ export class <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Create<%= i
   @ApiOperation({ summary: 'Create <%= it.fmt.toKebabCase(it.schema.moduleName) %>' })
   @ApiCreatedResponse({ description: 'The record has been successfully created.', type: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %><%= it.fmt.toPascalCase(it.schema.moduleName) %>Dto })
   <% if (it.schema.hasTenant) { -%>
-  @TenantPolicy()
+  @TenantPolicy({ payloadIndex: 0, accountIndex: 1, targetProperty: '<%= tenantProperty.name %>', isArray: <%= tenantProperty.isArray %> })
   <% } -%>
   async main(
     @Body() payload: <%= it.fmt.toPascalCase(it.schema.boundedContextName) %>Create<%= it.fmt.toPascalCase(it.schema.moduleName) %>Dto,
     <% if (it.schema.hasTenant) { -%>
-    @CurrentAccount() account: IamAccountResponse,
+    @CurrentAccount() account: IamAccount,
     <% } -%>
     @Timezone() timezone?: string,
     <% if (isI18nTable) { -%>