@unchainedshop/core-orders 2.14.0 → 2.14.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-queries.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-queries.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAe,MAAM,gCAAgC,CAAC;AAE9F,OAAO,EAA0C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEzF,eAAO,MAAM,iBAAiB,kDAAmD,UAAU,0BAkB1F,CAAC;AAiBF,eAAO,MAAM,4BAA4B,gBAEtC;IACD,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CACnC,KAAG,YA+GH,CAAC"}
|
|
@@ -5,8 +5,8 @@ export const buildFindSelector = ({ includeCarts, status, userId, queryString })
|
|
|
5
5
|
if (userId) {
|
|
6
6
|
selector.userId = userId;
|
|
7
7
|
}
|
|
8
|
-
if (status) {
|
|
9
|
-
selector.status = status;
|
|
8
|
+
if (Array.isArray(status) && status?.length) {
|
|
9
|
+
selector.status = { $in: status };
|
|
10
10
|
}
|
|
11
11
|
else if (!includeCarts) {
|
|
12
12
|
selector.status = { $ne: null }; // TODO: Slow performance! IDXSCAN in common query!
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,6BAA6B,CAAC;AAGxE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAW,MAAM,wBAAwB,CAAC;AAEzF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAc,EAAE,EAAE;IAC7F,MAAM,QAAQ,GAA0B,EAAE,CAAC;IAE3C,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5C,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;SAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACzB,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,mDAAmD;IACtF,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QACf,QAAgB,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,IAAI,GAAG,EAAE,EAAe,EAAE;IAC/D,MAAM,gBAAgB,GAAG;QACvB,QAAQ,EAAE,CAAC;QACX,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,CAAC;KAChB,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5C,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EAC3C,MAAM,GAGP,EAAgB,EAAE;IACjB,OAAO;QACL,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACzE,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;YAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE;YAC5E,MAAM,iBAAiB,GAAsB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7F,MAAM,WAAW,GAAwB;gBACvC,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,iBAAiB,CAAC;aAClD,CAAC;YACF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;YAE9D,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC3B,GAAG,OAAO;oBACV,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;oBAC7C,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;iBACxC,CAAC,CAAC,OAAO,EAAE,CAAC;YACf,CAAC;YAED,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;QACtD,CAAC;QAED,SAAS,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3D,MAAM,QAAQ,GAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACxC,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;gBACf,IAAI,IAAI,EAAE,CAAC;oBACT,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAC3B,CAAC;gBACD,IAAI,EAAE,EAAE,CAAC;oBACP,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC5B,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;gBACzB,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG;gBACf;oBACE,MAAM,EAAE;wBACN,aAAa,EAAE;4BACb;gCACE,MAAM,EAAE;oCACN,OAAO,EAAE,QAAQ;iCAClB;6BACF;4BACD,EAAE,MAAM,EAAE,OAAO,EAAE;yBACpB;wBACD,YAAY,EAAE;4BACZ;gCACE,MAAM,EAAE;oCACN,UAAU,EAAE,QAAQ;iCACrB;6BACF;4BACD,EAAE,MAAM,EAAE,OAAO,EAAE;yBACpB;wBACD,WAAW,EAAE;4BACX;gCACE,MAAM,EAAE;oCACN,QAAQ,EAAE,QAAQ;iCACnB;6BACF;4BACD,EAAE,MAAM,EAAE,OAAO,EAAE;yBACpB;wBACD,QAAQ,EAAE;4BACR;gCACE,MAAM,EAAE;oCACN,OAAO,EAAE,QAAQ;iCAClB;6BACF;4BACD,EAAE,MAAM,EAAE,OAAO,EAAE;yBACpB;wBACD,YAAY,EAAE;4BACZ;gCACE,MAAM,EAAE;oCACN,SAAS,EAAE,QAAQ;iCACpB;6BACF;4BACD,EAAE,MAAM,EAAE,OAAO,EAAE;yBACpB;qBACF;iBACF;gBACD;oBACE,QAAQ,EAAE;wBACR,aAAa,EAAE,EAAE,YAAY,EAAE,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE;wBAC5D,YAAY,EAAE,EAAE,YAAY,EAAE,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE;wBAC1D,WAAW,EAAE,EAAE,YAAY,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE;wBACxD,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE;wBAClD,YAAY,EAAE,EAAE,YAAY,EAAE,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE;qBAC3D;iBACF;aACF,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YACnE,OAAO,6BAA6B,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;gBAC5E,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;YACH,OAAO,CAAC,CAAC,UAAU,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-orders",
|
|
3
|
-
"version": "2.14.
|
|
3
|
+
"version": "2.14.2",
|
|
4
4
|
"main": "lib/orders-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/orders-index.js",
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@kontsedal/locco": "0.1.0",
|
|
35
|
-
"@unchainedshop/events": "^2.14.
|
|
36
|
-
"@unchainedshop/logger": "^2.14.
|
|
37
|
-
"@unchainedshop/utils": "^2.14.
|
|
35
|
+
"@unchainedshop/events": "^2.14.2",
|
|
36
|
+
"@unchainedshop/logger": "^2.14.2",
|
|
37
|
+
"@unchainedshop/utils": "^2.14.2",
|
|
38
38
|
"simpl-schema": "^3.4.6"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/node": "^20.16.
|
|
42
|
-
"@unchainedshop/types": "^2.14.
|
|
41
|
+
"@types/node": "^20.16.5",
|
|
42
|
+
"@unchainedshop/types": "^2.14.2",
|
|
43
43
|
"jest": "^29.7.0",
|
|
44
44
|
"ts-jest": "^29.2.5",
|
|
45
45
|
"typescript": "^5.5.4"
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { SortDirection, SortOption } from '@unchainedshop/types/api.js';
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
OrderQueries,
|
|
5
|
-
OrderQuery,
|
|
6
|
-
OrderReport,
|
|
7
|
-
OrderStatus,
|
|
8
|
-
} from '@unchainedshop/types/orders.js';
|
|
2
|
+
import { Order, OrderQueries, OrderQuery, OrderReport } from '@unchainedshop/types/orders.js';
|
|
3
|
+
|
|
9
4
|
import { generateDbFilterById, buildSortOptions, mongodb } from '@unchainedshop/mongodb';
|
|
10
5
|
|
|
11
6
|
export const buildFindSelector = ({ includeCarts, status, userId, queryString }: OrderQuery) => {
|
|
@@ -15,8 +10,8 @@ export const buildFindSelector = ({ includeCarts, status, userId, queryString }:
|
|
|
15
10
|
selector.userId = userId;
|
|
16
11
|
}
|
|
17
12
|
|
|
18
|
-
if (status) {
|
|
19
|
-
selector.status = status
|
|
13
|
+
if (Array.isArray(status) && status?.length) {
|
|
14
|
+
selector.status = { $in: status };
|
|
20
15
|
} else if (!includeCarts) {
|
|
21
16
|
selector.status = { $ne: null }; // TODO: Slow performance! IDXSCAN in common query!
|
|
22
17
|
}
|