@unchainedshop/api 3.0.0-rc6 → 3.0.0-rc7
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/lib/api-index.d.ts +1 -1
- package/lib/api-index.d.ts.map +1 -1
- package/lib/api-index.js +1 -1
- package/lib/api-index.js.map +1 -1
- package/lib/context.d.ts +0 -1
- package/lib/context.d.ts.map +1 -1
- package/lib/context.js +4 -19
- package/lib/context.js.map +1 -1
- package/lib/express/createBulkImportMiddleware.d.ts +1 -2
- package/lib/express/createBulkImportMiddleware.d.ts.map +1 -1
- package/lib/express/createBulkImportMiddleware.js.map +1 -1
- package/lib/express/createERCMetadataMiddleware.js +1 -1
- package/lib/express/createERCMetadataMiddleware.js.map +1 -1
- package/lib/express/index.d.ts.map +1 -1
- package/lib/express/index.js.map +1 -1
- package/lib/fastify/index.d.ts.map +1 -1
- package/lib/fastify/index.js.map +1 -1
- package/lib/resolvers/mutations/orders/addCartDiscount.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/addCartDiscount.js +8 -3
- package/lib/resolvers/mutations/orders/addCartDiscount.js.map +1 -1
- package/lib/resolvers/mutations/orders/addCartProduct.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/addCartProduct.js +8 -3
- package/lib/resolvers/mutations/orders/addCartProduct.js.map +1 -1
- package/lib/resolvers/mutations/orders/addCartQuotation.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/addCartQuotation.js +8 -3
- package/lib/resolvers/mutations/orders/addCartQuotation.js.map +1 -1
- package/lib/resolvers/mutations/orders/addMultipleCartProducts.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/addMultipleCartProducts.js +8 -3
- package/lib/resolvers/mutations/orders/addMultipleCartProducts.js.map +1 -1
- package/lib/resolvers/mutations/orders/checkoutCart.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/checkoutCart.js +10 -5
- package/lib/resolvers/mutations/orders/checkoutCart.js.map +1 -1
- package/lib/resolvers/mutations/orders/emptyCart.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/emptyCart.js +8 -3
- package/lib/resolvers/mutations/orders/emptyCart.js.map +1 -1
- package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js +1 -1
- package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js.map +1 -1
- package/lib/resolvers/mutations/orders/updateCart.d.ts.map +1 -1
- package/lib/resolvers/mutations/orders/updateCart.js +8 -3
- package/lib/resolvers/mutations/orders/updateCart.js.map +1 -1
- package/lib/resolvers/type/filter/loaded-filter-types.d.ts.map +1 -1
- package/lib/resolvers/type/filter/loaded-filter-types.js +1 -2
- package/lib/resolvers/type/filter/loaded-filter-types.js.map +1 -1
- package/lib/resolvers/type/index.d.ts +0 -3
- package/lib/resolvers/type/index.d.ts.map +1 -1
- package/lib/resolvers/type/product/product-configurable-types.d.ts.map +1 -1
- package/lib/resolvers/type/product/product-configurable-types.js +3 -5
- package/lib/resolvers/type/product/product-configurable-types.js.map +1 -1
- package/lib/resolvers/type/product/product-plan-types.d.ts.map +1 -1
- package/lib/resolvers/type/product/product-plan-types.js +3 -5
- package/lib/resolvers/type/product/product-plan-types.js.map +1 -1
- package/lib/resolvers/type/product/product-simple-types.d.ts +0 -2
- package/lib/resolvers/type/product/product-simple-types.d.ts.map +1 -1
- package/lib/resolvers/type/product/product-simple-types.js +13 -50
- package/lib/resolvers/type/product/product-simple-types.js.map +1 -1
- package/lib/resolvers/type/product/product-tokenized-types.d.ts +0 -1
- package/lib/resolvers/type/product/product-tokenized-types.d.ts.map +1 -1
- package/lib/resolvers/type/product/product-tokenized-types.js +5 -23
- package/lib/resolvers/type/product/product-tokenized-types.js.map +1 -1
- package/lib/resolvers/type/user-types.d.ts.map +1 -1
- package/lib/resolvers/type/user-types.js +2 -2
- package/lib/resolvers/type/user-types.js.map +1 -1
- package/package.json +10 -7
- package/src/api-index.ts +1 -1
- package/src/context.ts +4 -20
- package/src/express/createBulkImportMiddleware.ts +1 -2
- package/src/express/createERCMetadataMiddleware.ts +1 -1
- package/src/express/index.ts +1 -2
- package/src/fastify/index.ts +2 -3
- package/src/resolvers/mutations/orders/addCartDiscount.ts +7 -2
- package/src/resolvers/mutations/orders/addCartProduct.ts +8 -2
- package/src/resolvers/mutations/orders/addCartQuotation.ts +7 -2
- package/src/resolvers/mutations/orders/addMultipleCartProducts.ts +7 -2
- package/src/resolvers/mutations/orders/checkoutCart.ts +9 -5
- package/src/resolvers/mutations/orders/emptyCart.ts +7 -3
- package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts +1 -1
- package/src/resolvers/mutations/orders/updateCart.ts +7 -3
- package/src/resolvers/type/filter/loaded-filter-types.ts +1 -2
- package/src/resolvers/type/product/product-configurable-types.ts +3 -10
- package/src/resolvers/type/product/product-plan-types.ts +3 -7
- package/src/resolvers/type/product/product-simple-types.ts +14 -74
- package/src/resolvers/type/product/product-tokenized-types.ts +5 -35
- package/src/resolvers/type/user-types.ts +4 -2
- package/tests/api-index.test.ts +4 -4
- package/lib/resolvers/mutations/utils/getOrderCart.d.ts +0 -7
- package/lib/resolvers/mutations/utils/getOrderCart.d.ts.map +0 -1
- package/lib/resolvers/mutations/utils/getOrderCart.js +0 -17
- package/lib/resolvers/mutations/utils/getOrderCart.js.map +0 -1
- package/src/resolvers/mutations/utils/getOrderCart.ts +0 -20
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"AAuEA,QAAA,MAAM,KAAK;;;;;;;;;;;;;;;;gBA9CkC,CAAC;;;;uBAWxB,CAAC;;;uBAIO,CAAA;uBAA2B,CAAC;;;mBAE3C,CAAC;;;;;;;;;;;;;;;;;;uBA/BkB,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"AAuEA,QAAA,MAAM,KAAK;;;;;;;;;;;;;;;;gBA9CkC,CAAC;;;;uBAWxB,CAAC;;;uBAIO,CAAA;uBAA2B,CAAC;;;mBAE3C,CAAC;;;;;;;;;;;;;;;;;;uBA/BkB,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBA/BgE,CAAC;;;;;;;;;;oBAgBnD,CAAA;;oBACD,CAAC;;;;;;uBAvBe,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA1CQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAAQ,CAAC;gBACvB,CAAC;iBAA0B,CAAC;;mBACb,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAHI,CAAC;oBAAkB,CAAC;;;oBAS5B,CAAC;oBAAwB,CAAC;uBACrB,CAAC;yBAA8B,CAAC;;;oBAcG,CAAC;;;;;;;;;;;uBAlBnB,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBArC6B,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA3CL,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;4BAKG,CAAC;+BACD,CAAC;oBACX,CAAC;4BAA8B,CAAC;;;;;;4BASnB,CAAC;+BAClB,CAAA;oBACX,CAAC;;;;;;;;;;;;oBAlBY,CAAC;oBAAkB,CAAC;;;oBAS5B,CAAC;oBAAwB,CAAC;uBACrB,CAAC;yBAA8B,CAAC;;;oBAcG,CAAC;;;;;;;;;;;uBAlBnB,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;4BA9BA,CAAC;+BAA6C,CAAC;oBACvC,CAAC;;;;oBAdM,CAAC;oBAAkB,CAAC;;;oBAS5B,CAAC;oBAAwB,CAAC;uBACrB,CAAC;yBAA8B,CAAC;;;oBAcG,CAAC;;;;;;;;;;;uBAlBnB,CAAC;;;;;;;gBAMZ,CAAC;;;uBASpB,CAAC;iBAAqB,CAAC;kBAAsB,CAAC;gBAC7C,CAAC;;;uBAIqB,CAAC;;;wBAGsB,CAAC;;;;;;;uBAc/C,CAAC;;;;;;;;;;;;;;;;;;;;kBA3C6D,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyIlE,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-configurable-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"product-configurable-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,eAAO,MAAM,mBAAmB;yBAInB,WAAW,UACZ;QACN,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CACR,KAAK,CAAC;QACJ,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,EAAE,OAAO,OAAO,CAAC;KACzB,CAAC,CACH;sBAKU,WAAW,iCAIjB;QACD,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;+BAOtB,WAAW,yEAMjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACtC,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;wBAalB,WAAW,sBAIjB;QACD,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;iCASxB,WAAW,sFAOjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,WAAW,EAAE,OAAO,CAAC;KACtB,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;;;mBAtEJ,CAAC;;;;;;;YAgBtB,CAAL;;;mBAoBE,CAAC;aACC,CAAC;cACF,CAAD;YAEG,CAAN;;;mBAesB,CAAC;;;oBAWF,CAAC;;;;;;;mBA8BN,CAAL;;CAuDV,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Product } from './product-types.js';
|
|
2
2
|
import { sha256 } from '@unchainedshop/utils';
|
|
3
|
-
import { ProductPricingDirector } from '@unchainedshop/core';
|
|
4
3
|
export const ConfigurableProduct = {
|
|
5
4
|
...Product,
|
|
6
5
|
async assignments(product, params, { modules }) {
|
|
@@ -30,7 +29,7 @@ export const ConfigurableProduct = {
|
|
|
30
29
|
});
|
|
31
30
|
},
|
|
32
31
|
async simulatedPriceRange(product, { currency: forcedCurrencyCode, quantity, useNetPrice, vectors, includeInactive, }, requestContext) {
|
|
33
|
-
const { countryContext, modules } = requestContext;
|
|
32
|
+
const { countryContext, modules, services } = requestContext;
|
|
34
33
|
const currency = forcedCurrencyCode || requestContext.currencyContext;
|
|
35
34
|
const products = await modules.products.proxyProducts(product, vectors, {
|
|
36
35
|
includeInactive,
|
|
@@ -43,10 +42,9 @@ export const ConfigurableProduct = {
|
|
|
43
42
|
currency,
|
|
44
43
|
quantity,
|
|
45
44
|
};
|
|
46
|
-
const
|
|
47
|
-
if (!
|
|
45
|
+
const pricing = await services.products.simulateProductPricing(pricingContext);
|
|
46
|
+
if (!pricing)
|
|
48
47
|
return null;
|
|
49
|
-
const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
|
|
50
48
|
const unitPrice = pricing.unitPrice({ useNetPrice });
|
|
51
49
|
return {
|
|
52
50
|
_id: await sha256([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-configurable-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"product-configurable-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plan-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,OAAO,IAAI,WAAW,EACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"product-plan-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,OAAO,IAAI,WAAW,EACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,eAAO,MAAM,WAAW;0BAIX,WAAW,8CACwB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACpE,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;wBAWjB,WAAW,2EAMb;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;KAC7C,kBACe,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;8BA6BjB,WAAW,oCACkB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACvC,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,YAAY,CAAC;KACrB,CAAC,CACH;4BAMuB,WAAW,GAAG,MAAM;uCAGT,WAAW,GAAG,MAAM;uCAGpB,WAAW,GAAG,MAAM;;;mBA/DrD,CAAH;;;;;;;YAcoB,CAAC;;;mBAkBqD,CAAC;aACtE,CAAN;cACa,CAAC;YACA,CAAC;;;mBAcT,CAAL;;;oBAK4D,CAAA;;;;;;;mBAaqhB,CAAC;;CADllB,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Product } from './product-types.js';
|
|
2
|
-
import { ProductPricingDirector } from '@unchainedshop/core';
|
|
3
2
|
import { sha256 } from '@unchainedshop/utils';
|
|
4
3
|
export const PlanProduct = {
|
|
5
4
|
...Product,
|
|
@@ -13,7 +12,7 @@ export const PlanProduct = {
|
|
|
13
12
|
});
|
|
14
13
|
},
|
|
15
14
|
async simulatedPrice(obj, { currency: forcedCurrencyCode, quantity, useNetPrice, configuration, }, requestContext) {
|
|
16
|
-
const { countryContext, user } = requestContext;
|
|
15
|
+
const { countryContext, user, services } = requestContext;
|
|
17
16
|
const currency = forcedCurrencyCode || requestContext.currencyContext;
|
|
18
17
|
const pricingContext = {
|
|
19
18
|
product: obj,
|
|
@@ -23,10 +22,9 @@ export const PlanProduct = {
|
|
|
23
22
|
quantity,
|
|
24
23
|
configuration,
|
|
25
24
|
};
|
|
26
|
-
const
|
|
27
|
-
if (!
|
|
25
|
+
const pricing = await services.products.simulateProductPricing(pricingContext);
|
|
26
|
+
if (!pricing)
|
|
28
27
|
return null;
|
|
29
|
-
const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
|
|
30
28
|
const unitPrice = pricing.unitPrice({ useNetPrice });
|
|
31
29
|
return {
|
|
32
30
|
_id: await sha256([obj._id, countryContext, quantity, useNetPrice, user ? user._id : 'ANONYMOUS'].join('')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-plan-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"product-plan-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,OAAO;IAEV,KAAK,CAAC,YAAY,CAChB,OAAoB,EACpB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAA4C,EACpF,cAAuB;QAEvB,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YAC5C,OAAO,EAAE,cAAc;YACvB,QAAQ;YACR,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,GAAgB,EAChB,EACE,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EACR,WAAW,EACX,aAAa,GAMd,EACD,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC1D,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QAEtE,MAAM,cAAc,GAAG;YACrB,OAAO,EAAE,GAAG;YACZ,IAAI;YACJ,OAAO,EAAE,cAAc;YACvB,QAAQ;YACR,QAAQ;YACR,aAAa;SACd,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;QAC/E,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QAErD,OAAO;YACL,GAAG,EAAE,MAAM,MAAM,CACf,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CACzF;YACD,GAAG,SAAS;YACZ,UAAU,EAAE,WAAW;YACvB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,YAAY,EAAE,OAAO,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAgB,EAChB,EAAE,QAAQ,EAAE,kBAAkB,EAAyB,EACvD,cAAuB;QAQvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,SAAS,CAAC,EAAE,QAAQ,EAAe;QACjC,OAAO,QAAQ,EAAE,SAAS,CAAC;IAC7B,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;CACF,CAAC"}
|
|
@@ -9,7 +9,6 @@ export declare const SimpleProduct: {
|
|
|
9
9
|
quantity: number;
|
|
10
10
|
deliveryProviderType: DeliveryProviderType;
|
|
11
11
|
}, requestContext: Context): Promise<Array<{
|
|
12
|
-
_id: string;
|
|
13
12
|
deliveryProvider?: DeliveryProvider;
|
|
14
13
|
warehousingProvider?: WarehousingProvider;
|
|
15
14
|
shipping?: Date;
|
|
@@ -19,7 +18,6 @@ export declare const SimpleProduct: {
|
|
|
19
18
|
referenceDate: Date;
|
|
20
19
|
deliveryProviderType: DeliveryProviderType;
|
|
21
20
|
}, requestContext: Context): Promise<Array<{
|
|
22
|
-
_id: string;
|
|
23
21
|
deliveryProvider?: DeliveryProvider;
|
|
24
22
|
warehousingProvider?: WarehousingProvider;
|
|
25
23
|
quantity?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-simple-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,eAAO,MAAM,aAAa;6BAIjB,OAAO,UACJ;QAAE,aAAa,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,oBAAoB,CAAA;KAAE,kBAC7E,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,
|
|
1
|
+
{"version":3,"file":"product-simple-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,eAAO,MAAM,aAAa;6BAIjB,OAAO,UACJ;QAAE,aAAa,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,oBAAoB,CAAA;KAAE,kBAC7E,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,IAAI,CAAC;QAChB,gBAAgB,CAAC,EAAE,IAAI,CAAC;KACzB,CAAC,CACH;yBAeM,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;QACpB,oBAAoB,EAAE,oBAAoB,CAAC;KAC5C,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;;;QAe0B,MAAM;;;QAIX,MAAM;;;QAIJ,aAAa;;gBAlEpB,CAAC;gBAAkB,CAAC;;;gBAkBjC,CAAC;gBAAyB,CAAA;mBAExB,CAAC;qBAA8B,CAAC;;;gBA0CtC,CADF;;;;;;;;;;;mBAjD4B,CAAA;;;;;;;YAYtB,CAAJ;;;mBAuBiD,CAAC;aAC9C,CAAD;cAAsB,CAAC;YAGvB,CAAC;;;mBAgBI,CAAC;;;oBAOP,CAAJ;;;;;;;mBAGk6B,CAAC;;CADl6B,CAAC"}
|
|
@@ -1,36 +1,16 @@
|
|
|
1
|
-
import { WarehousingDirector } from '@unchainedshop/core';
|
|
2
1
|
import { PlanProduct } from './product-plan-types.js';
|
|
3
2
|
export const SimpleProduct = {
|
|
4
3
|
...PlanProduct,
|
|
5
4
|
async simulatedDispatches(obj, params, requestContext) {
|
|
6
|
-
const {
|
|
7
|
-
const {
|
|
8
|
-
const deliveryProviders = await modules.delivery.findProviders({
|
|
9
|
-
|
|
5
|
+
const { referenceDate, quantity } = params;
|
|
6
|
+
const { services, modules } = requestContext;
|
|
7
|
+
const deliveryProviders = await modules.delivery.findProviders({});
|
|
8
|
+
return services.products.simulateProductDispatching({
|
|
9
|
+
deliveryProviders,
|
|
10
|
+
product: obj,
|
|
11
|
+
quantity,
|
|
12
|
+
referenceDate,
|
|
10
13
|
});
|
|
11
|
-
return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
|
|
12
|
-
const result = await oldResult;
|
|
13
|
-
const warehousingProviders = await services.orders.supportedWarehousingProviders({
|
|
14
|
-
product: obj,
|
|
15
|
-
deliveryProvider,
|
|
16
|
-
});
|
|
17
|
-
const mappedWarehousingProviders = await Promise.all(warehousingProviders.map(async (warehousingProvider) => {
|
|
18
|
-
const warehousingContext = {
|
|
19
|
-
deliveryProvider,
|
|
20
|
-
product: obj,
|
|
21
|
-
quantity,
|
|
22
|
-
referenceDate,
|
|
23
|
-
};
|
|
24
|
-
const director = await WarehousingDirector.actions(warehousingProvider, warehousingContext, requestContext);
|
|
25
|
-
const dispatch = await director.estimatedDispatch();
|
|
26
|
-
return {
|
|
27
|
-
warehousingProvider,
|
|
28
|
-
...warehousingContext,
|
|
29
|
-
...dispatch,
|
|
30
|
-
};
|
|
31
|
-
}));
|
|
32
|
-
return result.concat(result, mappedWarehousingProviders);
|
|
33
|
-
}, Promise.resolve([]));
|
|
34
14
|
},
|
|
35
15
|
async simulatedStocks(obj, params, requestContext) {
|
|
36
16
|
const { modules, services } = requestContext;
|
|
@@ -38,28 +18,11 @@ export const SimpleProduct = {
|
|
|
38
18
|
const deliveryProviders = await modules.delivery.findProviders({
|
|
39
19
|
type: deliveryProviderType,
|
|
40
20
|
});
|
|
41
|
-
return
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
});
|
|
47
|
-
const mappedWarehousingProviders = await Promise.all(warehousingProviders.map(async (warehousingProvider) => {
|
|
48
|
-
const warehousingContext = {
|
|
49
|
-
deliveryProvider,
|
|
50
|
-
product: obj,
|
|
51
|
-
referenceDate,
|
|
52
|
-
};
|
|
53
|
-
const director = await WarehousingDirector.actions(warehousingProvider, warehousingContext, requestContext);
|
|
54
|
-
const stock = await director.estimatedStock();
|
|
55
|
-
return {
|
|
56
|
-
warehousingProvider,
|
|
57
|
-
...warehousingContext,
|
|
58
|
-
...stock,
|
|
59
|
-
};
|
|
60
|
-
}));
|
|
61
|
-
return result.concat(result, mappedWarehousingProviders);
|
|
62
|
-
}, Promise.resolve([]));
|
|
21
|
+
return services.products.simulateProductInventory({
|
|
22
|
+
deliveryProviders,
|
|
23
|
+
product: obj,
|
|
24
|
+
referenceDate,
|
|
25
|
+
});
|
|
63
26
|
},
|
|
64
27
|
baseUnit({ warehousing }) {
|
|
65
28
|
return warehousing?.baseUnit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-simple-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-simple-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,GAAG,WAAW;IAEd,KAAK,CAAC,mBAAmB,CACvB,GAAY,EACZ,MAA6F,EAC7F,cAAuB;QASvB,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC3C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAE7C,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO,QAAQ,CAAC,QAAQ,CAAC,0BAA0B,CAAC;YAClD,iBAAiB;YACjB,OAAO,EAAE,GAAG;YACZ,QAAQ;YACR,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAGC,EACD,cAAuB;QAQvB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC7C,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;QAEvD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC7D,IAAI,EAAE,oBAAoB;SAC3B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAChD,iBAAiB;YACjB,OAAO,EAAE,GAAG;YACZ,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,EAAE,WAAW,EAAE;QACtB,OAAO,WAAW,EAAE,QAAQ,CAAC;IAC/B,CAAC;IAED,GAAG,CAAC,EAAE,WAAW,EAAE;QACjB,OAAO,WAAW,EAAE,GAAG,CAAC;IAC1B,CAAC;IAED,UAAU,CAAC,EAAE,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;QAC9F,OAAO;YACL,YAAY;YACZ,mBAAmB;YACnB,mBAAmB;YACnB,kBAAkB;SACnB,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -9,7 +9,6 @@ export declare const TokenizedProduct: {
|
|
|
9
9
|
simulatedStocks(obj: Product, params: {
|
|
10
10
|
referenceDate: Date;
|
|
11
11
|
}, requestContext: Context): Promise<Array<{
|
|
12
|
-
_id: string;
|
|
13
12
|
deliveryProvider?: DeliveryProvider;
|
|
14
13
|
warehousingProvider?: WarehousingProvider;
|
|
15
14
|
quantity?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-tokenized-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-tokenized-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,4BAA4B,EAC5B,uBAAuB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAK9C,eAAO,MAAM,gBAAgB;sCAGO,OAAO,GAAG,MAAM;4CAIV,OAAO,GAAG,4BAA4B;uCAS3C,OAAO,GAAG,uBAAuB;yBAK7D,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;KACrB,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;oBAaqB,OAAO,UAAU,KAAK,kBAAkB,OAAO;;gBA/CtE,CAAC;gBAAkB,CAAC;;;gBAkBO,CAAC;gBAAwB,CAAC;mBAC9C,CAAC;qBAA8B,CAAC;;;gBAuCL,CAAC;;;;;;;;;;;mBA7C9B,CAAL;;;;;;;YAcgB,CAAC;;;mBAqBD,CAAC;aAAqB,CAAC;cAAsB,CAAC;YAE3D,CAAD;;;mBAU8D,CAAC;;;oBAAsO,CAAC;;;;;;;mBAAi7B,CAAC;;CAL1tC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { WarehousingDirector } from '@unchainedshop/core';
|
|
2
1
|
import { PlanProduct } from './product-plan-types.js';
|
|
3
2
|
import { checkAction } from '../../../acl.js';
|
|
4
3
|
import { actions } from '../../../roles/index.js';
|
|
@@ -23,28 +22,11 @@ export const TokenizedProduct = {
|
|
|
23
22
|
const { modules, services } = requestContext;
|
|
24
23
|
const { referenceDate } = params;
|
|
25
24
|
const deliveryProviders = await modules.delivery.findProviders({});
|
|
26
|
-
return
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
});
|
|
32
|
-
const mappedWarehousingProviders = await Promise.all(warehousingProviders.map(async (warehousingProvider) => {
|
|
33
|
-
const warehousingContext = {
|
|
34
|
-
deliveryProvider,
|
|
35
|
-
product: obj,
|
|
36
|
-
referenceDate,
|
|
37
|
-
};
|
|
38
|
-
const director = await WarehousingDirector.actions(warehousingProvider, warehousingContext, requestContext);
|
|
39
|
-
const stock = await director.estimatedStock();
|
|
40
|
-
return {
|
|
41
|
-
warehousingProvider,
|
|
42
|
-
...warehousingContext,
|
|
43
|
-
...stock,
|
|
44
|
-
};
|
|
45
|
-
}));
|
|
46
|
-
return result.concat(result, mappedWarehousingProviders);
|
|
47
|
-
}, Promise.resolve([]));
|
|
25
|
+
return services.products.simulateProductInventory({
|
|
26
|
+
deliveryProviders,
|
|
27
|
+
product: obj,
|
|
28
|
+
referenceDate,
|
|
29
|
+
});
|
|
48
30
|
},
|
|
49
31
|
async tokens(product, params, requestContext) {
|
|
50
32
|
await checkAction(requestContext, actions.viewTokens, [undefined, params]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-tokenized-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"product-tokenized-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,GAAG,WAAW;IAEd,eAAe,CAAC,EAAE,YAAY,EAAW;QACvC,OAAO,YAAY,EAAE,eAAe,CAAC;IACvC,CAAC;IAED,qBAAqB,CAAC,EAAE,YAAY,EAAW;QAC7C,IAAI,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO;YACL,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,qBAAqB,EAAE,YAAY,CAAC,qBAAqB;SAC1D,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,EAAE,YAAY,EAAW;QACxC,OAAO,YAAY,EAAE,gBAAgB,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAEC,EACD,cAAuB;QAQvB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC7C,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;QAEjC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAChD,iBAAiB;YACjB,OAAO,EAAE,GAAG;YACZ,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,MAAa,EAAE,cAAuB;QACnE,MAAM,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QAE3E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC;YACjE,SAAS,EAAE,OAAO,CAAC,GAAG;SACvB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC;AAEF,OAAO,gBAAgB,CAAC,SAAS,CAAC;AAClC,OAAO,gBAAgB,CAAC,oBAAoB,CAAC;AAC7C,OAAO,gBAAgB,CAAC,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"user-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { checkAction, checkTypeResolver } from '../../acl.js';
|
|
|
3
3
|
import { actions } from '../../roles/index.js';
|
|
4
4
|
const { viewUserPrivateInfos, viewUserPublicInfos, viewUserOrders, viewUserEnrollments, viewUserQuotations, viewUserProductReviews, } = actions;
|
|
5
5
|
const getPrimaryEmail = (user) => {
|
|
6
|
-
return (user.emails || []).
|
|
6
|
+
return (user.emails || []).toSorted((left, right) => Number(right.verified) - Number(left.verified))?.[0];
|
|
7
7
|
};
|
|
8
8
|
export const User = {
|
|
9
9
|
_id: checkTypeResolver(viewUserPublicInfos, '_id'),
|
|
@@ -54,7 +54,7 @@ export const User = {
|
|
|
54
54
|
const { modules, countryContext } = context;
|
|
55
55
|
await checkAction(context, viewUserOrders, [user, params]);
|
|
56
56
|
return modules.orders.cart({
|
|
57
|
-
|
|
57
|
+
countryCode: countryContext,
|
|
58
58
|
orderNumber: params.orderNumber,
|
|
59
59
|
userId: user._id,
|
|
60
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AA2F/C,MAAM,EACJ,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,GACvB,GAAG,OAAiC,CAAC;AAEtC,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE;IACzC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/api",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc7",
|
|
4
4
|
"main": "lib/api-index.js",
|
|
5
5
|
"types": "lib/api-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -21,7 +21,10 @@
|
|
|
21
21
|
"ecommerce",
|
|
22
22
|
"api"
|
|
23
23
|
],
|
|
24
|
-
"
|
|
24
|
+
"authors": [
|
|
25
|
+
"Joël Meiller",
|
|
26
|
+
"Pascal Kaufmann"
|
|
27
|
+
],
|
|
25
28
|
"license": "EUPL-1.2",
|
|
26
29
|
"bugs": {
|
|
27
30
|
"url": "https://github.com/unchainedshop/unchained/issues"
|
|
@@ -68,11 +71,11 @@
|
|
|
68
71
|
}
|
|
69
72
|
},
|
|
70
73
|
"dependencies": {
|
|
71
|
-
"@unchainedshop/core": "^3.0.0-
|
|
72
|
-
"@unchainedshop/events": "^3.0.0-
|
|
73
|
-
"@unchainedshop/logger": "^3.0.0-
|
|
74
|
-
"@unchainedshop/roles": "^3.0.0-
|
|
75
|
-
"@unchainedshop/utils": "^3.0.0-
|
|
74
|
+
"@unchainedshop/core": "^3.0.0-rc7",
|
|
75
|
+
"@unchainedshop/events": "^3.0.0-rc7",
|
|
76
|
+
"@unchainedshop/logger": "^3.0.0-rc7",
|
|
77
|
+
"@unchainedshop/roles": "^3.0.0-rc7",
|
|
78
|
+
"@unchainedshop/utils": "^3.0.0-rc7",
|
|
76
79
|
"accounting": "0.4.1",
|
|
77
80
|
"dataloader": "^2.2.3",
|
|
78
81
|
"expiry-map": "^2.0.0",
|
package/src/api-index.ts
CHANGED
|
@@ -10,8 +10,8 @@ import { UnchainedCore } from '@unchainedshop/core';
|
|
|
10
10
|
export * from './context.js';
|
|
11
11
|
export * from './locale-context.js';
|
|
12
12
|
export * from './loaders/index.js';
|
|
13
|
+
export * from './errors.js';
|
|
13
14
|
export * as acl from './acl.js';
|
|
14
|
-
export * as errors from './errors.js';
|
|
15
15
|
export * as roles from './roles/index.js';
|
|
16
16
|
export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
|
|
17
17
|
|
package/src/context.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
|
-
import path from 'path';
|
|
3
1
|
import { UnchainedCore } from '@unchainedshop/core';
|
|
4
2
|
import instantiateLoaders, { UnchainedLoaders } from './loaders/index.js';
|
|
5
3
|
import { getLocaleContext, UnchainedLocaleContext } from './locale-context.js';
|
|
@@ -58,24 +56,10 @@ export type UnchainedContextResolver = (
|
|
|
58
56
|
},
|
|
59
57
|
) => Promise<Context>;
|
|
60
58
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return {
|
|
66
|
-
version: process.env.npm_package_version,
|
|
67
|
-
};
|
|
68
|
-
const absolutePath = path.resolve(path.dirname(base), filename);
|
|
69
|
-
const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
|
|
70
|
-
return data;
|
|
71
|
-
} catch {
|
|
72
|
-
return null;
|
|
73
|
-
}
|
|
74
|
-
};
|
|
75
|
-
|
|
76
|
-
const packageJson = loadJSON('../package.json');
|
|
77
|
-
|
|
78
|
-
const { UNCHAINED_API_VERSION = packageJson?.version || '2.x' } = process.env;
|
|
59
|
+
const { default: packageJson } = await import(`${import.meta.dirname}/../package.json`, {
|
|
60
|
+
with: { type: 'json' },
|
|
61
|
+
});
|
|
62
|
+
const { UNCHAINED_API_VERSION = packageJson?.version || '3.x' } = process.env;
|
|
79
63
|
|
|
80
64
|
export const createContextResolver =
|
|
81
65
|
(
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
2
|
import { checkAction } from '../acl.js';
|
|
3
3
|
import { actions } from '../roles/index.js';
|
|
4
|
-
import { IncomingMessage } from 'http';
|
|
5
4
|
import { Context } from '../context.js';
|
|
6
5
|
|
|
7
6
|
const logger = createLogger('unchained:bulk-import');
|
|
@@ -19,7 +18,7 @@ const methodWrongHandler = (res) => () => {
|
|
|
19
18
|
};
|
|
20
19
|
|
|
21
20
|
export default async function bulkImportMiddleware(
|
|
22
|
-
req:
|
|
21
|
+
req: Request & { query?: any; unchainedContext: Context },
|
|
23
22
|
res,
|
|
24
23
|
) {
|
|
25
24
|
try {
|
package/src/express/index.ts
CHANGED
|
@@ -11,9 +11,8 @@ import { UnchainedCore } from '@unchainedshop/core';
|
|
|
11
11
|
import { emit } from '@unchainedshop/events';
|
|
12
12
|
import { API_EVENTS } from '../events.js';
|
|
13
13
|
import { User } from '@unchainedshop/core-users';
|
|
14
|
-
import { IncomingMessage } from 'http';
|
|
15
14
|
|
|
16
|
-
const resolveUserRemoteAddress = (req:
|
|
15
|
+
const resolveUserRemoteAddress = (req: e.Request) => {
|
|
17
16
|
const remoteAddress =
|
|
18
17
|
(req.headers['x-real-ip'] as string) ||
|
|
19
18
|
(req.headers['x-forwarded-for'] as string) ||
|
package/src/fastify/index.ts
CHANGED
|
@@ -8,12 +8,11 @@ import { UnchainedCore } from '@unchainedshop/core';
|
|
|
8
8
|
import { emit } from '@unchainedshop/events';
|
|
9
9
|
import { API_EVENTS } from '../events.js';
|
|
10
10
|
import { User } from '@unchainedshop/core-users';
|
|
11
|
-
import { IncomingMessage } from 'http';
|
|
12
11
|
import fastifySession from '@fastify/session';
|
|
13
12
|
import fastifyCookie from '@fastify/cookie';
|
|
14
|
-
import { FastifyInstance } from 'fastify';
|
|
13
|
+
import { FastifyInstance, FastifyRequest } from 'fastify';
|
|
15
14
|
|
|
16
|
-
const resolveUserRemoteAddress = (req:
|
|
15
|
+
const resolveUserRemoteAddress = (req: FastifyRequest) => {
|
|
17
16
|
const remoteAddress =
|
|
18
17
|
(req.headers['x-real-ip'] as string) ||
|
|
19
18
|
(req.headers['x-forwarded-for'] as string) ||
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Context } from '../../../context.js';
|
|
2
2
|
import { log } from '@unchainedshop/logger';
|
|
3
|
-
import { getOrderCart } from '../utils/getOrderCart.js';
|
|
4
3
|
import {
|
|
5
4
|
OrderWrongStatusError,
|
|
6
5
|
OrderDiscountCodeAlreadyPresentError,
|
|
7
6
|
OrderDiscountCodeNotValidError,
|
|
7
|
+
OrderNotFoundError,
|
|
8
8
|
} from '../../../errors.js';
|
|
9
9
|
|
|
10
10
|
export default async function addCartDiscount(
|
|
@@ -16,7 +16,12 @@ export default async function addCartDiscount(
|
|
|
16
16
|
|
|
17
17
|
log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
|
|
18
18
|
|
|
19
|
-
const order = await
|
|
19
|
+
const order = await services.orders.findOrInitCart({
|
|
20
|
+
orderId,
|
|
21
|
+
user,
|
|
22
|
+
countryCode: context.countryContext,
|
|
23
|
+
});
|
|
24
|
+
if (!order) throw new OrderNotFoundError({ orderId });
|
|
20
25
|
|
|
21
26
|
if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
|
|
22
27
|
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
OrderQuantityTooLowError,
|
|
6
6
|
InvalidIdError,
|
|
7
7
|
OrderWrongStatusError,
|
|
8
|
+
OrderNotFoundError,
|
|
8
9
|
} from '../../../errors.js';
|
|
9
|
-
import { getOrderCart } from '../utils/getOrderCart.js';
|
|
10
10
|
import { ordersSettings } from '@unchainedshop/core-orders';
|
|
11
11
|
|
|
12
12
|
export default async function addCartProduct(
|
|
@@ -29,7 +29,13 @@ export default async function addCartProduct(
|
|
|
29
29
|
const originalProduct = await modules.products.findProduct({ productId: originalProductId });
|
|
30
30
|
if (!originalProduct) throw new ProductNotFoundError({ productId: originalProductId });
|
|
31
31
|
|
|
32
|
-
const order = await
|
|
32
|
+
const order = await services.orders.findOrInitCart({
|
|
33
|
+
orderId,
|
|
34
|
+
user,
|
|
35
|
+
countryCode: context.countryContext,
|
|
36
|
+
});
|
|
37
|
+
if (!order) throw new OrderNotFoundError({ orderId });
|
|
38
|
+
|
|
33
39
|
if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
|
|
34
40
|
|
|
35
41
|
const product = await modules.products.resolveOrderableProduct(originalProduct, { configuration });
|
|
@@ -8,8 +8,8 @@ import {
|
|
|
8
8
|
InvalidIdError,
|
|
9
9
|
OrderWrongStatusError,
|
|
10
10
|
ProductNotFoundError,
|
|
11
|
+
OrderNotFoundError,
|
|
11
12
|
} from '../../../errors.js';
|
|
12
|
-
import { getOrderCart } from '../utils/getOrderCart.js';
|
|
13
13
|
import { QuotationDirector } from '@unchainedshop/core';
|
|
14
14
|
|
|
15
15
|
export default async function addCartQuotation(
|
|
@@ -43,7 +43,12 @@ export default async function addCartQuotation(
|
|
|
43
43
|
throw new QuotationWrongStatusError({ status: quotation.status });
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
const order = await
|
|
46
|
+
const order = await services.orders.findOrInitCart({
|
|
47
|
+
orderId,
|
|
48
|
+
user,
|
|
49
|
+
countryCode: context.countryContext,
|
|
50
|
+
});
|
|
51
|
+
if (!order) throw new OrderNotFoundError({ orderId });
|
|
47
52
|
if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
|
|
48
53
|
|
|
49
54
|
if (
|