@unchainedshop/core-orders 2.2.3 → 2.3.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/lib/db/OrderDiscountTrigger.js +1 -1
- package/lib/db/OrderDiscountTrigger.js.map +1 -1
- package/lib/director/OrderPricingDirector.js +6 -15
- package/lib/director/OrderPricingDirector.js.map +1 -1
- package/lib/module/configureOrderPositionsModule.js +31 -5
- package/lib/module/configureOrderPositionsModule.js.map +1 -1
- package/package.json +9 -9
- package/src/director/OrderPricingDirector.ts +7 -19
- package/src/module/configureOrderPositionsModule.ts +36 -8
|
@@ -2,5 +2,5 @@ export var OrderDiscountTrigger;
|
|
|
2
2
|
(function (OrderDiscountTrigger) {
|
|
3
3
|
OrderDiscountTrigger["USER"] = "USER";
|
|
4
4
|
OrderDiscountTrigger["SYSTEM"] = "SYSTEM";
|
|
5
|
-
})(OrderDiscountTrigger
|
|
5
|
+
})(OrderDiscountTrigger || (OrderDiscountTrigger = {}));
|
|
6
6
|
//# sourceMappingURL=OrderDiscountTrigger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderDiscountTrigger.js","sourceRoot":"","sources":["../../src/db/OrderDiscountTrigger.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,
|
|
1
|
+
{"version":3,"file":"OrderDiscountTrigger.js","sourceRoot":"","sources":["../../src/db/OrderDiscountTrigger.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B"}
|
|
@@ -3,31 +3,22 @@ import { OrderPricingSheet } from './OrderPricingSheet.js';
|
|
|
3
3
|
const baseDirector = BasePricingDirector('OrderPricingDirector');
|
|
4
4
|
export const OrderPricingDirector = {
|
|
5
5
|
...baseDirector,
|
|
6
|
-
buildPricingContext: async (
|
|
6
|
+
buildPricingContext: async (context, unchainedAPI) => {
|
|
7
7
|
const { modules } = unchainedAPI;
|
|
8
|
+
const { order } = context;
|
|
8
9
|
const user = await modules.users.findUserById(order.userId);
|
|
9
|
-
const orderDelivery = await modules.orders.deliveries.findDelivery({
|
|
10
|
-
orderDeliveryId: order.deliveryId,
|
|
11
|
-
});
|
|
12
|
-
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
13
|
-
orderPaymentId: order.paymentId,
|
|
14
|
-
});
|
|
15
|
-
const orderPositions = await modules.orders.positions.findOrderPositions({
|
|
16
|
-
orderId: order._id,
|
|
17
|
-
});
|
|
18
10
|
const discounts = await modules.orders.discounts.findOrderDiscounts({
|
|
19
11
|
orderId: order._id,
|
|
20
12
|
});
|
|
21
13
|
return {
|
|
14
|
+
...unchainedAPI,
|
|
22
15
|
country: order.countryCode,
|
|
23
16
|
currency: order.currency,
|
|
24
|
-
...context,
|
|
25
|
-
...unchainedAPI,
|
|
26
17
|
discounts,
|
|
27
18
|
order,
|
|
28
|
-
orderDelivery,
|
|
29
|
-
orderPayment,
|
|
30
|
-
orderPositions,
|
|
19
|
+
orderDelivery: context.orderDelivery,
|
|
20
|
+
orderPayment: context.orderPayment,
|
|
21
|
+
orderPositions: context.orderPositions,
|
|
31
22
|
user,
|
|
32
23
|
};
|
|
33
24
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderPricingDirector.js","sourceRoot":"","sources":["../../src/director/OrderPricingDirector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,YAAY,GAAG,mBAAmB,CAKtC,sBAAsB,CAAC,CAAC;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAA0B;IACzD,GAAG,YAAY;IAEf,mBAAmB,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"OrderPricingDirector.js","sourceRoot":"","sources":["../../src/director/OrderPricingDirector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,YAAY,GAAG,mBAAmB,CAKtC,sBAAsB,CAAC,CAAC;AAE1B,MAAM,CAAC,MAAM,oBAAoB,GAA0B;IACzD,GAAG,YAAY;IAEf,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QACnD,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QACjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAE1B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;YAClE,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,YAAY;YACf,OAAO,EAAE,KAAK,CAAC,WAAW;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,SAAS;YACT,KAAK;YACL,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,IAAI;SACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY;QACxC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnG,OAAO;YACL,GAAG,OAAO;YACV,gBAAgB;gBACd,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,iBAAiB,CAAC;oBACvB,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE;oBACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -109,12 +109,38 @@ export const configureOrderPositionsModule = ({ OrderPositions, updateCalculatio
|
|
|
109
109
|
});
|
|
110
110
|
return updatedOrderPosition;
|
|
111
111
|
},
|
|
112
|
-
|
|
112
|
+
removeProductByIdFromAllOpenPositions: async (productId, unchainedAPI) => {
|
|
113
113
|
log('Remove Position Product', { productId });
|
|
114
|
-
const positions = await OrderPositions.
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
114
|
+
const positions = await OrderPositions.aggregate([
|
|
115
|
+
{
|
|
116
|
+
$match: {
|
|
117
|
+
productId,
|
|
118
|
+
},
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
$lookup: {
|
|
122
|
+
from: 'orders',
|
|
123
|
+
localField: 'orderId',
|
|
124
|
+
foreignField: '_id',
|
|
125
|
+
as: 'order',
|
|
126
|
+
},
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
$match: {
|
|
130
|
+
'order.status': null,
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
]).toArray();
|
|
134
|
+
const positionIds = positions.map((o) => o._id);
|
|
135
|
+
const result = await OrderPositions.deleteMany({ _id: { $in: positionIds } });
|
|
136
|
+
const orderIdsToRecalculate = positions.map((o) => o.orderId);
|
|
137
|
+
await Promise.all([...new Set(orderIdsToRecalculate)].map(async (orderIdToRecalculate) => {
|
|
138
|
+
await updateCalculation(orderIdToRecalculate, unchainedAPI);
|
|
139
|
+
}));
|
|
140
|
+
await Promise.all(positions.map(async (orderPosition) => {
|
|
141
|
+
await emit('ORDER_REMOVE_CART_ITEM', {
|
|
142
|
+
orderPosition,
|
|
143
|
+
});
|
|
118
144
|
}));
|
|
119
145
|
return result.deletedCount;
|
|
120
146
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-orders",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"main": "lib/orders-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/orders-index.js",
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@unchainedshop/events": "^2.
|
|
35
|
-
"@unchainedshop/logger": "^2.
|
|
36
|
-
"@unchainedshop/utils": "^2.
|
|
34
|
+
"@unchainedshop/events": "^2.3.0",
|
|
35
|
+
"@unchainedshop/logger": "^2.3.0",
|
|
36
|
+
"@unchainedshop/utils": "^2.3.0",
|
|
37
37
|
"simpl-schema": "=3.2.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@types/node": "^18.16.
|
|
41
|
-
"@unchainedshop/types": "^2.
|
|
42
|
-
"jest": "^29.
|
|
43
|
-
"ts-jest": "^29.1.
|
|
44
|
-
"typescript": "^
|
|
40
|
+
"@types/node": "^18.16.19",
|
|
41
|
+
"@unchainedshop/types": "^2.3.0",
|
|
42
|
+
"jest": "^29.6.0",
|
|
43
|
+
"ts-jest": "^29.1.1",
|
|
44
|
+
"typescript": "^5.1.6"
|
|
45
45
|
}
|
|
46
46
|
}
|
|
@@ -18,36 +18,24 @@ const baseDirector = BasePricingDirector<
|
|
|
18
18
|
export const OrderPricingDirector: IOrderPricingDirector = {
|
|
19
19
|
...baseDirector,
|
|
20
20
|
|
|
21
|
-
buildPricingContext: async (
|
|
21
|
+
buildPricingContext: async (context, unchainedAPI) => {
|
|
22
22
|
const { modules } = unchainedAPI;
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
const orderDelivery = await modules.orders.deliveries.findDelivery({
|
|
26
|
-
orderDeliveryId: order.deliveryId,
|
|
27
|
-
});
|
|
28
|
-
|
|
29
|
-
const orderPayment = await modules.orders.payments.findOrderPayment({
|
|
30
|
-
orderPaymentId: order.paymentId,
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
const orderPositions = await modules.orders.positions.findOrderPositions({
|
|
34
|
-
orderId: order._id,
|
|
35
|
-
});
|
|
23
|
+
const { order } = context;
|
|
36
24
|
|
|
25
|
+
const user = await modules.users.findUserById(order.userId);
|
|
37
26
|
const discounts = await modules.orders.discounts.findOrderDiscounts({
|
|
38
27
|
orderId: order._id,
|
|
39
28
|
});
|
|
40
29
|
|
|
41
30
|
return {
|
|
31
|
+
...unchainedAPI,
|
|
42
32
|
country: order.countryCode,
|
|
43
33
|
currency: order.currency,
|
|
44
|
-
...context,
|
|
45
|
-
...unchainedAPI,
|
|
46
34
|
discounts,
|
|
47
35
|
order,
|
|
48
|
-
orderDelivery,
|
|
49
|
-
orderPayment,
|
|
50
|
-
orderPositions,
|
|
36
|
+
orderDelivery: context.orderDelivery,
|
|
37
|
+
orderPayment: context.orderPayment,
|
|
38
|
+
orderPositions: context.orderPositions,
|
|
51
39
|
user,
|
|
52
40
|
};
|
|
53
41
|
},
|
|
@@ -180,20 +180,48 @@ export const configureOrderPositionsModule = ({
|
|
|
180
180
|
return updatedOrderPosition;
|
|
181
181
|
},
|
|
182
182
|
|
|
183
|
-
|
|
183
|
+
removeProductByIdFromAllOpenPositions: async (productId, unchainedAPI) => {
|
|
184
184
|
log('Remove Position Product', { productId });
|
|
185
|
-
const positions = await OrderPositions.find(
|
|
186
|
-
{ productId },
|
|
187
|
-
{ projection: { orderId: 1 } },
|
|
188
|
-
).toArray();
|
|
189
185
|
|
|
190
|
-
const
|
|
186
|
+
const positions = await OrderPositions.aggregate([
|
|
187
|
+
{
|
|
188
|
+
$match: {
|
|
189
|
+
productId,
|
|
190
|
+
},
|
|
191
|
+
},
|
|
192
|
+
{
|
|
193
|
+
$lookup: {
|
|
194
|
+
from: 'orders',
|
|
195
|
+
localField: 'orderId',
|
|
196
|
+
foreignField: '_id',
|
|
197
|
+
as: 'order',
|
|
198
|
+
},
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
$match: {
|
|
202
|
+
'order.status': null,
|
|
203
|
+
},
|
|
204
|
+
},
|
|
205
|
+
]).toArray();
|
|
206
|
+
|
|
207
|
+
const positionIds = positions.map((o) => o._id);
|
|
208
|
+
const result = await OrderPositions.deleteMany({ _id: { $in: positionIds } });
|
|
191
209
|
|
|
210
|
+
const orderIdsToRecalculate = positions.map((o) => o.orderId);
|
|
192
211
|
await Promise.all(
|
|
193
|
-
|
|
194
|
-
await updateCalculation(
|
|
212
|
+
[...new Set(orderIdsToRecalculate)].map(async (orderIdToRecalculate) => {
|
|
213
|
+
await updateCalculation(orderIdToRecalculate, unchainedAPI);
|
|
195
214
|
}),
|
|
196
215
|
);
|
|
216
|
+
|
|
217
|
+
await Promise.all(
|
|
218
|
+
positions.map(async (orderPosition) => {
|
|
219
|
+
await emit('ORDER_REMOVE_CART_ITEM', {
|
|
220
|
+
orderPosition,
|
|
221
|
+
});
|
|
222
|
+
}),
|
|
223
|
+
);
|
|
224
|
+
|
|
197
225
|
return result.deletedCount;
|
|
198
226
|
},
|
|
199
227
|
|