@open-mercato/core 0.4.5-develop-f4858e0ef3 → 0.4.5-develop-4849712ccb

package/src/modules/sales/api/quote-lines/route.ts

@@ -1,57 +1,79 @@
-import { z } from 'zod'
-import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
-import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { buildCustomFieldFiltersFromQuery, extractAllCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields'
-import { SalesQuoteLine } from '../../data/entities'
-import { quoteLineCreateSchema } from '../../data/validators'
-import { createPagedListResponseSchema, createSalesCrudOpenApi, defaultOkResponseSchema } from '../openapi'
-import { withScopedPayload } from '../utils'
-import { E } from '#generated/entities.ids.generated'
-import * as F from '#generated/entities/sales_quote_line'
+import { z } from "zod";
+import { makeCrudRoute } from "@open-mercato/shared/lib/crud/factory";
+import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import {
+  buildCustomFieldFiltersFromQuery,
+  extractAllCustomFieldEntries,
+} from "@open-mercato/shared/lib/crud/custom-fields";
+import { SalesQuoteLine } from "../../data/entities";
+import { quoteLineCreateSchema } from "../../data/validators";
+import {
+  createPagedListResponseSchema,
+  createSalesCrudOpenApi,
+  defaultOkResponseSchema,
+} from "../openapi";
+import { withScopedPayload } from "../utils";
+import { E } from "#generated/entities.ids.generated";
+import * as F from "#generated/entities/sales_quote_line";
+import { canonicalizeUnitCode, REFERENCE_UNIT_CODES } from "@open-mercato/shared/lib/units/unitCodes";
 
-const rawBodySchema = z.object({}).passthrough()
-const resolveRawBody = (raw: unknown) => (raw && typeof raw === 'object' && 'body' in raw ? (raw as any).body : raw)
+const rawBodySchema = z.object({}).passthrough();
+const resolveRawBody = (raw: unknown): Record<string, unknown> => {
+  if (!raw || typeof raw !== "object") return {};
+  if ("body" in raw) {
+    const payload = raw as { body?: unknown };
+    if (payload.body && typeof payload.body === "object") {
+      return payload.body as Record<string, unknown>;
+    }
+  }
+  return raw as Record<string, unknown>;
+};
 
 const listSchema = z
   .object({
     page: z.coerce.number().min(1).default(1),
-    pageSize: z.coerce.number().min(1).max(200).default(50),
+    pageSize: z.coerce.number().min(1).max(100).default(50),
     id: z.string().uuid().optional(),
     quoteId: z.string().uuid().optional(),
     sortField: z.string().optional(),
-    sortDir: z.enum(['asc', 'desc']).optional(),
+    sortDir: z.enum(["asc", "desc"]).optional(),
   })
-  .passthrough()
+  .passthrough();
 
 const routeMetadata = {
-  GET: { requireAuth: true, requireFeatures: ['sales.quotes.view'] },
-  POST: { requireAuth: true, requireFeatures: ['sales.quotes.manage'] },
-  PUT: { requireAuth: true, requireFeatures: ['sales.quotes.manage'] },
-  DELETE: { requireAuth: true, requireFeatures: ['sales.quotes.manage'] },
-}
+  GET: { requireAuth: true, requireFeatures: ["sales.quotes.view"] },
+  POST: { requireAuth: true, requireFeatures: ["sales.quotes.manage"] },
+  PUT: { requireAuth: true, requireFeatures: ["sales.quotes.manage"] },
+  DELETE: { requireAuth: true, requireFeatures: ["sales.quotes.manage"] },
+};
 
