@porulle/core 0.7.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/middleware.d.ts.map +1 -1
- package/dist/auth/middleware.js +26 -7
- package/dist/auth/setup.d.ts.map +1 -1
- package/dist/auth/setup.js +8 -5
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +7 -0
- package/dist/config/types.d.ts +26 -1
- package/dist/config/types.d.ts.map +1 -1
- package/dist/generated/plugin-manifest.d.ts +3 -0
- package/dist/generated/plugin-manifest.d.ts.map +1 -1
- package/dist/generated/plugin-manifest.js +1 -0
- package/dist/hooks/checkout-completion.d.ts.map +1 -1
- package/dist/hooks/checkout-completion.js +2 -2
- package/dist/hooks/checkout.d.ts.map +1 -1
- package/dist/hooks/checkout.js +17 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/interfaces/rest/index.d.ts.map +1 -1
- package/dist/interfaces/rest/index.js +12 -0
- package/dist/interfaces/rest/routes/admin/staff.d.ts +12 -0
- package/dist/interfaces/rest/routes/admin/staff.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/admin/staff.js +206 -0
- package/dist/interfaces/rest/routes/analytics.d.ts +5 -0
- package/dist/interfaces/rest/routes/analytics.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/analytics.js +24 -0
- package/dist/interfaces/rest/routes/carts.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/carts.js +39 -2
- package/dist/interfaces/rest/routes/catalog.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/catalog.js +17 -1
- package/dist/interfaces/rest/routes/checkout.d.ts +9 -0
- package/dist/interfaces/rest/routes/checkout.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/checkout.js +97 -21
- package/dist/interfaces/rest/routes/documents.d.ts +10 -0
- package/dist/interfaces/rest/routes/documents.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/documents.js +40 -0
- package/dist/interfaces/rest/routes/inventory.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/inventory.js +13 -0
- package/dist/interfaces/rest/routes/orders.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/orders.js +111 -1
- package/dist/interfaces/rest/routes/pricing.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/pricing.js +36 -1
- package/dist/interfaces/rest/routes/settings.d.ts +5 -0
- package/dist/interfaces/rest/routes/settings.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/settings.js +50 -0
- package/dist/interfaces/rest/routes/shipping.d.ts +5 -0
- package/dist/interfaces/rest/routes/shipping.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/shipping.js +68 -0
- package/dist/interfaces/rest/routes/tax.d.ts +5 -0
- package/dist/interfaces/rest/routes/tax.d.ts.map +1 -0
- package/dist/interfaces/rest/routes/tax.js +68 -0
- package/dist/interfaces/rest/schemas/admin-staff.d.ts +899 -0
- package/dist/interfaces/rest/schemas/admin-staff.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/admin-staff.js +98 -0
- package/dist/interfaces/rest/schemas/analytics.d.ts +252 -0
- package/dist/interfaces/rest/schemas/analytics.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/analytics.js +33 -0
- package/dist/interfaces/rest/schemas/carts.d.ts +656 -0
- package/dist/interfaces/rest/schemas/carts.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/carts.js +38 -0
- package/dist/interfaces/rest/schemas/catalog.d.ts +1218 -1
- package/dist/interfaces/rest/schemas/catalog.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/catalog.js +48 -0
- package/dist/interfaces/rest/schemas/checkout.d.ts +2 -0
- package/dist/interfaces/rest/schemas/checkout.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/checkout.js +4 -0
- package/dist/interfaces/rest/schemas/customer-portal.d.ts +35 -0
- package/dist/interfaces/rest/schemas/customer-portal.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/documents.d.ts +509 -0
- package/dist/interfaces/rest/schemas/documents.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/documents.js +65 -0
- package/dist/interfaces/rest/schemas/orders.d.ts +3110 -43
- package/dist/interfaces/rest/schemas/orders.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/orders.js +234 -1
- package/dist/interfaces/rest/schemas/pricing.d.ts +405 -0
- package/dist/interfaces/rest/schemas/pricing.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/pricing.js +70 -0
- package/dist/interfaces/rest/schemas/responses.d.ts +190 -0
- package/dist/interfaces/rest/schemas/responses.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/search.d.ts +17 -0
- package/dist/interfaces/rest/schemas/search.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/settings.d.ts +397 -0
- package/dist/interfaces/rest/schemas/settings.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/settings.js +79 -0
- package/dist/interfaces/rest/schemas/shipping.d.ts +1093 -0
- package/dist/interfaces/rest/schemas/shipping.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/shipping.js +146 -0
- package/dist/interfaces/rest/schemas/tax.d.ts +1074 -0
- package/dist/interfaces/rest/schemas/tax.d.ts.map +1 -0
- package/dist/interfaces/rest/schemas/tax.js +132 -0
- package/dist/kernel/database/schema.d.ts +4 -0
- package/dist/kernel/database/schema.d.ts.map +1 -1
- package/dist/kernel/database/schema.js +8 -0
- package/dist/kernel/database/scoped-db.d.ts +2 -1
- package/dist/kernel/database/scoped-db.d.ts.map +1 -1
- package/dist/kernel/database/scoped-db.js +62 -1
- package/dist/kernel/hooks/types.d.ts +1 -1
- package/dist/kernel/hooks/types.d.ts.map +1 -1
- package/dist/kernel/plugin/manifest.d.ts +26 -0
- package/dist/kernel/plugin/manifest.d.ts.map +1 -1
- package/dist/kernel/plugin/manifest.js +17 -2
- package/dist/modules/analytics/drizzle-adapter.d.ts.map +1 -1
- package/dist/modules/analytics/drizzle-adapter.js +16 -3
- package/dist/modules/analytics/module.d.ts.map +1 -1
- package/dist/modules/analytics/module.js +6 -0
- package/dist/modules/analytics/reports.d.ts +58 -0
- package/dist/modules/analytics/reports.d.ts.map +1 -0
- package/dist/modules/analytics/reports.js +249 -0
- package/dist/modules/analytics/service.d.ts +10 -0
- package/dist/modules/analytics/service.d.ts.map +1 -1
- package/dist/modules/analytics/service.js +14 -0
- package/dist/modules/cart/repository/index.d.ts +7 -0
- package/dist/modules/cart/repository/index.d.ts.map +1 -1
- package/dist/modules/cart/repository/index.js +25 -1
- package/dist/modules/cart/schema.d.ts +17 -0
- package/dist/modules/cart/schema.d.ts.map +1 -1
- package/dist/modules/cart/schema.js +2 -0
- package/dist/modules/cart/schemas.d.ts +1 -0
- package/dist/modules/cart/schemas.d.ts.map +1 -1
- package/dist/modules/cart/schemas.js +1 -0
- package/dist/modules/cart/service.d.ts +32 -0
- package/dist/modules/cart/service.d.ts.map +1 -1
- package/dist/modules/cart/service.js +61 -2
- package/dist/modules/catalog/entity-service.d.ts +21 -0
- package/dist/modules/catalog/entity-service.d.ts.map +1 -1
- package/dist/modules/catalog/entity-service.js +166 -5
- package/dist/modules/catalog/schema.d.ts +34 -0
- package/dist/modules/catalog/schema.d.ts.map +1 -1
- package/dist/modules/catalog/schema.js +5 -0
- package/dist/modules/catalog/schemas.d.ts +3 -0
- package/dist/modules/catalog/schemas.d.ts.map +1 -1
- package/dist/modules/catalog/schemas.js +3 -0
- package/dist/modules/catalog/service.d.ts +36 -0
- package/dist/modules/catalog/service.d.ts.map +1 -1
- package/dist/modules/catalog/service.js +6 -0
- package/dist/modules/customers/service.d.ts.map +1 -1
- package/dist/modules/customers/service.js +6 -0
- package/dist/modules/documents/module.d.ts +7 -0
- package/dist/modules/documents/module.d.ts.map +1 -0
- package/dist/modules/documents/module.js +12 -0
- package/dist/modules/documents/pdf.d.ts +25 -0
- package/dist/modules/documents/pdf.d.ts.map +1 -0
- package/dist/modules/documents/pdf.js +80 -0
- package/dist/modules/documents/render.d.ts +32 -0
- package/dist/modules/documents/render.d.ts.map +1 -0
- package/dist/modules/documents/render.js +190 -0
- package/dist/modules/documents/repository/index.d.ts +25 -0
- package/dist/modules/documents/repository/index.d.ts.map +1 -0
- package/dist/modules/documents/repository/index.js +47 -0
- package/dist/modules/documents/schema.d.ts +214 -0
- package/dist/modules/documents/schema.d.ts.map +1 -0
- package/dist/modules/documents/schema.js +42 -0
- package/dist/modules/documents/service.d.ts +51 -0
- package/dist/modules/documents/service.d.ts.map +1 -0
- package/dist/modules/documents/service.js +119 -0
- package/dist/modules/fulfillment/service.d.ts +18 -0
- package/dist/modules/fulfillment/service.d.ts.map +1 -1
- package/dist/modules/fulfillment/service.js +85 -1
- package/dist/modules/orders/repository/index.d.ts +18 -1
- package/dist/modules/orders/repository/index.d.ts.map +1 -1
- package/dist/modules/orders/repository/index.js +86 -1
- package/dist/modules/orders/schema.d.ts +391 -0
- package/dist/modules/orders/schema.d.ts.map +1 -1
- package/dist/modules/orders/schema.js +56 -1
- package/dist/modules/orders/service.d.ts +102 -3
- package/dist/modules/orders/service.d.ts.map +1 -1
- package/dist/modules/orders/service.js +653 -29
- package/dist/modules/orders/stale-order-cleanup.d.ts.map +1 -1
- package/dist/modules/orders/stale-order-cleanup.js +13 -1
- package/dist/modules/pricing/repository/index.d.ts +5 -0
- package/dist/modules/pricing/repository/index.d.ts.map +1 -1
- package/dist/modules/pricing/repository/index.js +19 -0
- package/dist/modules/pricing/service.d.ts +18 -0
- package/dist/modules/pricing/service.d.ts.map +1 -1
- package/dist/modules/pricing/service.js +43 -5
- package/dist/modules/settings/module.d.ts +6 -0
- package/dist/modules/settings/module.d.ts.map +1 -0
- package/dist/modules/settings/module.js +11 -0
- package/dist/modules/settings/repository/index.d.ts +16 -0
- package/dist/modules/settings/repository/index.d.ts.map +1 -0
- package/dist/modules/settings/repository/index.js +41 -0
- package/dist/modules/settings/schema.d.ts +121 -0
- package/dist/modules/settings/schema.d.ts.map +1 -0
- package/dist/modules/settings/schema.js +24 -0
- package/dist/modules/settings/service.d.ts +26 -0
- package/dist/modules/settings/service.d.ts.map +1 -0
- package/dist/modules/settings/service.js +51 -0
- package/dist/modules/shipping/calculator.d.ts +5 -0
- package/dist/modules/shipping/calculator.d.ts.map +1 -1
- package/dist/modules/shipping/calculator.js +10 -0
- package/dist/modules/shipping/module.d.ts +5 -1
- package/dist/modules/shipping/module.d.ts.map +1 -1
- package/dist/modules/shipping/module.js +4 -1
- package/dist/modules/shipping/repository/index.d.ts +27 -2
- package/dist/modules/shipping/repository/index.d.ts.map +1 -1
- package/dist/modules/shipping/repository/index.js +105 -1
- package/dist/modules/shipping/schema.d.ts +419 -0
- package/dist/modules/shipping/schema.d.ts.map +1 -0
- package/dist/modules/shipping/schema.js +56 -0
- package/dist/modules/shipping/service.d.ts +54 -0
- package/dist/modules/shipping/service.d.ts.map +1 -1
- package/dist/modules/shipping/service.js +161 -2
- package/dist/modules/tax/adapter.d.ts +13 -0
- package/dist/modules/tax/adapter.d.ts.map +1 -1
- package/dist/modules/tax/module.d.ts +5 -1
- package/dist/modules/tax/module.d.ts.map +1 -1
- package/dist/modules/tax/module.js +4 -1
- package/dist/modules/tax/repository/index.d.ts +38 -2
- package/dist/modules/tax/repository/index.d.ts.map +1 -1
- package/dist/modules/tax/repository/index.js +138 -1
- package/dist/modules/tax/schema.d.ts +355 -0
- package/dist/modules/tax/schema.d.ts.map +1 -0
- package/dist/modules/tax/schema.js +55 -0
- package/dist/modules/tax/service.d.ts +60 -1
- package/dist/modules/tax/service.d.ts.map +1 -1
- package/dist/modules/tax/service.js +227 -2
- package/dist/runtime/kernel-modules.d.ts +15 -2
- package/dist/runtime/kernel-modules.d.ts.map +1 -1
- package/dist/runtime/kernel-modules.js +4 -0
- package/dist/runtime/kernel-types.d.ts +5 -1
- package/dist/runtime/kernel-types.d.ts.map +1 -1
- package/dist/runtime/kernel-types.js +2 -0
- package/dist/runtime/server.js +1 -1
- package/dist/test-utils/create-plugin-test-app.d.ts +3 -0
- package/dist/test-utils/create-plugin-test-app.d.ts.map +1 -1
- package/dist/test-utils/create-plugin-test-app.js +15 -3
- package/dist/test-utils/create-test-config.d.ts.map +1 -1
- package/dist/test-utils/create-test-config.js +2 -0
- package/dist/test-utils/order-test-helpers.d.ts +12 -0
- package/dist/test-utils/order-test-helpers.d.ts.map +1 -0
- package/dist/test-utils/order-test-helpers.js +18 -0
- package/dist/test-utils/rest-api-test-utils.d.ts.map +1 -1
- package/dist/test-utils/rest-api-test-utils.js +7 -0
- package/dist/test-utils/test-actors.js +1 -1
- package/dist/testing.d.ts +1 -0
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +1 -0
- package/package.json +3 -3
- package/src/auth/middleware.ts +26 -7
- package/src/auth/setup.ts +11 -4
- package/src/config/defaults.ts +7 -0
- package/src/config/types.ts +26 -1
- package/src/generated/plugin-capabilities.d.ts +1 -0
- package/src/generated/plugin-manifest.ts +1 -0
- package/src/generated/plugin-repositories.d.ts +1 -0
- package/src/hooks/checkout-completion.ts +22 -16
- package/src/hooks/checkout.ts +36 -11
- package/src/index.ts +1 -0
- package/src/interfaces/rest/index.ts +12 -0
- package/src/interfaces/rest/routes/admin/staff.ts +260 -0
- package/src/interfaces/rest/routes/analytics.ts +33 -0
- package/src/interfaces/rest/routes/carts.ts +52 -2
- package/src/interfaces/rest/routes/catalog.ts +34 -0
- package/src/interfaces/rest/routes/checkout.ts +114 -27
- package/src/interfaces/rest/routes/documents.ts +61 -0
- package/src/interfaces/rest/routes/inventory.ts +14 -0
- package/src/interfaces/rest/routes/orders.ts +148 -1
- package/src/interfaces/rest/routes/pricing.ts +44 -1
- package/src/interfaces/rest/routes/settings.ts +61 -0
- package/src/interfaces/rest/routes/shipping.ts +92 -0
- package/src/interfaces/rest/routes/tax.ts +90 -0
- package/src/interfaces/rest/schemas/admin-staff.ts +110 -0
- package/src/interfaces/rest/schemas/analytics.ts +39 -0
- package/src/interfaces/rest/schemas/carts.ts +40 -0
- package/src/interfaces/rest/schemas/catalog.ts +53 -0
- package/src/interfaces/rest/schemas/checkout.ts +4 -0
- package/src/interfaces/rest/schemas/documents.ts +72 -0
- package/src/interfaces/rest/schemas/orders.ts +258 -1
- package/src/interfaces/rest/schemas/pricing.ts +75 -0
- package/src/interfaces/rest/schemas/settings.ts +93 -0
- package/src/interfaces/rest/schemas/shipping.ts +164 -0
- package/src/interfaces/rest/schemas/tax.ts +148 -0
- package/src/kernel/database/schema.ts +12 -0
- package/src/kernel/database/scoped-db.ts +70 -1
- package/src/kernel/hooks/types.ts +1 -0
- package/src/kernel/plugin/manifest.ts +41 -2
- package/src/modules/analytics/drizzle-adapter.ts +19 -3
- package/src/modules/analytics/module.ts +10 -0
- package/src/modules/analytics/reports.ts +311 -0
- package/src/modules/analytics/service.ts +23 -0
- package/src/modules/cart/repository/index.ts +30 -1
- package/src/modules/cart/schema.ts +2 -0
- package/src/modules/cart/schemas.ts +1 -0
- package/src/modules/cart/service.ts +104 -2
- package/src/modules/catalog/entity-service.ts +196 -4
- package/src/modules/catalog/schema.ts +5 -0
- package/src/modules/catalog/schemas.ts +3 -0
- package/src/modules/catalog/service.ts +30 -0
- package/src/modules/customers/service.ts +6 -0
- package/src/modules/documents/module.ts +19 -0
- package/src/modules/documents/pdf.ts +101 -0
- package/src/modules/documents/render.ts +231 -0
- package/src/modules/documents/repository/index.ts +68 -0
- package/src/modules/documents/schema.ts +44 -0
- package/src/modules/documents/service.ts +176 -0
- package/src/modules/fulfillment/service.ts +139 -1
- package/src/modules/orders/repository/index.ts +127 -1
- package/src/modules/orders/schema.ts +58 -1
- package/src/modules/orders/service.ts +1041 -65
- package/src/modules/orders/stale-order-cleanup.ts +18 -4
- package/src/modules/pricing/repository/index.ts +34 -0
- package/src/modules/pricing/service.ts +76 -6
- package/src/modules/settings/module.ts +18 -0
- package/src/modules/settings/repository/index.ts +59 -0
- package/src/modules/settings/schema.ts +25 -0
- package/src/modules/settings/service.ts +82 -0
- package/src/modules/shipping/calculator.ts +27 -0
- package/src/modules/shipping/module.ts +6 -2
- package/src/modules/shipping/repository/index.ts +136 -2
- package/src/modules/shipping/schema.ts +58 -0
- package/src/modules/shipping/service.ts +260 -1
- package/src/modules/tax/adapter.ts +9 -0
- package/src/modules/tax/module.ts +6 -2
- package/src/modules/tax/repository/index.ts +169 -2
- package/src/modules/tax/schema.ts +57 -0
- package/src/modules/tax/service.ts +313 -2
- package/src/runtime/kernel-modules.ts +4 -0
- package/src/runtime/kernel-types.ts +6 -0
- package/src/runtime/server.ts +1 -1
- package/src/test-utils/create-plugin-test-app.ts +17 -4
- package/src/test-utils/create-test-config.ts +2 -0
- package/src/test-utils/order-test-helpers.ts +26 -0
- package/src/test-utils/rest-api-test-utils.ts +7 -0
- package/src/test-utils/test-actors.ts +1 -1
- package/src/testing.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stale-order-cleanup.d.ts","sourceRoot":"","sources":["../../../src/modules/orders/stale-order-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stale-order-cleanup.d.ts","sourceRoot":"","sources":["../../../src/modules/orders/stale-order-cleanup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAejE;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAChD;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3B;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAkD/C,CAAC"}
|
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
import { eq, and, lt } from "drizzle-orm";
|
|
2
2
|
import { orders } from "./schema.js";
|
|
3
|
+
function systemActorForOrg(organizationId) {
|
|
4
|
+
return {
|
|
5
|
+
type: "user",
|
|
6
|
+
userId: "system",
|
|
7
|
+
email: null,
|
|
8
|
+
name: "System",
|
|
9
|
+
vendorId: null,
|
|
10
|
+
organizationId,
|
|
11
|
+
role: "admin",
|
|
12
|
+
permissions: ["*:*"],
|
|
13
|
+
};
|
|
14
|
+
}
|
|
3
15
|
/**
|
|
4
16
|
* Stale Order Cleanup Task
|
|
5
17
|
*
|
|
@@ -34,7 +46,7 @@ export const staleOrderCleanupTask = {
|
|
|
34
46
|
const orderService = ctx.services.orders;
|
|
35
47
|
for (const order of staleOrders) {
|
|
36
48
|
try {
|
|
37
|
-
await orderService.cancel(order.id,
|
|
49
|
+
await orderService.cancel(order.id, systemActorForOrg(order.organizationId), `Auto-cancelled: pending for >${thresholdHours}h`);
|
|
38
50
|
cancelledIds.push(order.id);
|
|
39
51
|
ctx.logger.info(`Stale order ${order.orderNumber} auto-cancelled`, {
|
|
40
52
|
orderId: order.id,
|
|
@@ -25,6 +25,11 @@ export declare class PricingRepository {
|
|
|
25
25
|
deletePricesByEntityId(entityId: string, ctx?: TxContext): Promise<void>;
|
|
26
26
|
findModifierById(orgId: string, id: string, ctx?: TxContext): Promise<PriceModifier | undefined>;
|
|
27
27
|
findModifiersByEntityId(orgId: string, entityId: string, ctx?: TxContext): Promise<PriceModifier[]>;
|
|
28
|
+
findModifiers(orgId: string, filter?: {
|
|
29
|
+
entityId?: string;
|
|
30
|
+
currency?: string;
|
|
31
|
+
activeAt?: Date;
|
|
32
|
+
}, ctx?: TxContext): Promise<PriceModifier[]>;
|
|
28
33
|
findActiveModifiers(orgId: string, entityId: string, variantId?: string, customerGroupId?: string, currency?: string, quantity?: number, ctx?: TxContext): Promise<PriceModifier[]>;
|
|
29
34
|
createModifier(data: PriceModifierInsert, ctx?: TxContext): Promise<PriceModifier>;
|
|
30
35
|
updateModifier(id: string, data: Partial<Omit<PriceModifierInsert, "id">>, ctx?: TxContext): Promise<PriceModifier | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/pricing/repository/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/pricing/repository/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,6 +113,25 @@ export class PricingRepository {
|
|
|
113
113
|
.from(priceModifiers)
|
|
114
114
|
.where(and(eq(priceModifiers.organizationId, orgId), eq(priceModifiers.entityId, entityId)));
|
|
115
115
|
}
|
|
116
|
+
async findModifiers(orgId, filter, ctx) {
|
|
117
|
+
const db = this.getDb(ctx);
|
|
118
|
+
const conditions = [eq(priceModifiers.organizationId, orgId)];
|
|
119
|
+
if (filter?.entityId) {
|
|
120
|
+
conditions.push(eq(priceModifiers.entityId, filter.entityId));
|
|
121
|
+
}
|
|
122
|
+
if (filter?.currency) {
|
|
123
|
+
conditions.push(eq(priceModifiers.currency, filter.currency));
|
|
124
|
+
}
|
|
125
|
+
if (filter?.activeAt) {
|
|
126
|
+
conditions.push(or(isNull(priceModifiers.validFrom), lte(priceModifiers.validFrom, filter.activeAt)));
|
|
127
|
+
conditions.push(or(isNull(priceModifiers.validUntil), gte(priceModifiers.validUntil, filter.activeAt)));
|
|
128
|
+
}
|
|
129
|
+
const rows = await db
|
|
130
|
+
.select()
|
|
131
|
+
.from(priceModifiers)
|
|
132
|
+
.where(and(...conditions));
|
|
133
|
+
return rows.sort((a, b) => a.priority - b.priority);
|
|
134
|
+
}
|
|
116
135
|
async findActiveModifiers(orgId, entityId, variantId, customerGroupId, currency, quantity, ctx) {
|
|
117
136
|
const db = this.getDb(ctx);
|
|
118
137
|
const now = new Date();
|
|
@@ -53,6 +53,24 @@ export declare class PricingService {
|
|
|
53
53
|
constructor(deps: PricingServiceDeps);
|
|
54
54
|
setBasePrice(input: SetBasePriceInput, actor?: Actor | null, ctx?: TxContext): Promise<Result<Price>>;
|
|
55
55
|
createModifier(input: CreatePriceModifierInput, actor?: Actor | null, ctx?: TxContext): Promise<Result<PriceModifier>>;
|
|
56
|
+
listModifiers(filter?: {
|
|
57
|
+
entityId?: string;
|
|
58
|
+
active?: boolean;
|
|
59
|
+
currency?: string;
|
|
60
|
+
}, actor?: Actor | null, ctx?: TxContext): Promise<Result<PriceModifier[]>>;
|
|
61
|
+
updateModifier(id: string, patch: {
|
|
62
|
+
name?: string | undefined;
|
|
63
|
+
value?: number | undefined;
|
|
64
|
+
priority?: number | undefined;
|
|
65
|
+
validFrom?: Date | null | undefined;
|
|
66
|
+
validUntil?: Date | null | undefined;
|
|
67
|
+
minQuantity?: number | null | undefined;
|
|
68
|
+
maxQuantity?: number | null | undefined;
|
|
69
|
+
metadata?: Record<string, unknown> | undefined;
|
|
70
|
+
}, actor?: Actor | null, ctx?: TxContext): Promise<Result<PriceModifier>>;
|
|
71
|
+
deleteModifier(id: string, actor?: Actor | null, ctx?: TxContext): Promise<Result<{
|
|
72
|
+
deleted: true;
|
|
73
|
+
}>>;
|
|
56
74
|
listPrices(filter?: {
|
|
57
75
|
entityId?: string;
|
|
58
76
|
variantId?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/pricing/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAOrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EACV,iBAAiB,EACjB,KAAK,EACL,aAAa,EAGd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGxE,MAAM,MAAM,iBAAiB,GACzB,qBAAqB,GACrB,gBAAgB,GAChB,QAAQ,GACR,UAAU,CAAC;AAEf,UAAU,kBAAkB;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAkBD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,KAAK,CAAC;QACtB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,iBAAiB,CAAC;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAuGhF,qBAAa,cAAc;IAIb,OAAO,CAAC,IAAI;IAHxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAE5B,IAAI,EAAE,kBAAkB;IAKtC,YAAY,CAChB,KAAK,EAAE,iBAAiB,EACxB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/pricing/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAOrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EACV,iBAAiB,EACjB,KAAK,EACL,aAAa,EAGd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGxE,MAAM,MAAM,iBAAiB,GACzB,qBAAqB,GACrB,gBAAgB,GAChB,QAAQ,GACR,UAAU,CAAC;AAEf,UAAU,kBAAkB;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAkBD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,KAAK,CAAC;QACtB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,iBAAiB,CAAC;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAuGhF,qBAAa,cAAc;IAIb,OAAO,CAAC,IAAI;IAHxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAE5B,IAAI,EAAE,kBAAkB;IAKtC,YAAY,CAChB,KAAK,EAAE,iBAAiB,EACxB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAoEnB,cAAc,CAClB,KAAK,EAAE,wBAAwB,EAC/B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAwD3B,aAAa,CACjB,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EACnE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAgB7B,cAAc,CAClB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QACpC,UAAU,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QACxC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QACxC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;KAChD,EACD,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAuB3B,cAAc,CAClB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAU/B,UAAU,CACd,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EACD,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC;QAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,SAAS,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC,CAAC;IAuD7D,OAAO,CACX,KAAK,EAAE,sBAAsB,EAC7B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;CAqLlC"}
|
|
@@ -103,11 +103,11 @@ export class PricingService {
|
|
|
103
103
|
if (input.amount < 0) {
|
|
104
104
|
return Err(new CommerceValidationError("Base price amount cannot be negative."));
|
|
105
105
|
}
|
|
106
|
-
const
|
|
106
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
107
|
+
const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
|
|
107
108
|
if (!entity) {
|
|
108
109
|
return Err(new CommerceNotFoundError("Entity not found for price assignment."));
|
|
109
110
|
}
|
|
110
|
-
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
111
111
|
const priceData = {
|
|
112
112
|
organizationId: orgId,
|
|
113
113
|
entityId: input.entityId,
|
|
@@ -178,6 +178,44 @@ export class PricingService {
|
|
|
178
178
|
await runAfterHooks(afterHooks, null, modifier, "create", hctx);
|
|
179
179
|
return Ok(modifier);
|
|
180
180
|
}
|
|
181
|
+
async listModifiers(filter, actor, ctx) {
|
|
182
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
183
|
+
const rows = await this.repo.findModifiers(orgId, {
|
|
184
|
+
...(filter?.entityId !== undefined ? { entityId: filter.entityId } : {}),
|
|
185
|
+
...(filter?.currency !== undefined
|
|
186
|
+
? { currency: normalizeCurrency(filter.currency) }
|
|
187
|
+
: {}),
|
|
188
|
+
...(filter?.active ? { activeAt: new Date() } : {}),
|
|
189
|
+
}, ctx);
|
|
190
|
+
return Ok(rows);
|
|
191
|
+
}
|
|
192
|
+
async updateModifier(id, patch, actor, ctx) {
|
|
193
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
194
|
+
const existing = await this.repo.findModifierById(orgId, id, ctx);
|
|
195
|
+
if (!existing) {
|
|
196
|
+
return Err(new CommerceNotFoundError("Price modifier not found."));
|
|
197
|
+
}
|
|
198
|
+
const updated = await this.repo.updateModifier(id, {
|
|
199
|
+
...(patch.name !== undefined ? { name: patch.name } : {}),
|
|
200
|
+
...(patch.value !== undefined ? { value: patch.value } : {}),
|
|
201
|
+
...(patch.priority !== undefined ? { priority: patch.priority } : {}),
|
|
202
|
+
...(patch.validFrom !== undefined ? { validFrom: patch.validFrom } : {}),
|
|
203
|
+
...(patch.validUntil !== undefined ? { validUntil: patch.validUntil } : {}),
|
|
204
|
+
...(patch.minQuantity !== undefined ? { minQuantity: patch.minQuantity } : {}),
|
|
205
|
+
...(patch.maxQuantity !== undefined ? { maxQuantity: patch.maxQuantity } : {}),
|
|
206
|
+
...(patch.metadata !== undefined ? { metadata: patch.metadata } : {}),
|
|
207
|
+
}, ctx);
|
|
208
|
+
return Ok(updated);
|
|
209
|
+
}
|
|
210
|
+
async deleteModifier(id, actor, ctx) {
|
|
211
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
212
|
+
const existing = await this.repo.findModifierById(orgId, id, ctx);
|
|
213
|
+
if (!existing) {
|
|
214
|
+
return Err(new CommerceNotFoundError("Price modifier not found."));
|
|
215
|
+
}
|
|
216
|
+
await this.repo.deleteModifier(id, ctx);
|
|
217
|
+
return Ok({ deleted: true });
|
|
218
|
+
}
|
|
181
219
|
async listPrices(filter, actor, ctx) {
|
|
182
220
|
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
183
221
|
// Get all prices for the entity if specified, or filter after retrieval
|
|
@@ -218,7 +256,8 @@ export class PricingService {
|
|
|
218
256
|
return Ok({ prices, modifiers });
|
|
219
257
|
}
|
|
220
258
|
async resolve(input, actor, ctx) {
|
|
221
|
-
const
|
|
259
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
260
|
+
const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
|
|
222
261
|
if (!entity) {
|
|
223
262
|
return Err(new CommerceNotFoundError(`Entity ${input.entityId} not found.`));
|
|
224
263
|
}
|
|
@@ -228,8 +267,7 @@ export class PricingService {
|
|
|
228
267
|
const timestamp = input.timestamp ?? new Date();
|
|
229
268
|
const currency = normalizeCurrency(input.currency);
|
|
230
269
|
const groupSet = toGroupSet(input);
|
|
231
|
-
// Get matching prices from repository
|
|
232
|
-
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
270
|
+
// Get matching prices from repository (orgId resolved above)
|
|
233
271
|
const allPrices = await this.repo.findPricesByEntityId(orgId, input.entityId, ctx);
|
|
234
272
|
const matchingPrices = allPrices.filter((price) => {
|
|
235
273
|
if (input.variantId !== undefined) {
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { storeSettings } from "./schema.js";
|
|
2
|
+
import { SettingsService } from "./service.js";
|
|
3
|
+
export declare const settingsModule: import("../../kernel/module/define.js").AppModule<{
|
|
4
|
+
storeSettings: typeof storeSettings;
|
|
5
|
+
}, SettingsService, Record<string, never>>;
|
|
6
|
+
//# sourceMappingURL=module.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,eAAO,MAAM,cAAc;mBACR,OAAO,aAAa;0CAUrC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { defineModule } from "../../kernel/module/index.js";
|
|
2
|
+
import { SettingsRepository } from "./repository/index.js";
|
|
3
|
+
import { storeSettings } from "./schema.js";
|
|
4
|
+
import { SettingsService } from "./service.js";
|
|
5
|
+
export const settingsModule = defineModule({
|
|
6
|
+
id: "settings",
|
|
7
|
+
schema: () => ({ storeSettings }),
|
|
8
|
+
service: (deps) => new SettingsService({
|
|
9
|
+
repository: new SettingsRepository(deps.db.db),
|
|
10
|
+
}),
|
|
11
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { TxContext } from "../../../kernel/database/tx-context.js";
|
|
2
|
+
import type { DrizzleDatabase } from "../../../kernel/database/drizzle-db.js";
|
|
3
|
+
import { storeSettings } from "../schema.js";
|
|
4
|
+
export type StoreSetting = typeof storeSettings.$inferSelect;
|
|
5
|
+
/**
|
|
6
|
+
* Persistence for org-scoped runtime settings (issue #49).
|
|
7
|
+
*/
|
|
8
|
+
export declare class SettingsRepository {
|
|
9
|
+
private readonly db;
|
|
10
|
+
constructor(db: DrizzleDatabase);
|
|
11
|
+
private getDb;
|
|
12
|
+
findByGroup(orgId: string, group: string, ctx?: TxContext): Promise<StoreSetting | undefined>;
|
|
13
|
+
findAll(orgId: string, ctx?: TxContext): Promise<StoreSetting[]>;
|
|
14
|
+
upsert(orgId: string, group: string, value: Record<string, unknown>, ctx?: TxContext): Promise<StoreSetting>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/settings/repository/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,MAAM,YAAY,GAAG,OAAO,aAAa,CAAC,YAAY,CAAC;AAE7D;;GAEG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,eAAe;IAEhD,OAAO,CAAC,KAAK;IAIP,WAAW,CACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAS9B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAQhE,MAAM,CACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,YAAY,CAAC;CAYzB"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { and, eq } from "drizzle-orm";
|
|
2
|
+
import { storeSettings } from "../schema.js";
|
|
3
|
+
/**
|
|
4
|
+
* Persistence for org-scoped runtime settings (issue #49).
|
|
5
|
+
*/
|
|
6
|
+
export class SettingsRepository {
|
|
7
|
+
db;
|
|
8
|
+
constructor(db) {
|
|
9
|
+
this.db = db;
|
|
10
|
+
}
|
|
11
|
+
getDb(ctx) {
|
|
12
|
+
return ctx?.tx ?? this.db;
|
|
13
|
+
}
|
|
14
|
+
async findByGroup(orgId, group, ctx) {
|
|
15
|
+
const db = this.getDb(ctx);
|
|
16
|
+
const rows = await db
|
|
17
|
+
.select()
|
|
18
|
+
.from(storeSettings)
|
|
19
|
+
.where(and(eq(storeSettings.organizationId, orgId), eq(storeSettings.group, group)));
|
|
20
|
+
return rows[0];
|
|
21
|
+
}
|
|
22
|
+
async findAll(orgId, ctx) {
|
|
23
|
+
const db = this.getDb(ctx);
|
|
24
|
+
return db
|
|
25
|
+
.select()
|
|
26
|
+
.from(storeSettings)
|
|
27
|
+
.where(eq(storeSettings.organizationId, orgId));
|
|
28
|
+
}
|
|
29
|
+
async upsert(orgId, group, value, ctx) {
|
|
30
|
+
const db = this.getDb(ctx);
|
|
31
|
+
const rows = await db
|
|
32
|
+
.insert(storeSettings)
|
|
33
|
+
.values({ organizationId: orgId, group, value })
|
|
34
|
+
.onConflictDoUpdate({
|
|
35
|
+
target: [storeSettings.organizationId, storeSettings.group],
|
|
36
|
+
set: { value, updatedAt: new Date() },
|
|
37
|
+
})
|
|
38
|
+
.returning();
|
|
39
|
+
return rows[0];
|
|
40
|
+
}
|
|
41
|
+
}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Org-scoped runtime settings (issue #49).
|
|
3
|
+
*
|
|
4
|
+
* One row per (organization, group). Groups are shallow JSON objects —
|
|
5
|
+
* `general` (currency, timezone, locale), `branding` (receipt header/footer,
|
|
6
|
+
* store name, logo), `policies` (free-form policy knobs), plus any custom
|
|
7
|
+
* group a plugin namespaces for itself. PATCH semantics are shallow merge
|
|
8
|
+
* with `null` deleting a key.
|
|
9
|
+
*/
|
|
10
|
+
export declare const storeSettings: import("drizzle-orm/pg-core").PgTableWithColumns<{
|
|
11
|
+
name: "store_settings";
|
|
12
|
+
schema: undefined;
|
|
13
|
+
columns: {
|
|
14
|
+
id: import("drizzle-orm/pg-core").PgColumn<{
|
|
15
|
+
name: "id";
|
|
16
|
+
tableName: "store_settings";
|
|
17
|
+
dataType: "string";
|
|
18
|
+
columnType: "PgUUID";
|
|
19
|
+
data: string;
|
|
20
|
+
driverParam: string;
|
|
21
|
+
notNull: true;
|
|
22
|
+
hasDefault: true;
|
|
23
|
+
isPrimaryKey: true;
|
|
24
|
+
isAutoincrement: false;
|
|
25
|
+
hasRuntimeDefault: false;
|
|
26
|
+
enumValues: undefined;
|
|
27
|
+
baseColumn: never;
|
|
28
|
+
identity: undefined;
|
|
29
|
+
generated: undefined;
|
|
30
|
+
}, {}, {}>;
|
|
31
|
+
organizationId: import("drizzle-orm/pg-core").PgColumn<{
|
|
32
|
+
name: "organization_id";
|
|
33
|
+
tableName: "store_settings";
|
|
34
|
+
dataType: "string";
|
|
35
|
+
columnType: "PgText";
|
|
36
|
+
data: string;
|
|
37
|
+
driverParam: string;
|
|
38
|
+
notNull: true;
|
|
39
|
+
hasDefault: false;
|
|
40
|
+
isPrimaryKey: false;
|
|
41
|
+
isAutoincrement: false;
|
|
42
|
+
hasRuntimeDefault: false;
|
|
43
|
+
enumValues: [string, ...string[]];
|
|
44
|
+
baseColumn: never;
|
|
45
|
+
identity: undefined;
|
|
46
|
+
generated: undefined;
|
|
47
|
+
}, {}, {}>;
|
|
48
|
+
group: import("drizzle-orm/pg-core").PgColumn<{
|
|
49
|
+
name: "group";
|
|
50
|
+
tableName: "store_settings";
|
|
51
|
+
dataType: "string";
|
|
52
|
+
columnType: "PgText";
|
|
53
|
+
data: string;
|
|
54
|
+
driverParam: string;
|
|
55
|
+
notNull: true;
|
|
56
|
+
hasDefault: false;
|
|
57
|
+
isPrimaryKey: false;
|
|
58
|
+
isAutoincrement: false;
|
|
59
|
+
hasRuntimeDefault: false;
|
|
60
|
+
enumValues: [string, ...string[]];
|
|
61
|
+
baseColumn: never;
|
|
62
|
+
identity: undefined;
|
|
63
|
+
generated: undefined;
|
|
64
|
+
}, {}, {}>;
|
|
65
|
+
value: import("drizzle-orm/pg-core").PgColumn<{
|
|
66
|
+
name: "value";
|
|
67
|
+
tableName: "store_settings";
|
|
68
|
+
dataType: "json";
|
|
69
|
+
columnType: "PgJsonb";
|
|
70
|
+
data: Record<string, unknown>;
|
|
71
|
+
driverParam: unknown;
|
|
72
|
+
notNull: true;
|
|
73
|
+
hasDefault: true;
|
|
74
|
+
isPrimaryKey: false;
|
|
75
|
+
isAutoincrement: false;
|
|
76
|
+
hasRuntimeDefault: false;
|
|
77
|
+
enumValues: undefined;
|
|
78
|
+
baseColumn: never;
|
|
79
|
+
identity: undefined;
|
|
80
|
+
generated: undefined;
|
|
81
|
+
}, {}, {
|
|
82
|
+
$type: Record<string, unknown>;
|
|
83
|
+
}>;
|
|
84
|
+
createdAt: import("drizzle-orm/pg-core").PgColumn<{
|
|
85
|
+
name: "created_at";
|
|
86
|
+
tableName: "store_settings";
|
|
87
|
+
dataType: "date";
|
|
88
|
+
columnType: "PgTimestamp";
|
|
89
|
+
data: Date;
|
|
90
|
+
driverParam: string;
|
|
91
|
+
notNull: true;
|
|
92
|
+
hasDefault: true;
|
|
93
|
+
isPrimaryKey: false;
|
|
94
|
+
isAutoincrement: false;
|
|
95
|
+
hasRuntimeDefault: false;
|
|
96
|
+
enumValues: undefined;
|
|
97
|
+
baseColumn: never;
|
|
98
|
+
identity: undefined;
|
|
99
|
+
generated: undefined;
|
|
100
|
+
}, {}, {}>;
|
|
101
|
+
updatedAt: import("drizzle-orm/pg-core").PgColumn<{
|
|
102
|
+
name: "updated_at";
|
|
103
|
+
tableName: "store_settings";
|
|
104
|
+
dataType: "date";
|
|
105
|
+
columnType: "PgTimestamp";
|
|
106
|
+
data: Date;
|
|
107
|
+
driverParam: string;
|
|
108
|
+
notNull: true;
|
|
109
|
+
hasDefault: true;
|
|
110
|
+
isPrimaryKey: false;
|
|
111
|
+
isAutoincrement: false;
|
|
112
|
+
hasRuntimeDefault: false;
|
|
113
|
+
enumValues: undefined;
|
|
114
|
+
baseColumn: never;
|
|
115
|
+
identity: undefined;
|
|
116
|
+
generated: undefined;
|
|
117
|
+
}, {}, {}>;
|
|
118
|
+
};
|
|
119
|
+
dialect: "pg";
|
|
120
|
+
}>;
|
|
121
|
+
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/schema.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYvB,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { index, jsonb, pgTable, text, timestamp, uniqueIndex, uuid } from "drizzle-orm/pg-core";
|
|
2
|
+
import { organization } from "../../auth/auth-schema.js";
|
|
3
|
+
/**
|
|
4
|
+
* Org-scoped runtime settings (issue #49).
|
|
5
|
+
*
|
|
6
|
+
* One row per (organization, group). Groups are shallow JSON objects —
|
|
7
|
+
* `general` (currency, timezone, locale), `branding` (receipt header/footer,
|
|
8
|
+
* store name, logo), `policies` (free-form policy knobs), plus any custom
|
|
9
|
+
* group a plugin namespaces for itself. PATCH semantics are shallow merge
|
|
10
|
+
* with `null` deleting a key.
|
|
11
|
+
*/
|
|
12
|
+
export const storeSettings = pgTable("store_settings", {
|
|
13
|
+
id: uuid("id").defaultRandom().primaryKey(),
|
|
14
|
+
organizationId: text("organization_id")
|
|
15
|
+
.notNull()
|
|
16
|
+
.references(() => organization.id, { onDelete: "cascade" }),
|
|
17
|
+
group: text("group").notNull(),
|
|
18
|
+
value: jsonb("value").$type().notNull().default({}),
|
|
19
|
+
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
|
20
|
+
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
|
21
|
+
}, (table) => ({
|
|
22
|
+
orgGroupUnique: uniqueIndex("store_settings_org_group_unique").on(table.organizationId, table.group),
|
|
23
|
+
orgIdx: index("idx_store_settings_org").on(table.organizationId),
|
|
24
|
+
}));
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { Actor } from "../../auth/types.js";
|
|
2
|
+
import type { TxContext } from "../../kernel/database/tx-context.js";
|
|
3
|
+
import { type Result } from "../../kernel/result.js";
|
|
4
|
+
import type { SettingsRepository } from "./repository/index.js";
|
|
5
|
+
interface SettingsServiceDeps {
|
|
6
|
+
repository: SettingsRepository;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Org-scoped runtime settings (issue #49).
|
|
10
|
+
*
|
|
11
|
+
* REST-facing methods resolve the org from the actor; `read()` is the
|
|
12
|
+
* plugin/hook-facing API — an orgId-keyed lookup with no actor requirement so
|
|
13
|
+
* policy values can be consumed at request time inside any service or hook.
|
|
14
|
+
*/
|
|
15
|
+
export declare class SettingsService {
|
|
16
|
+
private repository;
|
|
17
|
+
constructor(deps: SettingsServiceDeps);
|
|
18
|
+
/** Runtime read for plugins/hooks. Unset groups read as `{}`. */
|
|
19
|
+
read(orgId: string, group: string, ctx?: TxContext): Promise<Record<string, unknown>>;
|
|
20
|
+
getGroup(group: string, actor?: Actor | null, ctx?: TxContext): Promise<Result<Record<string, unknown>>>;
|
|
21
|
+
getAll(actor?: Actor | null, ctx?: TxContext): Promise<Result<Record<string, Record<string, unknown>>>>;
|
|
22
|
+
/** Shallow merge: keys in `patch` overwrite, `null` deletes the key. */
|
|
23
|
+
updateGroup(group: string, patch: Record<string, unknown>, actor?: Actor | null, ctx?: TxContext): Promise<Result<Record<string, unknown>>>;
|
|
24
|
+
}
|
|
25
|
+
export {};
|
|
26
|
+
//# sourceMappingURL=service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,UAAU,mBAAmB;IAC3B,UAAU,EAAE,kBAAkB,CAAC;CAChC;AAED;;;;;;GAMG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAqB;gBAE3B,IAAI,EAAE,mBAAmB;IAIrC,iEAAiE;IAC3D,IAAI,CACR,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAK7B,QAAQ,CACZ,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAKrC,MAAM,CACV,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAQ3D,wEAAwE;IAClE,WAAW,CACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAkB5C"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { resolveOrgId } from "../../auth/org.js";
|
|
2
|
+
import { CommerceValidationError } from "../../kernel/errors.js";
|
|
3
|
+
import { Err, Ok } from "../../kernel/result.js";
|
|
4
|
+
const GROUP_NAME_RE = /^[a-z][a-z0-9_-]*$/;
|
|
5
|
+
/**
|
|
6
|
+
* Org-scoped runtime settings (issue #49).
|
|
7
|
+
*
|
|
8
|
+
* REST-facing methods resolve the org from the actor; `read()` is the
|
|
9
|
+
* plugin/hook-facing API — an orgId-keyed lookup with no actor requirement so
|
|
10
|
+
* policy values can be consumed at request time inside any service or hook.
|
|
11
|
+
*/
|
|
12
|
+
export class SettingsService {
|
|
13
|
+
repository;
|
|
14
|
+
constructor(deps) {
|
|
15
|
+
this.repository = deps.repository;
|
|
16
|
+
}
|
|
17
|
+
/** Runtime read for plugins/hooks. Unset groups read as `{}`. */
|
|
18
|
+
async read(orgId, group, ctx) {
|
|
19
|
+
const row = await this.repository.findByGroup(orgId, group, ctx);
|
|
20
|
+
return row?.value ?? {};
|
|
21
|
+
}
|
|
22
|
+
async getGroup(group, actor, ctx) {
|
|
23
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
24
|
+
return Ok(await this.read(orgId, group, ctx));
|
|
25
|
+
}
|
|
26
|
+
async getAll(actor, ctx) {
|
|
27
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
28
|
+
const rows = await this.repository.findAll(orgId, ctx);
|
|
29
|
+
const all = {};
|
|
30
|
+
for (const row of rows)
|
|
31
|
+
all[row.group] = row.value;
|
|
32
|
+
return Ok(all);
|
|
33
|
+
}
|
|
34
|
+
/** Shallow merge: keys in `patch` overwrite, `null` deletes the key. */
|
|
35
|
+
async updateGroup(group, patch, actor, ctx) {
|
|
36
|
+
if (!GROUP_NAME_RE.test(group)) {
|
|
37
|
+
return Err(new CommerceValidationError("Settings group must match [a-z][a-z0-9_-]* (e.g. general, branding, policies)."));
|
|
38
|
+
}
|
|
39
|
+
const orgId = resolveOrgId(actor ?? ctx?.actor ?? null);
|
|
40
|
+
const current = await this.read(orgId, group, ctx);
|
|
41
|
+
const next = { ...current };
|
|
42
|
+
for (const [key, value] of Object.entries(patch)) {
|
|
43
|
+
if (value === null)
|
|
44
|
+
delete next[key];
|
|
45
|
+
else
|
|
46
|
+
next[key] = value;
|
|
47
|
+
}
|
|
48
|
+
const row = await this.repository.upsert(orgId, group, next, ctx);
|
|
49
|
+
return Ok(row.value);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
@@ -34,6 +34,11 @@ export interface ShippingCalculationInput {
|
|
|
34
34
|
address?: ShippingAddress;
|
|
35
35
|
isFreeShipping: boolean;
|
|
36
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Total weight (grams) of the shippable line items — used by both the
|
|
39
|
+
* code-config strategy and runtime zone rates with weight bands.
|
|
40
|
+
*/
|
|
41
|
+
export declare function computeShippableWeightGrams(config: CommerceConfig, catalogRepo: CatalogRepository, lineItems: ShippingLineItem[], ctx?: TxContext): Promise<number>;
|
|
37
42
|
export declare function calculateShippingCost(config: CommerceConfig, catalogRepo: CatalogRepository, input: ShippingCalculationInput, ctx?: TxContext): Promise<{
|
|
38
43
|
amount: number;
|
|
39
44
|
strategy: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculator.d.ts","sourceRoot":"","sources":["../../../src/modules/shipping/calculator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEN,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB;AAiFD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EAAE,wBAAwB,EAC/B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA+DpE"}
|
|
1
|
+
{"version":3,"file":"calculator.d.ts","sourceRoot":"","sources":["../../../src/modules/shipping/calculator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEN,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB;AAiFD;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,gBAAgB,EAAE,EAC7B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EAAE,wBAAwB,EAC/B,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA+DpE"}
|
|
@@ -51,6 +51,16 @@ function resolveStrategy(config) {
|
|
|
51
51
|
: {}),
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Total weight (grams) of the shippable line items — used by both the
|
|
56
|
+
* code-config strategy and runtime zone rates with weight bands.
|
|
57
|
+
*/
|
|
58
|
+
export async function computeShippableWeightGrams(config, catalogRepo, lineItems, ctx) {
|
|
59
|
+
const flags = await Promise.all(lineItems.map((lineItem) => isShippableEntity(config, catalogRepo, lineItem.entityId, ctx)));
|
|
60
|
+
const shippable = lineItems.filter((_, i) => flags[i]);
|
|
61
|
+
const weights = await Promise.all(shippable.map((lineItem) => resolveWeightGrams(catalogRepo, lineItem.entityId, lineItem.variantId, ctx)));
|
|
62
|
+
return shippable.reduce((sum, lineItem, i) => sum + (weights[i] ?? 0) * lineItem.quantity, 0);
|
|
63
|
+
}
|
|
54
64
|
export async function calculateShippingCost(config, catalogRepo, input, ctx) {
|
|
55
65
|
if (input.isFreeShipping) {
|
|
56
66
|
return { amount: 0, strategy: "promotion:free_shipping", weightGrams: 0 };
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import type { CatalogServiceImpl } from "../catalog/service.js";
|
|
2
|
+
import { shippingZones, shippingRates } from "./schema.js";
|
|
2
3
|
import { ShippingService } from "./service.js";
|
|
3
4
|
type ShippingModuleDeps = {
|
|
4
5
|
catalog: CatalogServiceImpl;
|
|
5
6
|
};
|
|
6
|
-
export declare const shippingModule: import("../../kernel/module/define.js").AppModule<
|
|
7
|
+
export declare const shippingModule: import("../../kernel/module/define.js").AppModule<{
|
|
8
|
+
shippingZones: typeof shippingZones;
|
|
9
|
+
shippingRates: typeof shippingRates;
|
|
10
|
+
}, ShippingService, ShippingModuleDeps>;
|
|
7
11
|
export {};
|
|
8
12
|
//# sourceMappingURL=module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/shipping/module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/modules/shipping/module.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,cAAc;mBACR,OAAO,aAAa;mBAAiB,OAAO,aAAa;uCAa1E,CAAC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { defineModule } from "../../kernel/module/index.js";
|
|
2
|
+
import { ShippingConfigRepository } from "./repository/index.js";
|
|
3
|
+
import { shippingZones, shippingRates } from "./schema.js";
|
|
2
4
|
import { ShippingService } from "./service.js";
|
|
3
5
|
export const shippingModule = defineModule({
|
|
4
6
|
id: "shipping",
|
|
5
7
|
dependencies: ["catalog"],
|
|
6
|
-
schema: () => ({}),
|
|
8
|
+
schema: () => ({ shippingZones, shippingRates }),
|
|
7
9
|
service: (deps) => new ShippingService({
|
|
8
10
|
config: deps.config,
|
|
9
11
|
catalogRepository: deps.services.catalog.repository,
|
|
12
|
+
repository: new ShippingConfigRepository(deps.db.db),
|
|
10
13
|
}),
|
|
11
14
|
});
|
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
import type { TxContext } from "../../../kernel/database/tx-context.js";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
import type { DrizzleDatabase } from "../../../kernel/database/drizzle-db.js";
|
|
3
|
+
import { shippingZones, shippingRates } from "../schema.js";
|
|
4
|
+
export type ShippingZone = typeof shippingZones.$inferSelect;
|
|
5
|
+
export type ShippingZoneInsert = typeof shippingZones.$inferInsert;
|
|
6
|
+
export type ShippingRate = typeof shippingRates.$inferSelect;
|
|
7
|
+
export type ShippingRateInsert = typeof shippingRates.$inferInsert;
|
|
8
|
+
/**
|
|
9
|
+
* Persistence for runtime shipping zones & rates (issue #45).
|
|
10
|
+
*/
|
|
11
|
+
export declare class ShippingConfigRepository {
|
|
12
|
+
private readonly db;
|
|
13
|
+
constructor(db: DrizzleDatabase);
|
|
14
|
+
private getDb;
|
|
15
|
+
findZoneById(orgId: string, id: string, ctx?: TxContext): Promise<ShippingZone | undefined>;
|
|
16
|
+
findZones(orgId: string, ctx?: TxContext): Promise<ShippingZone[]>;
|
|
17
|
+
findActiveZones(orgId: string, ctx?: TxContext): Promise<ShippingZone[]>;
|
|
18
|
+
createZone(data: ShippingZoneInsert, ctx?: TxContext): Promise<ShippingZone>;
|
|
19
|
+
updateZone(id: string, data: Partial<Omit<ShippingZoneInsert, "id" | "organizationId">>, ctx?: TxContext): Promise<ShippingZone | undefined>;
|
|
20
|
+
deleteZone(id: string, ctx?: TxContext): Promise<boolean>;
|
|
21
|
+
findRateById(orgId: string, id: string, ctx?: TxContext): Promise<ShippingRate | undefined>;
|
|
22
|
+
findRates(orgId: string, filter?: {
|
|
23
|
+
zoneId?: string;
|
|
24
|
+
}, ctx?: TxContext): Promise<ShippingRate[]>;
|
|
25
|
+
findActiveRatesByZoneId(zoneId: string, ctx?: TxContext): Promise<ShippingRate[]>;
|
|
26
|
+
createRate(data: ShippingRateInsert, ctx?: TxContext): Promise<ShippingRate>;
|
|
27
|
+
updateRate(id: string, data: Partial<Omit<ShippingRateInsert, "id" | "organizationId">>, ctx?: TxContext): Promise<ShippingRate | undefined>;
|
|
28
|
+
deleteRate(id: string, ctx?: TxContext): Promise<boolean>;
|
|
4
29
|
}
|
|
5
30
|
//# sourceMappingURL=index.d.ts.map
|