@unchainedshop/core-orders 4.0.0-rc.12 → 4.0.0-rc.14
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/module/configureOrderPositionsModule.d.ts +1 -0
- package/lib/module/configureOrderPositionsModule.d.ts.map +1 -1
- package/lib/module/configureOrderPositionsModule.js.map +1 -1
- package/lib/module/configureOrdersModule-queries.d.ts +9 -4
- package/lib/module/configureOrdersModule-queries.d.ts.map +1 -1
- package/lib/module/configureOrdersModule-queries.js +1 -85
- package/lib/module/configureOrdersModule-queries.js.map +1 -1
- package/package.json +4 -4
- package/src/module/configureOrderPositionsModule.ts +1 -0
- package/src/module/configureOrdersModule-queries.ts +10 -91
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderPositionsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AASnC,UAAU,4BAA4B;IACpC,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,EAAE,UAAU,MAAM,KAIrF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAErC,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;oCAMiB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,YACpB,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,CAAC;sCAIe;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;8BAKtD,MAAM,KAAG,OAAO,CAAC,aAAa,CAAC;mCAS1B;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,MAAM,CAAC;uEAUvE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,KAAG,OAAO,CAAC,aAAa,CAAC;uDAgC+B,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CAAC;iEAoC5B,OAAO,CAAC,aAAa,CAAC;wBAYnD,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE,KACf,OAAO,CAAC,aAAa,CAAC;oCAYa;QACpC,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KAAG,OAAO,CAAC,aAAa,CAAC;oCAwCY,MAAM;uFAazC,4BAA4B,KAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAiBxD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"configureOrderPositionsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AASnC,UAAU,4BAA4B;IACpC,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,EAAE,UAAU,MAAM,KAIrF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAErC,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;oCAMiB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,YACpB,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,CAAC;sCAIe;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;8BAKtD,MAAM,KAAG,OAAO,CAAC,aAAa,CAAC;mCAS1B;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,MAAM,CAAC;uEAUvE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,KAAG,OAAO,CAAC,aAAa,CAAC;uDAgC+B,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CAAC;iEAoC5B,OAAO,CAAC,aAAa,CAAC;wBAYnD,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE,KACf,OAAO,CAAC,aAAa,CAAC;oCAYa;QACpC,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KAAG,OAAO,CAAC,aAAa,CAAC;oCAwCY,MAAM;uFAazC,4BAA4B,KAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAiBxD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAW,MAAM,wBAAwB,CAAC;AAK3F,MAAM,qBAAqB,GAAa;IACtC,wBAAwB;IACxB,wBAAwB;IACxB,kBAAkB;IAClB,mBAAmB;CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SortOption
|
|
1
|
+
import { SortOption } from '@unchainedshop/utils';
|
|
2
2
|
import { mongodb } from '@unchainedshop/mongodb';
|
|
3
3
|
import { Order, OrderQuery } from '../db/OrdersCollection.js';
|
|
4
4
|
import { Document } from 'mongodb';
|
|
@@ -9,8 +9,16 @@ export interface OrderReport {
|
|
|
9
9
|
confirmCount: number;
|
|
10
10
|
fulfillCount: number;
|
|
11
11
|
}
|
|
12
|
+
export interface OrderStatisticsRecord {
|
|
13
|
+
date: string;
|
|
14
|
+
total: {
|
|
15
|
+
amount: number;
|
|
16
|
+
currency: string;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
12
19
|
interface OrderAggregateParams {
|
|
13
20
|
match?: Record<string, any>;
|
|
21
|
+
matchAfterGroup?: Record<string, any>;
|
|
14
22
|
project?: Record<string, any>;
|
|
15
23
|
group?: Record<string, any>;
|
|
16
24
|
sort?: Record<string, number>;
|
|
@@ -38,9 +46,6 @@ export declare const configureOrdersModuleQueries: ({ Orders }: {
|
|
|
38
46
|
offset?: number;
|
|
39
47
|
sort?: SortOption[];
|
|
40
48
|
}, options?: mongodb.FindOptions) => Promise<Order[]>;
|
|
41
|
-
getReport: (params: {
|
|
42
|
-
dateRange?: DateFilterInput;
|
|
43
|
-
}) => Promise<OrderReport>;
|
|
44
49
|
orderExists: ({ orderId }: {
|
|
45
50
|
orderId: string;
|
|
46
51
|
}) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-queries.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-queries.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAA0C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEzF,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AACD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,UAAU,oBAAoB;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB;AAED,eAAO,MAAM,4BAA4B,GAAI,YAAY;IAAE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;CAAE;oBAE1E,KAAK;kDAQlB;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;KAChB,KAAG,OAAO,CAAC,KAAK,CAAC;mBAmBG,UAAU,KAAG,OAAO,CAAC,MAAM,CAAC;2CAQ5C;QACD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,KAAK,CAAC;;iEAyBZ,UAAU,GAAG;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;KACrB,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,KAAK,EAAE,CAAC;+BAmBc;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,OAAO,CAAC;oFAcpE,oBAAoB,KAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAgBhD,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC"}
|
|
@@ -1,19 +1,6 @@
|
|
|
1
1
|
import { SortDirection } from '@unchainedshop/utils';
|
|
2
2
|
import { generateDbFilterById, buildSortOptions } from '@unchainedshop/mongodb';
|
|
3
3
|
import buildFindSelector from './buildFindSelector.js';
|
|
4
|
-
const normalizeOrderAggregateResult = (data = {}) => {
|
|
5
|
-
const statusToFieldMap = {
|
|
6
|
-
newCount: 0,
|
|
7
|
-
checkoutCount: 0,
|
|
8
|
-
rejectCount: 0,
|
|
9
|
-
confirmCount: 0,
|
|
10
|
-
fulfillCount: 0,
|
|
11
|
-
};
|
|
12
|
-
Object.entries(data).forEach(([key, value]) => {
|
|
13
|
-
statusToFieldMap[key] = value;
|
|
14
|
-
});
|
|
15
|
-
return statusToFieldMap;
|
|
16
|
-
};
|
|
17
4
|
export const configureOrdersModuleQueries = ({ Orders }) => {
|
|
18
5
|
return {
|
|
19
6
|
isCart: (order) => {
|
|
@@ -69,77 +56,6 @@ export const configureOrdersModuleQueries = ({ Orders }) => {
|
|
|
69
56
|
}
|
|
70
57
|
return Orders.find(selector, findOptions).toArray();
|
|
71
58
|
},
|
|
72
|
-
getReport: async (params) => {
|
|
73
|
-
const { dateRange } = params || {};
|
|
74
|
-
const selector = {};
|
|
75
|
-
if (dateRange?.end || dateRange?.start) {
|
|
76
|
-
if (dateRange?.start) {
|
|
77
|
-
const fromDate = new Date(dateRange?.start);
|
|
78
|
-
selector.$gte = fromDate;
|
|
79
|
-
}
|
|
80
|
-
if (dateRange?.end) {
|
|
81
|
-
const toDate = new Date(dateRange?.end);
|
|
82
|
-
selector.$lte = toDate;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
const pipeline = [
|
|
86
|
-
{
|
|
87
|
-
$facet: {
|
|
88
|
-
checkoutCount: [
|
|
89
|
-
{
|
|
90
|
-
$match: {
|
|
91
|
-
ordered: selector,
|
|
92
|
-
},
|
|
93
|
-
},
|
|
94
|
-
{ $count: 'count' },
|
|
95
|
-
],
|
|
96
|
-
fulfillCount: [
|
|
97
|
-
{
|
|
98
|
-
$match: {
|
|
99
|
-
fullfilled: selector,
|
|
100
|
-
},
|
|
101
|
-
},
|
|
102
|
-
{ $count: 'count' },
|
|
103
|
-
],
|
|
104
|
-
rejectCount: [
|
|
105
|
-
{
|
|
106
|
-
$match: {
|
|
107
|
-
rejected: selector,
|
|
108
|
-
},
|
|
109
|
-
},
|
|
110
|
-
{ $count: 'count' },
|
|
111
|
-
],
|
|
112
|
-
newCount: [
|
|
113
|
-
{
|
|
114
|
-
$match: {
|
|
115
|
-
created: selector,
|
|
116
|
-
},
|
|
117
|
-
},
|
|
118
|
-
{ $count: 'count' },
|
|
119
|
-
],
|
|
120
|
-
confirmCount: [
|
|
121
|
-
{
|
|
122
|
-
$match: {
|
|
123
|
-
confirmed: selector,
|
|
124
|
-
},
|
|
125
|
-
},
|
|
126
|
-
{ $count: 'count' },
|
|
127
|
-
],
|
|
128
|
-
},
|
|
129
|
-
},
|
|
130
|
-
{
|
|
131
|
-
$project: {
|
|
132
|
-
checkoutCount: { $arrayElemAt: ['$checkoutCount.count', 0] },
|
|
133
|
-
fulfillCount: { $arrayElemAt: ['$fulfillCount.count', 0] },
|
|
134
|
-
rejectCount: { $arrayElemAt: ['$rejectCount.count', 0] },
|
|
135
|
-
newCount: { $arrayElemAt: ['$newCount.count', 0] },
|
|
136
|
-
confirmCount: { $arrayElemAt: ['$confirmCount.count', 0] },
|
|
137
|
-
},
|
|
138
|
-
},
|
|
139
|
-
];
|
|
140
|
-
const [facetedResult] = await Orders.aggregate(pipeline).toArray();
|
|
141
|
-
return normalizeOrderAggregateResult(facetedResult);
|
|
142
|
-
},
|
|
143
59
|
orderExists: async ({ orderId }) => {
|
|
144
60
|
const orderCount = await Orders.countDocuments(generateDbFilterById(orderId), {
|
|
145
61
|
limit: 1,
|
|
@@ -163,7 +79,7 @@ export const configureOrdersModuleQueries = ({ Orders }) => {
|
|
|
163
79
|
stages.push({ $sort: sort });
|
|
164
80
|
if (typeof limit === 'number')
|
|
165
81
|
stages.push({ $limit: limit });
|
|
166
|
-
return Orders.aggregate(stages).toArray();
|
|
82
|
+
return Orders.aggregate(stages, { allowDiskUse: true }).toArray();
|
|
167
83
|
},
|
|
168
84
|
};
|
|
169
85
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.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": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.14",
|
|
4
4
|
"main": "lib/orders-index.js",
|
|
5
5
|
"types": "lib/orders-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@kontsedal/locco": "0.1.0",
|
|
35
|
-
"@unchainedshop/events": "^4.0.0-rc.
|
|
36
|
-
"@unchainedshop/logger": "^4.0.0-rc.
|
|
37
|
-
"@unchainedshop/utils": "^4.0.0-rc.
|
|
35
|
+
"@unchainedshop/events": "^4.0.0-rc.14",
|
|
36
|
+
"@unchainedshop/logger": "^4.0.0-rc.14",
|
|
37
|
+
"@unchainedshop/utils": "^4.0.0-rc.14"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@types/node": "^24.0.13",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SortDirection, SortOption
|
|
1
|
+
import { SortDirection, SortOption } from '@unchainedshop/utils';
|
|
2
2
|
import { generateDbFilterById, buildSortOptions, mongodb } from '@unchainedshop/mongodb';
|
|
3
3
|
import buildFindSelector from './buildFindSelector.js';
|
|
4
4
|
import { Order, OrderQuery } from '../db/OrdersCollection.js';
|
|
@@ -11,9 +11,17 @@ export interface OrderReport {
|
|
|
11
11
|
confirmCount: number;
|
|
12
12
|
fulfillCount: number;
|
|
13
13
|
}
|
|
14
|
+
export interface OrderStatisticsRecord {
|
|
15
|
+
date: string;
|
|
16
|
+
total: {
|
|
17
|
+
amount: number;
|
|
18
|
+
currency: string;
|
|
19
|
+
};
|
|
20
|
+
}
|
|
14
21
|
|
|
15
22
|
interface OrderAggregateParams {
|
|
16
23
|
match?: Record<string, any>;
|
|
24
|
+
matchAfterGroup?: Record<string, any>;
|
|
17
25
|
project?: Record<string, any>;
|
|
18
26
|
group?: Record<string, any>;
|
|
19
27
|
sort?: Record<string, number>;
|
|
@@ -22,21 +30,6 @@ interface OrderAggregateParams {
|
|
|
22
30
|
pipeline?: any[];
|
|
23
31
|
}
|
|
24
32
|
|
|
25
|
-
const normalizeOrderAggregateResult = (data = {}): OrderReport => {
|
|
26
|
-
const statusToFieldMap = {
|
|
27
|
-
newCount: 0,
|
|
28
|
-
checkoutCount: 0,
|
|
29
|
-
rejectCount: 0,
|
|
30
|
-
confirmCount: 0,
|
|
31
|
-
fulfillCount: 0,
|
|
32
|
-
};
|
|
33
|
-
|
|
34
|
-
Object.entries(data).forEach(([key, value]) => {
|
|
35
|
-
statusToFieldMap[key] = value;
|
|
36
|
-
});
|
|
37
|
-
return statusToFieldMap;
|
|
38
|
-
};
|
|
39
|
-
|
|
40
33
|
export const configureOrdersModuleQueries = ({ Orders }: { Orders: mongodb.Collection<Order> }) => {
|
|
41
34
|
return {
|
|
42
35
|
isCart: (order: Order) => {
|
|
@@ -133,80 +126,6 @@ export const configureOrdersModuleQueries = ({ Orders }: { Orders: mongodb.Colle
|
|
|
133
126
|
|
|
134
127
|
return Orders.find(selector, findOptions).toArray();
|
|
135
128
|
},
|
|
136
|
-
|
|
137
|
-
getReport: async (params: { dateRange?: DateFilterInput }): Promise<OrderReport> => {
|
|
138
|
-
const { dateRange } = params || {};
|
|
139
|
-
const selector: any = {};
|
|
140
|
-
if (dateRange?.end || dateRange?.start) {
|
|
141
|
-
if (dateRange?.start) {
|
|
142
|
-
const fromDate = new Date(dateRange?.start);
|
|
143
|
-
selector.$gte = fromDate;
|
|
144
|
-
}
|
|
145
|
-
if (dateRange?.end) {
|
|
146
|
-
const toDate = new Date(dateRange?.end);
|
|
147
|
-
selector.$lte = toDate;
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
const pipeline = [
|
|
152
|
-
{
|
|
153
|
-
$facet: {
|
|
154
|
-
checkoutCount: [
|
|
155
|
-
{
|
|
156
|
-
$match: {
|
|
157
|
-
ordered: selector,
|
|
158
|
-
},
|
|
159
|
-
},
|
|
160
|
-
{ $count: 'count' },
|
|
161
|
-
],
|
|
162
|
-
fulfillCount: [
|
|
163
|
-
{
|
|
164
|
-
$match: {
|
|
165
|
-
fullfilled: selector,
|
|
166
|
-
},
|
|
167
|
-
},
|
|
168
|
-
{ $count: 'count' },
|
|
169
|
-
],
|
|
170
|
-
rejectCount: [
|
|
171
|
-
{
|
|
172
|
-
$match: {
|
|
173
|
-
rejected: selector,
|
|
174
|
-
},
|
|
175
|
-
},
|
|
176
|
-
{ $count: 'count' },
|
|
177
|
-
],
|
|
178
|
-
newCount: [
|
|
179
|
-
{
|
|
180
|
-
$match: {
|
|
181
|
-
created: selector,
|
|
182
|
-
},
|
|
183
|
-
},
|
|
184
|
-
{ $count: 'count' },
|
|
185
|
-
],
|
|
186
|
-
confirmCount: [
|
|
187
|
-
{
|
|
188
|
-
$match: {
|
|
189
|
-
confirmed: selector,
|
|
190
|
-
},
|
|
191
|
-
},
|
|
192
|
-
{ $count: 'count' },
|
|
193
|
-
],
|
|
194
|
-
},
|
|
195
|
-
},
|
|
196
|
-
{
|
|
197
|
-
$project: {
|
|
198
|
-
checkoutCount: { $arrayElemAt: ['$checkoutCount.count', 0] },
|
|
199
|
-
fulfillCount: { $arrayElemAt: ['$fulfillCount.count', 0] },
|
|
200
|
-
rejectCount: { $arrayElemAt: ['$rejectCount.count', 0] },
|
|
201
|
-
newCount: { $arrayElemAt: ['$newCount.count', 0] },
|
|
202
|
-
confirmCount: { $arrayElemAt: ['$confirmCount.count', 0] },
|
|
203
|
-
},
|
|
204
|
-
},
|
|
205
|
-
];
|
|
206
|
-
const [facetedResult] = await Orders.aggregate(pipeline).toArray();
|
|
207
|
-
return normalizeOrderAggregateResult(facetedResult);
|
|
208
|
-
},
|
|
209
|
-
|
|
210
129
|
orderExists: async ({ orderId }: { orderId: string }): Promise<boolean> => {
|
|
211
130
|
const orderCount = await Orders.countDocuments(generateDbFilterById(orderId), {
|
|
212
131
|
limit: 1,
|
|
@@ -234,7 +153,7 @@ export const configureOrdersModuleQueries = ({ Orders }: { Orders: mongodb.Colle
|
|
|
234
153
|
if (sort) stages.push({ $sort: sort });
|
|
235
154
|
if (typeof limit === 'number') stages.push({ $limit: limit });
|
|
236
155
|
|
|
237
|
-
return Orders.aggregate(stages).toArray();
|
|
156
|
+
return Orders.aggregate(stages, { allowDiskUse: true }).toArray();
|
|
238
157
|
},
|
|
239
158
|
};
|
|
240
159
|
};
|