-const upsertSchema = quoteLineCreateSchema.extend({ id: z.string().uuid().optional() })
+const upsertSchema = quoteLineCreateSchema.extend({
+  id: z.string().uuid().optional(),
+});
 const deleteSchema = z.object({
   id: z.string().uuid(),
   quoteId: z.string().uuid(),
-})
+});
 
 const crud = makeCrudRoute({
   metadata: routeMetadata,
   orm: {
     entity: SalesQuoteLine,
-    idField: 'id',
-    orgField: 'organizationId',
-    tenantField: 'tenantId',
-    softDeleteField: 'deletedAt',
+    idField: "id",
+    orgField: "organizationId",
+    tenantField: "tenantId",
+    softDeleteField: "deletedAt",
+  },
+  indexer: {
+    entityType: E.sales.sales_quote_line,
   },
   list: {
     schema: listSchema,
     entityId: E.sales.sales_quote_line,
     fields: [
       F.id,
-      'quote_id',
+      "quote_id",
       F.line_number,
       F.kind,
       F.status_entry_id,
@@ -64,6 +86,9 @@ const crud = makeCrudRoute({
       F.comment,
       F.quantity,
       F.quantity_unit,
+      F.normalized_quantity,
+      F.normalized_unit,
+      F.uom_snapshot,
       F.currency_code,
       F.unit_price_net,
       F.unit_price_gross,
@@ -87,74 +112,134 @@ const crud = makeCrudRoute({
       lineNumber: F.line_number,
     },
     buildFilters: async (query, ctx) => {
-      const filters: Record<string, unknown> = {}
-      if (query.id) filters.id = { $eq: query.id }
-      if (query.quoteId) filters.quote_id = { $eq: query.quoteId }
+      const filters: Record<string, unknown> = {};
+      if (query.id) filters.id = { $eq: query.id };
+      if (query.quoteId) filters.quote_id = { $eq: query.quoteId };
       try {
-        const em = ctx.container.resolve('em')
+        const em = ctx.container.resolve("em");
         const cfFilters = await buildCustomFieldFiltersFromQuery({
           entityId: E.sales.sales_quote_line,
           query,
           em,
           tenantId: ctx.auth?.tenantId ?? null,
-        })
-        Object.assign(filters, cfFilters)
+        });
+        Object.assign(filters, cfFilters);
       } catch {
         // ignore
       }
-      return filters
+      return filters;
     },
-    transformItem: (item: any) => {
-      if (!item) return item
-      const normalized = { ...item }
-      const cfEntries = extractAllCustomFieldEntries(item)
+    transformItem: (item: Record<string, unknown> | null | undefined) => {
+      if (!item) return item;
+      const normalized = { ...item };
+      const cfEntries = extractAllCustomFieldEntries(item);
       for (const key of Object.keys(normalized)) {
-        if (key.startsWith('cf:')) delete normalized[key]
+        if (key.startsWith("cf:")) delete normalized[key];
       }
-      return { ...normalized, ...cfEntries }
+      const quantityUnit = canonicalizeUnitCode(
+        normalized["quantity_unit"] ?? normalized["quantityUnit"],
+      );
+      const normalizedUnit =
+        canonicalizeUnitCode(
+          normalized["normalized_unit"] ?? normalized["normalizedUnit"],
+        ) ?? quantityUnit;
+      return {
+        ...normalized,
+        quantity_unit: quantityUnit,
+        normalized_unit: normalizedUnit,
+        ...cfEntries,
+      };
     },
   },
   actions: {
     create: {
-      commandId: 'sales.quotes.lines.upsert',
+      commandId: "sales.quotes.lines.upsert",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const payload = upsertSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
-        return { body: payload }
+        const { translate } = await resolveTranslations();
+        const payload = upsertSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
+        return { body: payload };
       },
-      response: ({ result }) => ({ id: result?.lineId ?? null, quoteId: result?.quoteId ?? null }),
+      response: ({ result }) => ({
+        id: result?.lineId ?? null,
+        quoteId: result?.quoteId ?? null,
+      }),
       status: 201,
     },
     update: {
-      commandId: 'sales.quotes.lines.upsert',
+      commandId: "sales.quotes.lines.upsert",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const payload = upsertSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
-        return { body: payload }
+        const { translate } = await resolveTranslations();
+        const payload = upsertSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
+        return { body: payload };
       },
-      response: ({ result }) => ({ id: result?.lineId ?? null, quoteId: result?.quoteId ?? null }),
+      response: ({ result }) => ({
+        id: result?.lineId ?? null,
+        quoteId: result?.quoteId ?? null,
+      }),
     },
     delete: {
-      commandId: 'sales.quotes.lines.delete',
+      commandId: "sales.quotes.lines.delete",
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
-        const { translate } = await resolveTranslations()
-        const payload = deleteSchema.parse(withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate))
+        const { translate } = await resolveTranslations();
+        const payload = deleteSchema.parse(
+          withScopedPayload(resolveRawBody(raw) ?? {}, ctx, translate),
+        );
         if (!payload.id || !payload.quoteId) {
-          throw new CrudHttpError(400, { error: translate('sales.documents.detail.error', 'Document not found or inaccessible.') })
+          throw new CrudHttpError(400, {
+            error: translate(
+              "sales.documents.detail.error",
+              "Document not found or inaccessible.",
+            ),
+          });
         }
-        return { body: payload }
+        return { body: payload };
       },
       response: () => ({ ok: true }),
     },
   },
-})
+});
+
+const { GET, POST, PUT, DELETE } = crud;
 
