@open-mercato/core 0.5.1-develop.2663.2c29774b5b → 0.5.1-develop.2681.c559bb2bc3

package/src/modules/customers/migrations/Migration20260406214502.ts

@@ -0,0 +1,19 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260406214502 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "customer_entity_roles" ("id" uuid not null default gen_random_uuid(), "entity_type" text not null, "entity_id" uuid not null, "user_id" uuid not null, "role_type" text not null, "organization_id" uuid not null, "tenant_id" uuid not null, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "customer_entity_roles_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_entity_roles_scope_idx" on "customer_entity_roles" ("organization_id", "tenant_id");`);
+    this.addSql(`create index "customer_entity_roles_entity_idx" on "customer_entity_roles" ("entity_type", "entity_id");`);
+    this.addSql(`alter table "customer_entity_roles" add constraint "customer_entity_roles_unique" unique ("entity_type", "entity_id", "role_type");`);
+
+    this.addSql(`alter table "customer_interactions" add column "pinned" boolean not null default false;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_interactions" drop column "pinned";`);
+    this.addSql(`drop table if exists "customer_entity_roles" cascade;`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260408135736.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20260408135736 extends Migration {
+  override async up(): Promise<void> {
+    this.addSql(
+      'alter table "customer_interactions" add column "duration_minutes" int null, add column "location" text null, add column "all_day" boolean null, add column "recurrence_rule" text null, add column "recurrence_end" timestamptz null, add column "participants" jsonb null, add column "reminder_minutes" int null, add column "visibility" text null;',
+    )
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(
+      'alter table "customer_interactions" drop column "duration_minutes", drop column "location", drop column "all_day", drop column "recurrence_rule", drop column "recurrence_end", drop column "participants", drop column "reminder_minutes", drop column "visibility";',
+    )
+  }
+}

package/src/modules/customers/migrations/Migration20260408225345.ts

@@ -0,0 +1,23 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260408225345 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "customer_person_company_links" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "is_primary" boolean not null default false, "created_at" timestamptz not null, "updated_at" timestamptz not null, "person_entity_id" uuid not null, "company_entity_id" uuid not null, constraint "customer_person_company_links_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_person_company_links_scope_idx" on "customer_person_company_links" ("organization_id", "tenant_id");`);
+    this.addSql(`create index "customer_person_company_links_company_idx" on "customer_person_company_links" ("company_entity_id");`);
+    this.addSql(`create index "customer_person_company_links_person_idx" on "customer_person_company_links" ("person_entity_id");`);
+    this.addSql(`alter table "customer_person_company_links" add constraint "customer_person_company_links_unique" unique ("person_entity_id", "company_entity_id");`);
+
+    this.addSql(`alter table "customer_person_company_links" add constraint "customer_person_company_links_person_entity_id_foreign" foreign key ("person_entity_id") references "customer_entities" ("id") on update cascade;`);
+    this.addSql(`alter table "customer_person_company_links" add constraint "customer_person_company_links_company_entity_id_foreign" foreign key ("company_entity_id") references "customer_entities" ("id") on update cascade;`);
+
+    this.addSql(`alter table "customer_deals" add column "closure_outcome" text null, add column "loss_reason_id" uuid null, add column "loss_notes" text null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_deals" drop column "closure_outcome", drop column "loss_reason_id", drop column "loss_notes";`);
+    this.addSql(`drop table if exists "customer_person_company_links" cascade;`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260411075533.ts

@@ -0,0 +1,30 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260411075533 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "customer_dictionary_kind_settings" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "kind" text not null, "selection_mode" text not null default 'single', "visible_in_tags" boolean not null default true, "sort_order" int not null default 0, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "customer_dictionary_kind_settings_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_dict_kind_settings_scope_idx" on "customer_dictionary_kind_settings" ("organization_id", "tenant_id");`);
+    this.addSql(`alter table "customer_dictionary_kind_settings" add constraint "customer_dict_kind_settings_unique" unique ("organization_id", "tenant_id", "kind");`);
+
+    this.addSql(`create table "customer_labels" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "user_id" uuid not null, "slug" text not null, "label" text not null, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "customer_labels_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_labels_scope_idx" on "customer_labels" ("organization_id", "tenant_id", "user_id");`);
+    this.addSql(`alter table "customer_labels" add constraint "customer_labels_unique" unique ("user_id", "tenant_id", "organization_id", "slug");`);
+
+    this.addSql(`create table "customer_label_assignments" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "user_id" uuid not null, "label_id" uuid not null, "entity_id" uuid not null, "created_at" timestamptz not null, constraint "customer_label_assignments_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_label_assignments_entity_idx" on "customer_label_assignments" ("entity_id");`);
+    this.addSql(`alter table "customer_label_assignments" add constraint "customer_label_assignments_unique" unique ("label_id", "entity_id");`);
+
+    this.addSql(`alter table "customer_label_assignments" add constraint "customer_label_assignments_label_id_foreign" foreign key ("label_id") references "customer_labels" ("id") on update cascade;`);
+    this.addSql(`alter table "customer_label_assignments" add constraint "customer_label_assignments_entity_id_foreign" foreign key ("entity_id") references "customer_entities" ("id") on update cascade;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_label_assignments" drop constraint if exists "customer_label_assignments_entity_id_foreign";`);
+    this.addSql(`alter table "customer_label_assignments" drop constraint "customer_label_assignments_label_id_foreign";`);
+    this.addSql(`drop table if exists "customer_label_assignments" cascade;`);
+    this.addSql(`drop table if exists "customer_labels" cascade;`);
+    this.addSql(`drop table if exists "customer_dictionary_kind_settings" cascade;`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260411103551.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260411103551 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_entities" add column "temperature" text null, add column "renewal_quarter" text null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_entities" drop column "temperature", drop column "renewal_quarter";`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260411130944.ts

@@ -0,0 +1,30 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260411130944 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "customer_company_billing" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "entity_id" uuid not null, "bank_name" text null, "bank_account_masked" text null, "payment_terms" text null, "preferred_currency" text null, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "customer_company_billing_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_company_billing_scope_idx" on "customer_company_billing" ("organization_id", "tenant_id");`);
+    this.addSql(`alter table "customer_company_billing" add constraint "customer_company_billing_entity_unique" unique ("entity_id");`);
+
+    this.addSql(`create table "customer_person_company_roles" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "person_entity_id" uuid not null, "company_entity_id" uuid not null, "role_value" text not null, "created_at" timestamptz not null, constraint "customer_person_company_roles_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_pcr_person_company_idx" on "customer_person_company_roles" ("person_entity_id", "company_entity_id");`);
+    this.addSql(`create index "customer_pcr_scope_idx" on "customer_person_company_roles" ("organization_id", "tenant_id");`);
+    this.addSql(`alter table "customer_person_company_roles" add constraint "customer_pcr_unique" unique ("person_entity_id", "company_entity_id", "role_value");`);
+
+    this.addSql(`alter table "customer_company_billing" add constraint "customer_company_billing_entity_id_foreign" foreign key ("entity_id") references "customer_entities" ("id") on update cascade;`);
+
+    this.addSql(`alter table "customer_person_company_roles" add constraint "customer_person_company_roles_person_entity_id_foreign" foreign key ("person_entity_id") references "customer_entities" ("id") on update cascade;`);
+    this.addSql(`alter table "customer_person_company_roles" add constraint "customer_person_company_roles_company_entity_id_foreign" foreign key ("company_entity_id") references "customer_entities" ("id") on update cascade;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_person_company_roles" drop constraint if exists "customer_person_company_roles_company_entity_id_foreign";`);
+    this.addSql(`alter table "customer_person_company_roles" drop constraint if exists "customer_person_company_roles_person_entity_id_foreign";`);
+    this.addSql(`alter table "customer_company_billing" drop constraint if exists "customer_company_billing_entity_id_foreign";`);
+
+    this.addSql(`drop table if exists "customer_person_company_roles";`);
+    this.addSql(`drop table if exists "customer_company_billing";`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260415095203.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260415095203 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_person_company_links" add column "deleted_at" timestamptz null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_person_company_links" drop column "deleted_at";`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260415135056.ts

@@ -0,0 +1,22 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260415135056 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "customer_deal_stage_transitions" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "pipeline_id" uuid not null, "stage_id" uuid not null, "stage_label" text not null, "stage_order" int not null, "transitioned_at" timestamptz not null, "transitioned_by_user_id" uuid null, "is_active" boolean not null default true, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, "deal_id" uuid not null, constraint "customer_deal_stage_transitions_pkey" primary key ("id"));`);
+    this.addSql(`create index "customer_deal_stage_transitions_org_tenant_idx" on "customer_deal_stage_transitions" ("organization_id", "tenant_id");`);
+    this.addSql(`create index "customer_deal_stage_transitions_deal_idx" on "customer_deal_stage_transitions" ("deal_id");`);
+    this.addSql(`alter table "customer_deal_stage_transitions" add constraint "customer_deal_stage_transitions_deal_stage_uq" unique ("deal_id", "stage_id");`);
+
+    this.addSql(`alter table "customer_deal_stage_transitions" add constraint "customer_deal_stage_transitions_deal_id_foreign" foreign key ("deal_id") references "customer_deals" ("id") on update cascade;`);
+
+    this.addSql(`create index "customer_deals_closure_stats_idx" on "customer_deals" ("organization_id", "tenant_id", "closure_outcome", "updated_at");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index "customer_deals_closure_stats_idx";`);
+    this.addSql(`alter table "customer_deal_stage_transitions" drop constraint "customer_deal_stage_transitions_deal_id_foreign";`);
+    this.addSql(`drop table if exists "customer_deal_stage_transitions" cascade;`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260417140000.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260417140000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_person_company_links" drop constraint if exists "customer_person_company_links_unique";`);
+    this.addSql(`create unique index "customer_person_company_links_active_unique" on "customer_person_company_links" ("person_entity_id", "company_entity_id") where "deleted_at" is null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "customer_person_company_links_active_unique";`);
+    this.addSql(`alter table "customer_person_company_links" add constraint "customer_person_company_links_unique" unique ("person_entity_id", "company_entity_id");`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260417160000.ts

@@ -0,0 +1,17 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260417160000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_entity_roles" add column "deleted_at" timestamptz null;`);
+    this.addSql(`alter table "customer_entity_roles" drop constraint if exists "customer_entity_roles_unique";`);
+    this.addSql(`create unique index "customer_entity_roles_active_unique" on "customer_entity_roles" ("entity_type", "entity_id", "role_type") where "deleted_at" is null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "customer_entity_roles_active_unique";`);
+    this.addSql(`alter table "customer_entity_roles" add constraint "customer_entity_roles_unique" unique ("entity_type", "entity_id", "role_type");`);
+    this.addSql(`alter table "customer_entity_roles" drop column "deleted_at";`);
+  }
+
+}

package/src/modules/customers/migrations/Migration20260417235407.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260417235407 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "customer_interactions" add column "linked_entities" jsonb null, add column "guest_permissions" jsonb null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "customer_interactions" drop column "linked_entities", drop column "guest_permissions";`);
+  }
+
+}

package/src/modules/customers/setup.ts

@@ -8,6 +8,8 @@ import {
   seedCustomerExamples,
   seedDefaultPipeline,
 } from './cli'
+import { ensureDictionaryEntry } from './commands/shared'
+import { DEFAULT_CUSTOMER_ROLE_TYPES } from './lib/customerRoleTypes'
 
 const interactionFeatureToggles = [
   {
@@ -61,6 +63,17 @@ export const setup: ModuleSetupConfig = {
     await seedDefaultPipeline(ctx.em, scope)
     await ensureCustomerCustomFieldDefinitions(ctx.em, ctx.tenantId)
     await seedInteractionFeatureToggles(ctx.em)
+    for (const entry of DEFAULT_CUSTOMER_ROLE_TYPES) {
+      await ensureDictionaryEntry(ctx.em, {
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        kind: 'customer_role_type',
+        value: entry.value,
+        label: entry.label,
+        color: entry.color,
+        icon: entry.icon,
+      })
+    }
   },
 
   seedExamples: async (ctx) => {
@@ -87,6 +100,8 @@ export const setup: ModuleSetupConfig = {
       'customers.widgets.next-interactions',
       'customers.widgets.new-customers',
       'customers.widgets.new-deals',
+      'customers.roles.view',
+      'customers.roles.manage',
     ],
   },
 }

package/src/modules/customers/subscribers/deal-closure-notification.ts

@@ -0,0 +1,22 @@
+import {
+  deliverDealClosureNotification,
+  type DealClosurePayload,
+} from '../lib/dealClosureNotification'
+
+export const metadata = {
+  event: 'customers.deal.won',
+  persistent: true,
+  id: 'customers:deal-won-notification',
+}
+
+type ResolverContext = {
+  resolve: <T = unknown>(name: string) => T
+  container?: { resolve<T = unknown>(name: string): T }
+}
+
+export default async function handleDealWon(
+  payload: DealClosurePayload,
+  ctx: ResolverContext,
+): Promise<void> {
+  await deliverDealClosureNotification(payload, ctx, 'customers.deal.won')
+}

package/src/modules/customers/subscribers/deal-lost-notification.ts

@@ -0,0 +1,22 @@
+import {
+  deliverDealClosureNotification,
+  type DealClosurePayload,
+} from '../lib/dealClosureNotification'
+
+export const metadata = {
+  event: 'customers.deal.lost',
+  persistent: true,
+  id: 'customers:deal-lost-notification',
+}
+
+type ResolverContext = {
+  resolve: <T = unknown>(name: string) => T
+  container?: { resolve<T = unknown>(name: string): T }
+}
+
+export default async function handleDealLost(
+  payload: DealClosurePayload,
+  ctx: ResolverContext,
+): Promise<void> {
+  await deliverDealClosureNotification(payload, ctx, 'customers.deal.lost')
+}

package/src/modules/dictionaries/api/[dictionaryId]/entries/[entryId]/route.ts

@@ -101,6 +101,8 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
       label: updated.label,
       color: updated.color,
       icon: updated.icon,
+      position: updated.position ?? 0,
+      isDefault: updated.isDefault ?? false,
       createdAt: updated.createdAt,
       updatedAt: updated.updatedAt,
     })

package/src/modules/dictionaries/api/[dictionaryId]/entries/reorder/route.ts

@@ -0,0 +1,162 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import { Dictionary } from '@open-mercato/core/modules/dictionaries/data/entities'
+import { resolveDictionariesRouteContext } from '@open-mercato/core/modules/dictionaries/api/context'
+import {
+  reorderDictionaryEntriesCommandSchema,
+  reorderDictionaryEntriesSchema,
+  type ReorderDictionaryEntriesCommandInput,
+} from '@open-mercato/core/modules/dictionaries/data/validators'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import type { CommandBus } from '@open-mercato/shared/lib/commands'
+import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import {
+  runCrudMutationGuardAfterSuccess,
+  validateCrudMutationGuard,
+} from '@open-mercato/shared/lib/crud/mutation-guard'
+import {
+  dictionaryIdParamsSchema,
+  dictionariesErrorSchema,
+  dictionariesOkSchema,
+  dictionariesTag,
+  reorderEntriesRequestSchema,
+} from '../../../openapi'
+import { resolveDictionaryActorId } from '../../../context'
+
+const paramsSchema = z.object({ dictionaryId: z.string().uuid() })
+
+export const metadata = {
+  POST: { requireAuth: true, requireFeatures: ['dictionaries.manage'] },
+}
+
+export async function POST(req: Request, ctx: { params?: { dictionaryId?: string } }) {
+  try {
+    const context = await resolveDictionariesRouteContext(req)
+    if (!context.auth) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+    const { dictionaryId } = paramsSchema.parse({ dictionaryId: ctx.params?.dictionaryId })
+
+    if (!context.organizationId) {
+      throw new CrudHttpError(400, { error: context.translate('dictionaries.errors.organization_required', 'Organization context is required') })
+    }
+    const dictionaryEm = context.em.fork()
+    const dictionary = await findOneWithDecryption(
+      dictionaryEm,
+      Dictionary,
+      {
+        id: dictionaryId,
+        organizationId: context.organizationId,
+        tenantId: context.tenantId,
+        deletedAt: null,
+      },
+      undefined,
+      { tenantId: context.tenantId, organizationId: context.organizationId },
+    )
+    if (!dictionary) {
+      throw new CrudHttpError(404, { error: context.translate('dictionaries.errors.not_found', 'Dictionary not found') })
+    }
+
+    const payload = reorderDictionaryEntriesSchema.parse(await readJsonSafe(req, {}))
+    const guardUserId = resolveDictionaryActorId(context.auth)
+    const guardResult = await validateCrudMutationGuard(context.container, {
+      tenantId: context.tenantId,
+      organizationId: context.organizationId,
+      userId: guardUserId,
+      resourceKind: 'dictionaries.dictionary',
+      resourceId: dictionaryId,
+      operation: 'custom',
+      requestMethod: req.method,
+      requestHeaders: req.headers,
+      mutationPayload: payload,
+    })
+    if (guardResult && !guardResult.ok) {
+      return NextResponse.json(guardResult.body, { status: guardResult.status })
+    }
+
+    const commandInput = reorderDictionaryEntriesCommandSchema.parse({
+      dictionaryId,
+      tenantId: context.tenantId,
+      organizationId: context.organizationId,
+      entries: payload.entries,
+    } satisfies ReorderDictionaryEntriesCommandInput)
+
+    const commandBus = context.container.resolve('commandBus') as CommandBus
+    const { logEntry } = await commandBus.execute<ReorderDictionaryEntriesCommandInput, { dictionaryId: string; updatedIds: string[] }>(
+      'dictionaries.entries.reorder',
+      {
+        input: commandInput,
+        ctx: context.ctx,
+      },
+    )
+
+    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
+      await runCrudMutationGuardAfterSuccess(context.container, {
+        tenantId: context.tenantId,
+        organizationId: context.organizationId,
+        userId: guardUserId,
+        resourceKind: 'dictionaries.dictionary',
+        resourceId: dictionaryId,
+        operation: 'custom',
+        requestMethod: req.method,
+        requestHeaders: req.headers,
+        metadata: guardResult.metadata ?? null,
+      })
+    }
+
+    const response = NextResponse.json({ ok: true })
+    if (logEntry?.undoToken && logEntry.id && logEntry.commandId) {
+      response.headers.set(
+        'x-om-operation',
+        serializeOperationMetadata({
+          id: logEntry.id,
+          undoToken: logEntry.undoToken,
+          commandId: logEntry.commandId,
+          actionLabel: logEntry.actionLabel ?? null,
+          resourceKind: logEntry.resourceKind ?? 'dictionaries.dictionary',
+          resourceId: logEntry.resourceId ?? dictionaryId,
+          executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : new Date().toISOString(),
+        }),
+      )
+    }
+    return response
+  } catch (err) {
+    if (err instanceof CrudHttpError) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
+    console.error('[dictionaries/:id/entries/reorder.POST] Unexpected error', err)
+    return NextResponse.json({ error: 'Failed to reorder dictionary entries' }, { status: 500 })
+  }
+}
+
+const reorderPostDoc: OpenApiMethodDoc = {
+  summary: 'Reorder dictionary entries',
+  description: 'Updates the position of dictionary entries for drag-and-drop reordering.',
+  tags: [dictionariesTag],
+  requestBody: {
+    contentType: 'application/json',
+    schema: reorderEntriesRequestSchema,
+    description: 'Array of entry IDs with their new positions.',
+  },
+  responses: [
+    { status: 200, description: 'Entries reordered.', schema: dictionariesOkSchema },
+  ],
+  errors: [
+    { status: 400, description: 'Validation failed', schema: dictionariesErrorSchema },
+    { status: 401, description: 'Authentication required', schema: dictionariesErrorSchema },
+    { status: 404, description: 'Dictionary not found', schema: dictionariesErrorSchema },
+    { status: 500, description: 'Failed to reorder entries', schema: dictionariesErrorSchema },
+  ],
+}
+
+export const openApi: OpenApiRouteDoc = {
+  tag: dictionariesTag,
+  summary: 'Reorder dictionary entries',
+  pathParams: dictionaryIdParamsSchema,
+  methods: {
+    POST: reorderPostDoc,
+  },
+}

package/src/modules/dictionaries/api/[dictionaryId]/entries/route.ts

@@ -71,7 +71,7 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
         organizationId: dictionary.organizationId,
         tenantId: dictionary.tenantId,
       },
-      { orderBy: { label: 'asc' } },
+      { orderBy: { position: 'asc', label: 'asc' } },
     )
 
     return NextResponse.json({
@@ -81,6 +81,8 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
         label: entry.label,
         color: entry.color,
         icon: entry.icon,
+        position: entry.position ?? 0,
+        isDefault: entry.isDefault ?? false,
         createdAt: entry.createdAt,
         updatedAt: entry.updatedAt,
       })),
@@ -129,6 +131,8 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
       label: entry.label,
       color: entry.color,
       icon: entry.icon,
+      position: entry.position ?? 0,
+      isDefault: entry.isDefault ?? false,
       createdAt: entry.createdAt,
       updatedAt: entry.updatedAt,
     }, { status: 201 })
@@ -158,7 +162,7 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
 
 const dictionaryEntriesGetDoc: OpenApiMethodDoc = {
   summary: 'List dictionary entries',
-  description: 'Returns entries for the specified dictionary ordered alphabetically.',
+  description: 'Returns entries for the specified dictionary ordered by position.',
   tags: [dictionariesTag],
   responses: [
     { status: 200, description: 'Dictionary entries.', schema: dictionaryEntryListResponseSchema },