-const { GET, POST, PUT, DELETE } = crud
+export { GET, POST, PUT, DELETE };
 
-export { GET, POST, PUT, DELETE }
+const uomSnapshotOpenApiSchema = z
+  .object({
+    version: z.literal(1),
+    productId: z.string().nullable(),
+    productVariantId: z.string().nullable(),
+    baseUnitCode: z.string().nullable(),
+    enteredUnitCode: z.string().nullable(),
+    enteredQuantity: z.string(),
+    toBaseFactor: z.string(),
+    normalizedQuantity: z.string(),
+    rounding: z.object({
+      mode: z.enum(["half_up", "down", "up"]),
+      scale: z.number().int(),
+    }),
+    source: z.object({
+      conversionId: z.string().nullable(),
+      resolvedAt: z.string(),
+    }),
+    unitPriceReference: z
+      .object({
+        enabled: z.boolean(),
+        referenceUnitCode: z.enum(REFERENCE_UNIT_CODES).nullable(),
+        baseQuantity: z.string().nullable(),
+        grossPerReference: z.string().nullable().optional(),
+        netPerReference: z.string().nullable().optional(),
+      })
+      .optional(),
+  })
+  .nullable()
+  .optional();
 
 const quoteLineSchema = z.object({
   id: z.string().uuid(),
@@ -171,6 +256,9 @@ const quoteLineSchema = z.object({
   comment: z.string().nullable().optional(),
   quantity: z.number(),
   quantity_unit: z.string().nullable().optional(),
+  normalized_quantity: z.number(),
+  normalized_unit: z.string().nullable().optional(),
+  uom_snapshot: uomSnapshotOpenApiSchema,
   currency_code: z.string(),
   unit_price_net: z.number(),
   unit_price_gross: z.number(),
@@ -187,25 +275,31 @@ const quoteLineSchema = z.object({
   custom_field_set_id: z.string().uuid().nullable().optional(),
   created_at: z.string(),
   updated_at: z.string(),
-})
+});
 
 export const openApi = createSalesCrudOpenApi({
-  resourceName: 'Quote line',
+  resourceName: "Quote line",
   querySchema: listSchema,
   listResponseSchema: createPagedListResponseSchema(quoteLineSchema),
   create: {
     schema: upsertSchema,
-    responseSchema: z.object({ id: z.string().uuid().nullable(), quoteId: z.string().uuid().nullable() }),
-    description: 'Creates a quote line and recalculates totals.',
+    responseSchema: z.object({
+      id: z.string().uuid().nullable(),
+      quoteId: z.string().uuid().nullable(),
+    }),
+    description: "Creates a quote line and recalculates totals.",
   },
   update: {
     schema: upsertSchema,
-    responseSchema: z.object({ id: z.string().uuid().nullable(), quoteId: z.string().uuid().nullable() }),
-    description: 'Updates a quote line and recalculates totals.',
+    responseSchema: z.object({
+      id: z.string().uuid().nullable(),
+      quoteId: z.string().uuid().nullable(),
+    }),
+    description: "Updates a quote line and recalculates totals.",
   },
   del: {
     schema: deleteSchema,
     responseSchema: defaultOkResponseSchema,
-    description: 'Deletes a quote line and recalculates totals.',
+    description: "Deletes a quote line and recalculates totals.",
   },
-})
+});

package/src/modules/sales/api/quotes/public/[token]/route.ts

@@ -1,38 +1,60 @@
-import { NextResponse } from 'next/server'
-import { z } from 'zod'
-import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
-import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import type { EntityManager } from '@mikro-orm/postgresql'
-import { SalesQuote, SalesQuoteLine, SalesQuoteAdjustment } from '../../../../data/entities'
+import { NextResponse } from "next/server";
+import { z } from "zod";
+import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
+import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import type { OpenApiRouteDoc } from "@open-mercato/shared/lib/openapi";
+import type { EntityManager } from "@mikro-orm/postgresql";
+import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import {
+  SalesQuote,
+  SalesQuoteLine,
+  SalesQuoteAdjustment,
+} from "../../../../data/entities";
+import { canonicalizeUnitCode } from "@open-mercato/shared/lib/units/unitCodes";
 
 const paramsSchema = z.object({
   token: z.string().uuid(),
-})
+});
 
 export const metadata = {
   GET: { requireAuth: false },
-}
+};
 
 export async function GET(_req: Request, ctx: { params: { token: string } }) {
   try {
-    const { token } = paramsSchema.parse(ctx.params ?? {})
-    const container = await createRequestContainer()
-    const em = container.resolve('em') as EntityManager
-    const quote = await em.findOne(SalesQuote, { acceptanceToken: token, deletedAt: null })
-    const { translate } = await resolveTranslations()
+    const { token } = paramsSchema.parse(ctx.params ?? {});
+    const container = await createRequestContainer();
+    const em = container.resolve("em") as EntityManager;
+    const quote = await findOneWithDecryption(em, SalesQuote, {
+      acceptanceToken: token,
+      deletedAt: null,
+    });
+    const { translate } = await resolveTranslations();
     if (!quote) {
-      throw new CrudHttpError(404, { error: translate('sales.quotes.public.notFound', 'Quote not found.') })
+      throw new CrudHttpError(404, {
+        error: translate("sales.quotes.public.notFound", "Quote not found."),
+      });
     }
 
-    const now = new Date()
-    const isExpired = !!quote.validUntil && quote.validUntil.getTime() < now.getTime()
+    const now = new Date();
+    const isExpired =
+      !!quote.validUntil && quote.validUntil.getTime() < now.getTime();
 
     const [lines, adjustments] = await Promise.all([
-      em.find(SalesQuoteLine, { quote: quote.id, deletedAt: null }, { orderBy: { lineNumber: 'asc' } }),
-      em.find(SalesQuoteAdjustment, { quote: quote.id }, { orderBy: { position: 'asc' } }),
-    ])
+      findWithDecryption(
+        em,
+        SalesQuoteLine,
+        { quote: quote.id, organizationId: quote.organizationId, tenantId: quote.tenantId, deletedAt: null },
+        { orderBy: { lineNumber: "asc" } },
+      ),
+      findWithDecryption(
+        em,
+        SalesQuoteAdjustment,
+        { quote: quote.id, organizationId: quote.organizationId, tenantId: quote.tenantId },
+        { orderBy: { position: "asc" } },
+      ),
+    ]);
 
     return NextResponse.json({
       quote: {
@@ -54,7 +76,17 @@ export async function GET(_req: Request, ctx: { params: { token: string } }) {
         name: line.name ?? null,
         description: line.description ?? null,
         quantity: line.quantity,
-        quantityUnit: line.quantityUnit ?? null,
+        quantityUnit: canonicalizeUnitCode(line.quantityUnit) ?? null,
+        normalizedQuantity: line.normalizedQuantity ?? line.quantity,
+        normalizedUnit:
+          canonicalizeUnitCode(line.normalizedUnit ?? line.quantityUnit) ??
+          null,
+        uomSnapshot: line.uomSnapshot
+          ? {
+              baseUnitCode: line.uomSnapshot.baseUnitCode ?? null,
+              enteredUnitCode: line.uomSnapshot.enteredUnitCode ?? null,
+            }
+          : null,
         currencyCode: line.currencyCode,
         unitPriceNet: line.unitPriceNet,
         unitPriceGross: line.unitPriceGross,
@@ -64,6 +96,18 @@ export async function GET(_req: Request, ctx: { params: { token: string } }) {
         taxAmount: line.taxAmount,
         totalNetAmount: line.totalNetAmount,
         totalGrossAmount: line.totalGrossAmount,
+        unitPriceReference: (() => {
+          if (!line.uomSnapshot) return null;
+          const ref = line.uomSnapshot.unitPriceReference;
+          if (!ref) return null;
+          return {
+            enabled: ref.enabled ?? null,
+            referenceUnitCode: ref.referenceUnitCode ?? null,
+            baseQuantity: ref.baseQuantity ?? null,
+            grossPerReference: ref.grossPerReference ?? null,
+            netPerReference: ref.netPerReference ?? null,
+          };
+        })(),
       })),
       adjustments: adjustments.map((adj) => ({
         scope: adj.scope,
@@ -77,14 +121,19 @@ export async function GET(_req: Request, ctx: { params: { token: string } }) {
         quoteLineId: adj.quoteLine?.id ?? null,
       })),
       isExpired,
-    })
+    });
   } catch (err) {
     if (err instanceof CrudHttpError) {
-      return NextResponse.json(err.body, { status: err.status })
+      return NextResponse.json(err.body, { status: err.status });
     }
-    const { translate } = await resolveTranslations()
-    console.error('sales.quotes.public failed', err)
-    return NextResponse.json({ error: translate('sales.quotes.public.failed', 'Failed to load quote.') }, { status: 400 })
+    const { translate } = await resolveTranslations();
+    console.error("sales.quotes.public failed", err);
+    return NextResponse.json(
+      {
+        error: translate("sales.quotes.public.failed", "Failed to load quote."),
+      },
+      { status: 400 },
+    );
   }
 }
 
@@ -110,9 +159,35 @@ const publicQuoteResponseSchema = z.object({
       description: z.string().nullable(),
       quantity: z.string(),
       quantityUnit: z.string().nullable(),
+      normalizedQuantity: z.string(),
+      normalizedUnit: z.string().nullable(),
+      uomSnapshot: z
+        .object({
+          baseUnitCode: z.string().nullable(),
+          enteredUnitCode: z.string().nullable(),
+        })
+        .nullable()
+        .optional(),
       currencyCode: z.string(),
+      unitPriceNet: z.string(),
+      unitPriceGross: z.string(),
+      discountAmount: z.string(),
+      discountPercent: z.string(),
+      taxRate: z.string(),
+      taxAmount: z.string(),
+      totalNetAmount: z.string(),
       totalGrossAmount: z.string(),
-    })
+      unitPriceReference: z
+        .object({
+          enabled: z.boolean().nullable().optional(),
+          referenceUnitCode: z.string().nullable().optional(),
+          baseQuantity: z.string().nullable().optional(),
+          grossPerReference: z.string().nullable().optional(),
+          netPerReference: z.string().nullable().optional(),
+        })
+        .nullable()
+        .optional(),
+    }),
   ),
   adjustments: z.array(
     z.object({
@@ -122,22 +197,33 @@ const publicQuoteResponseSchema = z.object({
       rate: z.string().nullable(),
       amountNet: z.string().nullable(),
       amountGross: z.string().nullable(),
-    })
+      currencyCode: z.string().nullable(),
+      position: z.number().nullable(),
+      quoteLineId: z.string().uuid().nullable(),
+    }),
   ),
   isExpired: z.boolean(),
-})
+});
 
 export const openApi: OpenApiRouteDoc = {
-  tag: 'Sales',
-  summary: 'View a quote (public)',
+  tag: "Sales",
+  summary: "View a quote (public)",
   pathParams: z.object({ token: z.string().uuid() }),
   methods: {
     GET: {
-      summary: 'Get quote details by acceptance token',
+      summary: "Get quote details by acceptance token",
       responses: [
-        { status: 200, description: 'Quote details', schema: publicQuoteResponseSchema },
-        { status: 404, description: 'Quote not found', schema: z.object({ error: z.string() }) },
+        {
+          status: 200,
+          description: "Quote details",
+          schema: publicQuoteResponseSchema,
+        },
+        {
+          status: 404,
+          description: "Quote not found",
+          schema: z.object({ error: z.string() }),
+        },
       ],
     },
   },
-}
+};