@unchainedshop/api 4.0.0-rc.13 → 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/mcp/tools/system/schemas.d.ts +36 -6
- package/lib/mcp/tools/system/schemas.d.ts.map +1 -1
- package/lib/mcp/tools/system/schemas.js +4 -6
- package/lib/mcp/tools/system/schemas.js.map +1 -1
- package/lib/mcp/tools/system/types.d.ts +8 -2
- package/lib/mcp/tools/system/types.d.ts.map +1 -1
- package/lib/resolvers/mutations/accounts/verifyWeb3Address.d.ts.map +1 -1
- package/lib/resolvers/mutations/accounts/verifyWeb3Address.js +78 -5
- package/lib/resolvers/mutations/accounts/verifyWeb3Address.js.map +1 -1
- package/lib/resolvers/queries/orders/orderStatistics.d.ts +3 -1
- package/lib/resolvers/queries/orders/orderStatistics.d.ts.map +1 -1
- package/lib/resolvers/queries/orders/orderStatistics.js +3 -2
- package/lib/resolvers/queries/orders/orderStatistics.js.map +1 -1
- package/lib/resolvers/type/index.d.ts +32 -0
- package/lib/resolvers/type/index.d.ts.map +1 -1
- package/lib/resolvers/type/index.js +2 -0
- package/lib/resolvers/type/index.js.map +1 -1
- package/lib/resolvers/type/order/order-statistics-types.d.ts +34 -0
- package/lib/resolvers/type/order/order-statistics-types.d.ts.map +1 -0
- package/lib/resolvers/type/order/order-statistics-types.js +68 -0
- package/lib/resolvers/type/order/order-statistics-types.js.map +1 -0
- package/lib/schema/query.js +2 -2
- package/lib/schema/types/events.d.ts.map +1 -1
- package/lib/schema/types/events.js +7 -1
- package/lib/schema/types/events.js.map +1 -1
- package/lib/schema/types/order/order.d.ts.map +1 -1
- package/lib/schema/types/order/order.js +9 -1
- package/lib/schema/types/order/order.js.map +1 -1
- package/package.json +17 -12
- package/src/mcp/tools/system/schemas.ts +4 -6
- package/src/mcp/tools/system/types.ts +8 -2
- package/src/resolvers/mutations/accounts/verifyWeb3Address.ts +100 -7
- package/src/resolvers/queries/orders/orderStatistics.ts +3 -3
- package/src/resolvers/type/index.ts +2 -0
- package/src/resolvers/type/order/order-statistics-types.ts +99 -0
- package/src/schema/query.ts +2 -2
- package/src/schema/types/events.ts +7 -1
- package/src/schema/types/order/order.ts +9 -1
|
@@ -211,7 +211,16 @@ export declare const actionValidators: {
|
|
|
211
211
|
}>;
|
|
212
212
|
readonly EVENT_LIST: z.ZodObject<{
|
|
213
213
|
types: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
214
|
-
created: z.ZodOptional<z.
|
|
214
|
+
created: z.ZodOptional<z.ZodObject<{
|
|
215
|
+
from: z.ZodOptional<z.ZodString>;
|
|
216
|
+
to: z.ZodOptional<z.ZodString>;
|
|
217
|
+
}, "strip", z.ZodTypeAny, {
|
|
218
|
+
from?: string;
|
|
219
|
+
to?: string;
|
|
220
|
+
}, {
|
|
221
|
+
from?: string;
|
|
222
|
+
to?: string;
|
|
223
|
+
}>>;
|
|
215
224
|
queryString: z.ZodOptional<z.ZodString>;
|
|
216
225
|
includeInactive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
217
226
|
sort: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
@@ -227,7 +236,10 @@ export declare const actionValidators: {
|
|
|
227
236
|
limit: z.ZodOptional<z.ZodNumber>;
|
|
228
237
|
offset: z.ZodOptional<z.ZodNumber>;
|
|
229
238
|
}, "strip", z.ZodTypeAny, {
|
|
230
|
-
created?:
|
|
239
|
+
created?: {
|
|
240
|
+
from?: string;
|
|
241
|
+
to?: string;
|
|
242
|
+
};
|
|
231
243
|
sort?: {
|
|
232
244
|
key?: string;
|
|
233
245
|
value?: string;
|
|
@@ -238,7 +250,10 @@ export declare const actionValidators: {
|
|
|
238
250
|
offset?: number;
|
|
239
251
|
types?: string[];
|
|
240
252
|
}, {
|
|
241
|
-
created?:
|
|
253
|
+
created?: {
|
|
254
|
+
from?: string;
|
|
255
|
+
to?: string;
|
|
256
|
+
};
|
|
242
257
|
sort?: {
|
|
243
258
|
key?: string;
|
|
244
259
|
value?: string;
|
|
@@ -251,16 +266,31 @@ export declare const actionValidators: {
|
|
|
251
266
|
}>;
|
|
252
267
|
readonly EVENT_COUNT: z.ZodObject<{
|
|
253
268
|
types: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
254
|
-
created: z.ZodOptional<z.
|
|
269
|
+
created: z.ZodOptional<z.ZodObject<{
|
|
270
|
+
from: z.ZodOptional<z.ZodString>;
|
|
271
|
+
to: z.ZodOptional<z.ZodString>;
|
|
272
|
+
}, "strip", z.ZodTypeAny, {
|
|
273
|
+
from?: string;
|
|
274
|
+
to?: string;
|
|
275
|
+
}, {
|
|
276
|
+
from?: string;
|
|
277
|
+
to?: string;
|
|
278
|
+
}>>;
|
|
255
279
|
queryString: z.ZodOptional<z.ZodString>;
|
|
256
280
|
includeInactive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
257
281
|
}, "strip", z.ZodTypeAny, {
|
|
258
|
-
created?:
|
|
282
|
+
created?: {
|
|
283
|
+
from?: string;
|
|
284
|
+
to?: string;
|
|
285
|
+
};
|
|
259
286
|
includeInactive?: boolean;
|
|
260
287
|
queryString?: string;
|
|
261
288
|
types?: string[];
|
|
262
289
|
}, {
|
|
263
|
-
created?:
|
|
290
|
+
created?: {
|
|
291
|
+
from?: string;
|
|
292
|
+
to?: string;
|
|
293
|
+
};
|
|
264
294
|
includeInactive?: boolean;
|
|
265
295
|
queryString?: string;
|
|
266
296
|
types?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/system/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,eAAO,MAAM,cAAc,EAA8B,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;AAC/E,eAAO,MAAM,qBAAqB,gDAAe,CAAC;AAElD,eAAO,MAAM,gBAAgB
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/system/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,eAAO,MAAM,cAAc,EAA8B,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;AAC/E,eAAO,MAAM,qBAAqB,gDAAe,CAAC;AAElD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwMnB,CAAC;AAEX,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuHlC,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAmC,CAAC;AAC1E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE/E,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,gBAAgB,CAAC;AACvD,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,UAAU,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjF,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,UAAU,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -136,10 +136,9 @@ export const actionValidators = {
|
|
|
136
136
|
.optional()
|
|
137
137
|
.describe('Filter events by specific event types (e.g., USER_CREATED, ORDER_PLACED)'),
|
|
138
138
|
created: z
|
|
139
|
-
.
|
|
140
|
-
.datetime()
|
|
139
|
+
.object(DateRangeSchema)
|
|
141
140
|
.optional()
|
|
142
|
-
.describe('
|
|
141
|
+
.describe('Date range filter for when events are emitted/created'),
|
|
143
142
|
}),
|
|
144
143
|
EVENT_COUNT: z.object({
|
|
145
144
|
...SearchSchema,
|
|
@@ -148,10 +147,9 @@ export const actionValidators = {
|
|
|
148
147
|
.optional()
|
|
149
148
|
.describe('Filter events by specific event types (e.g., USER_CREATED, ORDER_PLACED)'),
|
|
150
149
|
created: z
|
|
151
|
-
.
|
|
152
|
-
.datetime()
|
|
150
|
+
.object(DateRangeSchema)
|
|
153
151
|
.optional()
|
|
154
|
-
.describe('
|
|
152
|
+
.describe('Date range filter for when events are emitted/created'),
|
|
155
153
|
}),
|
|
156
154
|
EVENT_STATISTICS: z.object({
|
|
157
155
|
types: z
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../src/mcp/tools/system/schemas.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../src/mcp/tools/system/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,11 +27,17 @@ export interface EventListOptions {
|
|
|
27
27
|
queryString?: string;
|
|
28
28
|
types?: string[];
|
|
29
29
|
sort?: SortOption[];
|
|
30
|
-
created?:
|
|
30
|
+
created?: {
|
|
31
|
+
start?: Date;
|
|
32
|
+
end?: Date;
|
|
33
|
+
};
|
|
31
34
|
}
|
|
32
35
|
export interface EventCountOptions {
|
|
33
36
|
queryString?: string;
|
|
34
|
-
created?:
|
|
37
|
+
created?: {
|
|
38
|
+
start?: Date;
|
|
39
|
+
end?: Date;
|
|
40
|
+
};
|
|
35
41
|
types?: string[];
|
|
36
42
|
}
|
|
37
43
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/system/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;CACH;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/system/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;CACH;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,IAAI,CAAC;QACb,GAAG,CAAC,EAAE,IAAI,CAAC;KACZ,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"verifyWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAyF9C,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,MAAM,EAAE,CAAA;CAAE,EAC3D,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDA8DnC"}
|
|
@@ -1,22 +1,95 @@
|
|
|
1
1
|
import { log } from '@unchainedshop/logger';
|
|
2
2
|
import { UserWeb3AddressNotFoundError, UserWeb3AddressSignatureError } from '../../../errors.js';
|
|
3
|
+
// Dynamic imports for optional peer dependencies
|
|
4
|
+
let secp256k1;
|
|
5
|
+
let keccak_256;
|
|
6
|
+
let bytesToHex;
|
|
7
|
+
let hexToBytes;
|
|
8
|
+
async function loadNoblePackages() {
|
|
9
|
+
try {
|
|
10
|
+
// eslint-disable-next-line
|
|
11
|
+
// @ts-ignore
|
|
12
|
+
const curves = await import('@noble/curves/secp256k1.js');
|
|
13
|
+
// eslint-disable-next-line
|
|
14
|
+
// @ts-ignore
|
|
15
|
+
const hashes = await import('@noble/hashes/sha3.js');
|
|
16
|
+
// eslint-disable-next-line
|
|
17
|
+
// @ts-ignore
|
|
18
|
+
const utils = await import('@noble/hashes/utils.js');
|
|
19
|
+
if (!curves || !hashes || !utils) {
|
|
20
|
+
throw new Error('Missing required @noble packages for Web3 signature verification');
|
|
21
|
+
}
|
|
22
|
+
secp256k1 = curves.secp256k1;
|
|
23
|
+
keccak_256 = hashes.keccak_256;
|
|
24
|
+
bytesToHex = utils.bytesToHex;
|
|
25
|
+
hexToBytes = utils.hexToBytes;
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
log('Failed to load @noble packages for Web3 verification', { error: error.message });
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
// Inline utility functions to replace @ethereumjs/util
|
|
34
|
+
function fromRPCSig(sig) {
|
|
35
|
+
const bytes = hexToBytes(sig.startsWith('0x') ? sig.slice(2) : sig);
|
|
36
|
+
if (bytes.length !== 65)
|
|
37
|
+
throw new Error('Invalid signature length');
|
|
38
|
+
const r = bytes.slice(0, 32);
|
|
39
|
+
const s = bytes.slice(32, 64);
|
|
40
|
+
let v = BigInt(bytes[64]);
|
|
41
|
+
// Handle EIP-155 encoding
|
|
42
|
+
if (v >= 35n) {
|
|
43
|
+
v = v - 35n - 2n * 1n; // chainId = 1 for mainnet, adjust if needed
|
|
44
|
+
}
|
|
45
|
+
else if (v >= 27n) {
|
|
46
|
+
v = v - 27n;
|
|
47
|
+
}
|
|
48
|
+
return { v, r, s };
|
|
49
|
+
}
|
|
50
|
+
function hashPersonalMessage(message) {
|
|
51
|
+
const prefix = new TextEncoder().encode('\x19Ethereum Signed Message:\n');
|
|
52
|
+
const lengthBytes = new TextEncoder().encode(message.length.toString());
|
|
53
|
+
const combined = new Uint8Array(prefix.length + lengthBytes.length + message.length);
|
|
54
|
+
combined.set(prefix, 0);
|
|
55
|
+
combined.set(lengthBytes, prefix.length);
|
|
56
|
+
combined.set(message, prefix.length + lengthBytes.length);
|
|
57
|
+
return keccak_256(combined);
|
|
58
|
+
}
|
|
59
|
+
function ecrecover(msgHash, v, r, s) {
|
|
60
|
+
const recovery = Number(v);
|
|
61
|
+
const signature = new Uint8Array(64);
|
|
62
|
+
signature.set(r, 0);
|
|
63
|
+
signature.set(s, 32);
|
|
64
|
+
const publicKey = secp256k1.Signature.fromBytes(signature)
|
|
65
|
+
.addRecoveryBit(recovery)
|
|
66
|
+
.recoverPublicKey(msgHash);
|
|
67
|
+
return publicKey.toBytes(false).slice(1); // Remove the 0x04 prefix for uncompressed key
|
|
68
|
+
}
|
|
69
|
+
function publicToAddress(publicKey) {
|
|
70
|
+
const hash = keccak_256(publicKey);
|
|
71
|
+
return hash.slice(-20); // Take last 20 bytes
|
|
72
|
+
}
|
|
3
73
|
export default async function verifyWeb3Address(root, { address, hash }, { modules, userId, user }) {
|
|
4
74
|
log(`mutation verifyWeb3Address ${address} ${user.username}`, {
|
|
5
75
|
userId,
|
|
6
76
|
});
|
|
77
|
+
// Load noble packages dynamically
|
|
78
|
+
const packagesLoaded = await loadNoblePackages();
|
|
79
|
+
if (!packagesLoaded) {
|
|
80
|
+
throw new Error('Web3 signature verification is not available. Please install the required @noble packages: @noble/curves, @noble/hashes');
|
|
81
|
+
}
|
|
7
82
|
const foundCredentials = user.services?.web3?.find((service) => service.address.toLowerCase() === address.toLowerCase());
|
|
8
83
|
if (!foundCredentials) {
|
|
9
84
|
throw new UserWeb3AddressNotFoundError({ userId, address });
|
|
10
85
|
}
|
|
11
86
|
// eslint-disable-next-line
|
|
12
87
|
// @ts-ignore
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const messageHash = hashPersonalMessage(toBuffer(message));
|
|
16
|
-
const sigParams = fromRpcSig(hash);
|
|
88
|
+
const messageHash = hashPersonalMessage(hexToBytes(`0x${Buffer.from(foundCredentials.nonce, 'utf8').toString('hex')}`));
|
|
89
|
+
const sigParams = fromRPCSig(hash);
|
|
17
90
|
const publicKey = ecrecover(messageHash, sigParams.v, sigParams.r, sigParams.s);
|
|
18
91
|
const sender = publicToAddress(publicKey);
|
|
19
|
-
const recoveredAddr =
|
|
92
|
+
const recoveredAddr = `0x${bytesToHex(sender)}`;
|
|
20
93
|
const isSignatureCorrectForAddress = recoveredAddr.toLowerCase() === foundCredentials.address.toLowerCase();
|
|
21
94
|
if (!isSignatureCorrectForAddress) {
|
|
22
95
|
throw new UserWeb3AddressSignatureError({ userId, address: foundCredentials.address });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"verifyWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,7 @@ import { Context } from '../../../context.js';
|
|
|
2
2
|
import { DateFilterInput } from '@unchainedshop/utils';
|
|
3
3
|
export default function orderStatistics(root: never, params: {
|
|
4
4
|
dateRange?: DateFilterInput;
|
|
5
|
-
}, {
|
|
5
|
+
}, { userId }: Context): Promise<{
|
|
6
|
+
dateRange: DateFilterInput;
|
|
7
|
+
}>;
|
|
6
8
|
//# sourceMappingURL=orderStatistics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orderStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,wBAA8B,eAAe,CAC3C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAA;CAAE,EACvC,EAAE,
|
|
1
|
+
{"version":3,"file":"orderStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,wBAA8B,eAAe,CAC3C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAA;CAAE,EACvC,EAAE,MAAM,EAAE,EAAE,OAAO;;GAQpB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { log } from '@unchainedshop/logger';
|
|
2
|
-
export default async function orderStatistics(root, params, {
|
|
2
|
+
export default async function orderStatistics(root, params, { userId }) {
|
|
3
|
+
const { dateRange } = params || {};
|
|
3
4
|
log(`query orderStatistics `, {
|
|
4
5
|
userId,
|
|
5
6
|
...(params?.dateRange || {}),
|
|
6
7
|
});
|
|
7
|
-
return
|
|
8
|
+
return { dateRange };
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=orderStatistics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orderStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAW,EACX,MAAuC,EACvC,EAAE,
|
|
1
|
+
{"version":3,"file":"orderStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAW,EACX,MAAuC,EACvC,EAAE,MAAM,EAAW;IAEnB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IACnC,GAAG,CAAC,wBAAwB,EAAE;QAC5B,MAAM;QACN,GAAG,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC;KAC7B,CAAC,CAAC;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;AACvB,CAAC"}
|
|
@@ -817,6 +817,38 @@ declare const types: {
|
|
|
817
817
|
user: any;
|
|
818
818
|
}): any;
|
|
819
819
|
};
|
|
820
|
+
OrderStatistics: {
|
|
821
|
+
newCount: ({ dateRange }: {
|
|
822
|
+
dateRange: any;
|
|
823
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
824
|
+
checkoutCount: ({ dateRange }: {
|
|
825
|
+
dateRange: any;
|
|
826
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
827
|
+
rejectCount: ({ dateRange }: {
|
|
828
|
+
dateRange: any;
|
|
829
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
830
|
+
confirmCount: ({ dateRange }: {
|
|
831
|
+
dateRange: any;
|
|
832
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
833
|
+
fulfillCount: ({ dateRange }: {
|
|
834
|
+
dateRange: any;
|
|
835
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
836
|
+
newRecords: ({ dateRange }: {
|
|
837
|
+
dateRange: any;
|
|
838
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
839
|
+
checkoutRecords: ({ dateRange }: {
|
|
840
|
+
dateRange: any;
|
|
841
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
842
|
+
rejectRecords: ({ dateRange }: {
|
|
843
|
+
dateRange: any;
|
|
844
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
845
|
+
confirmRecords: ({ dateRange }: {
|
|
846
|
+
dateRange: any;
|
|
847
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
848
|
+
fulfilledRecords: ({ dateRange }: {
|
|
849
|
+
dateRange: any;
|
|
850
|
+
}, _p: any, { modules }: import("../../context.js").Context) => Promise<any>;
|
|
851
|
+
};
|
|
820
852
|
};
|
|
821
853
|
export default types;
|
|
822
854
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,6 +67,7 @@ import { Token } from './token-types.js';
|
|
|
67
67
|
import { Web3Address } from './web3-address.js';
|
|
68
68
|
import { LoginMethodResponse } from './login-method-response-types.js';
|
|
69
69
|
import { ProductSearchResult } from './product-search-result-types.js';
|
|
70
|
+
import { OrderStatistics } from './order/order-statistics-types.js';
|
|
70
71
|
const types = {
|
|
71
72
|
Assortment,
|
|
72
73
|
AssortmentFilter,
|
|
@@ -137,6 +138,7 @@ const types = {
|
|
|
137
138
|
Media,
|
|
138
139
|
Web3Address,
|
|
139
140
|
LoginMethodResponse,
|
|
141
|
+
OrderStatistics,
|
|
140
142
|
};
|
|
141
143
|
export default types;
|
|
142
144
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,kDAAkD,CAAC;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2DAA2D,CAAC;AACxG,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEpE,MAAM,KAAK,GAAG;IACZ,UAAU;IACV,gBAAgB;IAChB,cAAc;IACd,eAAe;IACf,kBAAkB;IAClB,iBAAiB;IACjB,QAAQ;IACR,aAAa;IACb,KAAK;IACL,mBAAmB;IACnB,OAAO;IACP,QAAQ;IACR,gBAAgB;IAChB,UAAU;IACV,UAAU;IACV,kBAAkB;IAClB,iBAAiB;IACjB,gBAAgB;IAChB,cAAc;IACd,MAAM;IACN,YAAY;IACZ,QAAQ;IACR,YAAY;IACZ,kBAAkB;IAClB,KAAK;IACL,aAAa;IACb,qBAAqB;IACrB,mBAAmB;IACnB,qBAAqB;IACrB,aAAa;IACb,iBAAiB;IACjB,mBAAmB;IACnB,SAAS;IACT,iBAAiB;IACjB,YAAY;IACZ,gBAAgB;IAChB,oBAAoB;IACpB,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,eAAe;IACf,WAAW;IACX,KAAK;IACL,OAAO;IACP,qBAAqB;IACrB,iBAAiB;IACjB,mBAAmB;IACnB,eAAe;IACf,YAAY;IACZ,aAAa;IACb,gBAAgB;IAChB,0BAA0B;IAC1B,gCAAgC;IAChC,sBAAsB;IACtB,mBAAmB;IACnB,2BAA2B;IAC3B,SAAS;IACT,IAAI;IACJ,aAAa;IACb,gBAAgB;IAChB,KAAK;IACL,IAAI;IACJ,mBAAmB;IACnB,mBAAmB;IACnB,IAAI;IACJ,KAAK;IACL,KAAK;IACL,WAAW;IACX,mBAAmB;IACnB,eAAe;CAChB,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Context } from '../../../context.js';
|
|
2
|
+
export declare const OrderStatistics: {
|
|
3
|
+
newCount: ({ dateRange }: {
|
|
4
|
+
dateRange: any;
|
|
5
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
6
|
+
checkoutCount: ({ dateRange }: {
|
|
7
|
+
dateRange: any;
|
|
8
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
9
|
+
rejectCount: ({ dateRange }: {
|
|
10
|
+
dateRange: any;
|
|
11
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
12
|
+
confirmCount: ({ dateRange }: {
|
|
13
|
+
dateRange: any;
|
|
14
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
15
|
+
fulfillCount: ({ dateRange }: {
|
|
16
|
+
dateRange: any;
|
|
17
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
18
|
+
newRecords: ({ dateRange }: {
|
|
19
|
+
dateRange: any;
|
|
20
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
21
|
+
checkoutRecords: ({ dateRange }: {
|
|
22
|
+
dateRange: any;
|
|
23
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
24
|
+
rejectRecords: ({ dateRange }: {
|
|
25
|
+
dateRange: any;
|
|
26
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
27
|
+
confirmRecords: ({ dateRange }: {
|
|
28
|
+
dateRange: any;
|
|
29
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
30
|
+
fulfilledRecords: ({ dateRange }: {
|
|
31
|
+
dateRange: any;
|
|
32
|
+
}, _p: any, { modules }: Context) => Promise<any>;
|
|
33
|
+
};
|
|
34
|
+
//# sourceMappingURL=order-statistics-types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-statistics-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-statistics-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAoE9C,eAAO,MAAM,eAAe;;;6BACuB,OAAO;;;6BAGF,OAAO;;;6BAGT,OAAO;;;6BAGN,OAAO;;;6BAGP,OAAO;;;6BAGT,OAAO;;;6BAGF,OAAO;;;6BAGT,OAAO;;;6BAGN,OAAO;;;6BAGL,OAAO;CAEjE,CAAC"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
function buildDateMatch(dateField, dateRange) {
|
|
2
|
+
if (!dateRange?.start && !dateRange?.end)
|
|
3
|
+
return { [dateField]: { $exists: true } };
|
|
4
|
+
const rangeMatch = {};
|
|
5
|
+
if (dateRange?.start)
|
|
6
|
+
rangeMatch.$gte = new Date(dateRange.start);
|
|
7
|
+
if (dateRange?.end)
|
|
8
|
+
rangeMatch.$lte = new Date(dateRange.end);
|
|
9
|
+
return { [dateField]: rangeMatch };
|
|
10
|
+
}
|
|
11
|
+
async function aggregateOrders(modules, dateField, dateRange, options) {
|
|
12
|
+
const match = buildDateMatch(dateField, dateRange);
|
|
13
|
+
const pipeline = [{ $match: match }];
|
|
14
|
+
if (options?.includeCarts) {
|
|
15
|
+
match.status = null;
|
|
16
|
+
match.orderNumber = null;
|
|
17
|
+
}
|
|
18
|
+
if (options?.includeAmount) {
|
|
19
|
+
pipeline.push({
|
|
20
|
+
$addFields: {
|
|
21
|
+
orderTotal: {
|
|
22
|
+
$reduce: {
|
|
23
|
+
input: { $ifNull: ['$calculation', []] },
|
|
24
|
+
initialValue: 0,
|
|
25
|
+
in: { $add: ['$$value', { $ifNull: ['$$this.amount', 0] }] },
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
pipeline.push({
|
|
31
|
+
$group: {
|
|
32
|
+
_id: {
|
|
33
|
+
date: { $dateToString: { format: '%Y-%m-%d', date: `$${dateField}` } },
|
|
34
|
+
currency: '$currencyCode',
|
|
35
|
+
},
|
|
36
|
+
totalAmount: { $sum: '$orderTotal' },
|
|
37
|
+
count: { $sum: 1 },
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
pipeline.push({
|
|
41
|
+
$project: {
|
|
42
|
+
_id: 0,
|
|
43
|
+
date: '$_id.date',
|
|
44
|
+
total: { amount: '$totalAmount', currencyCode: '$_id.currency' },
|
|
45
|
+
count: 1,
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
pipeline.push({ $sort: { date: 1 } });
|
|
49
|
+
return modules.orders.aggregateOrders({ pipeline });
|
|
50
|
+
}
|
|
51
|
+
// Just count total orders
|
|
52
|
+
pipeline.push({ $count: 'count' });
|
|
53
|
+
const result = await modules.orders.aggregateOrders({ pipeline });
|
|
54
|
+
return result[0]?.count ?? 0;
|
|
55
|
+
}
|
|
56
|
+
export const OrderStatistics = {
|
|
57
|
+
newCount: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'created', dateRange, { includeCarts: true }),
|
|
58
|
+
checkoutCount: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'ordered', dateRange),
|
|
59
|
+
rejectCount: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'rejected', dateRange),
|
|
60
|
+
confirmCount: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'confirmed', dateRange),
|
|
61
|
+
fulfillCount: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'fullfilled', dateRange),
|
|
62
|
+
newRecords: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'created', dateRange, { includeAmount: true, includeCarts: true }),
|
|
63
|
+
checkoutRecords: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'ordered', dateRange, { includeAmount: true }),
|
|
64
|
+
rejectRecords: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'rejected', dateRange, { includeAmount: true }),
|
|
65
|
+
confirmRecords: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'confirmed', dateRange, { includeAmount: true }),
|
|
66
|
+
fulfilledRecords: async ({ dateRange }, _p, { modules }) => aggregateOrders(modules, 'fullfilled', dateRange, { includeAmount: true }),
|
|
67
|
+
};
|
|
68
|
+
//# sourceMappingURL=order-statistics-types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"order-statistics-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-statistics-types.ts"],"names":[],"mappings":"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"}
|
package/lib/schema/query.js
CHANGED
|
@@ -480,14 +480,14 @@ export default [
|
|
|
480
480
|
limit: Int = 10
|
|
481
481
|
offset: Int = 0
|
|
482
482
|
queryString: String
|
|
483
|
-
created:
|
|
483
|
+
created: DateFilterInput
|
|
484
484
|
sort: [SortOptionInput!]
|
|
485
485
|
): [Event!]!
|
|
486
486
|
|
|
487
487
|
"""
|
|
488
488
|
Get total count of all emitted events
|
|
489
489
|
"""
|
|
490
|
-
eventsCount(types: [String!], queryString: String, created:
|
|
490
|
+
eventsCount(types: [String!], queryString: String, created: DateFilterInput): Int!
|
|
491
491
|
|
|
492
492
|
"""
|
|
493
493
|
Determines if a token is valid/active for reset password
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/schema/types/events.ts"],"names":[],"mappings":";AAAA,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/schema/types/events.ts"],"names":[],"mappings":";AAAA,wBAwBE"}
|
|
@@ -11,9 +11,15 @@ export default [
|
|
|
11
11
|
created: Timestamp!
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
+
type EventStatisticReport {
|
|
15
|
+
date: Date!
|
|
16
|
+
count: Int!
|
|
17
|
+
}
|
|
18
|
+
|
|
14
19
|
type EventStatistics {
|
|
15
|
-
|
|
20
|
+
detail: [EventStatisticReport!]!
|
|
16
21
|
emitCount: Int!
|
|
22
|
+
type: String
|
|
17
23
|
}
|
|
18
24
|
`,
|
|
19
25
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/schema/types/events.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/schema/types/events.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;GAsBb;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/order/order.ts"],"names":[],"mappings":";AAAA,
|
|
1
|
+
{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/order/order.ts"],"names":[],"mappings":";AAAA,wBAoGE"}
|
|
@@ -81,13 +81,21 @@ export default [
|
|
|
81
81
|
updated: DateTime
|
|
82
82
|
user: User
|
|
83
83
|
}
|
|
84
|
-
|
|
84
|
+
type OrderStatisticsRecord {
|
|
85
|
+
date: String!
|
|
86
|
+
total: Price!
|
|
87
|
+
}
|
|
85
88
|
type OrderStatistics {
|
|
86
89
|
newCount: Int!
|
|
87
90
|
checkoutCount: Int!
|
|
88
91
|
rejectCount: Int!
|
|
89
92
|
confirmCount: Int!
|
|
90
93
|
fulfillCount: Int!
|
|
94
|
+
confirmRecords: [OrderStatisticsRecord!]!
|
|
95
|
+
checkoutRecords: [OrderStatisticsRecord!]!
|
|
96
|
+
rejectRecords: [OrderStatisticsRecord!]!
|
|
97
|
+
newRecords: [OrderStatisticsRecord!]!
|
|
98
|
+
fulfilledRecords: [OrderStatisticsRecord!]!
|
|
91
99
|
}
|
|
92
100
|
`,
|
|
93
101
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../../../src/schema/types/order/order.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../../../src/schema/types/order/order.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkGb;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/api",
|
|
3
|
-
"version": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.14",
|
|
4
4
|
"main": "lib/api-index.js",
|
|
5
5
|
"types": "lib/api-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -31,7 +31,6 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"@ethereumjs/util": ">= 10 < 11",
|
|
35
34
|
"fastify": ">= 5.2 < 6",
|
|
36
35
|
"@fastify/cookie": ">= 11 < 12",
|
|
37
36
|
"@fastify/session": ">= 11 < 12",
|
|
@@ -42,7 +41,9 @@
|
|
|
42
41
|
"express-session": ">= 1.18 < 2",
|
|
43
42
|
"multer": ">= 2 < 3",
|
|
44
43
|
"graphql-yoga": ">= 5.9 < 6",
|
|
45
|
-
"passport": ">= 0.7 < 1"
|
|
44
|
+
"passport": ">= 0.7 < 1",
|
|
45
|
+
"@noble/curves": "^2.0.0",
|
|
46
|
+
"@noble/hashes": "^2.0.0"
|
|
46
47
|
},
|
|
47
48
|
"peerDependenciesMeta": {
|
|
48
49
|
"@modelcontextprotocol/sdk": {
|
|
@@ -54,9 +55,6 @@
|
|
|
54
55
|
"connect-mongo": {
|
|
55
56
|
"optional": false
|
|
56
57
|
},
|
|
57
|
-
"@ethereumjs/util": {
|
|
58
|
-
"optional": true
|
|
59
|
-
},
|
|
60
58
|
"fastify": {
|
|
61
59
|
"optional": true
|
|
62
60
|
},
|
|
@@ -80,14 +78,20 @@
|
|
|
80
78
|
},
|
|
81
79
|
"passport": {
|
|
82
80
|
"optional": true
|
|
81
|
+
},
|
|
82
|
+
"@noble/curves": {
|
|
83
|
+
"optional": true
|
|
84
|
+
},
|
|
85
|
+
"@noble/hashes": {
|
|
86
|
+
"optional": true
|
|
83
87
|
}
|
|
84
88
|
},
|
|
85
89
|
"dependencies": {
|
|
86
|
-
"@unchainedshop/core": "^4.0.0-rc.
|
|
87
|
-
"@unchainedshop/events": "^4.0.0-rc.
|
|
88
|
-
"@unchainedshop/logger": "^4.0.0-rc.
|
|
89
|
-
"@unchainedshop/roles": "^4.0.0-rc.
|
|
90
|
-
"@unchainedshop/utils": "^4.0.0-rc.
|
|
90
|
+
"@unchainedshop/core": "^4.0.0-rc.14",
|
|
91
|
+
"@unchainedshop/events": "^4.0.0-rc.14",
|
|
92
|
+
"@unchainedshop/logger": "^4.0.0-rc.14",
|
|
93
|
+
"@unchainedshop/roles": "^4.0.0-rc.14",
|
|
94
|
+
"@unchainedshop/utils": "^4.0.0-rc.14",
|
|
91
95
|
"accounting": "0.4.1",
|
|
92
96
|
"dataloader": "^2.2.3",
|
|
93
97
|
"expiry-map": "^2.0.0",
|
|
@@ -97,7 +101,8 @@
|
|
|
97
101
|
"zod": "^3.25.76"
|
|
98
102
|
},
|
|
99
103
|
"devDependencies": {
|
|
100
|
-
"@
|
|
104
|
+
"@noble/curves": "^2.0.0",
|
|
105
|
+
"@noble/hashes": "^2.0.0",
|
|
101
106
|
"@fastify/cookie": "^11.0.2",
|
|
102
107
|
"@fastify/multipart": "^9.0.3",
|
|
103
108
|
"@fastify/session": "^11.1.0",
|
|
@@ -183,10 +183,9 @@ export const actionValidators = {
|
|
|
183
183
|
.optional()
|
|
184
184
|
.describe('Filter events by specific event types (e.g., USER_CREATED, ORDER_PLACED)'),
|
|
185
185
|
created: z
|
|
186
|
-
.
|
|
187
|
-
.datetime()
|
|
186
|
+
.object(DateRangeSchema)
|
|
188
187
|
.optional()
|
|
189
|
-
.describe('
|
|
188
|
+
.describe('Date range filter for when events are emitted/created'),
|
|
190
189
|
}),
|
|
191
190
|
|
|
192
191
|
EVENT_COUNT: z.object({
|
|
@@ -196,10 +195,9 @@ export const actionValidators = {
|
|
|
196
195
|
.optional()
|
|
197
196
|
.describe('Filter events by specific event types (e.g., USER_CREATED, ORDER_PLACED)'),
|
|
198
197
|
created: z
|
|
199
|
-
.
|
|
200
|
-
.datetime()
|
|
198
|
+
.object(DateRangeSchema)
|
|
201
199
|
.optional()
|
|
202
|
-
.describe('
|
|
200
|
+
.describe('Date range filter for when events are emitted/created'),
|
|
203
201
|
}),
|
|
204
202
|
|
|
205
203
|
EVENT_STATISTICS: z.object({
|
|
@@ -30,11 +30,17 @@ export interface EventListOptions {
|
|
|
30
30
|
queryString?: string;
|
|
31
31
|
types?: string[];
|
|
32
32
|
sort?: SortOption[];
|
|
33
|
-
created?:
|
|
33
|
+
created?: {
|
|
34
|
+
start?: Date;
|
|
35
|
+
end?: Date;
|
|
36
|
+
};
|
|
34
37
|
}
|
|
35
38
|
|
|
36
39
|
export interface EventCountOptions {
|
|
37
40
|
queryString?: string;
|
|
38
|
-
created?:
|
|
41
|
+
created?: {
|
|
42
|
+
start?: Date;
|
|
43
|
+
end?: Date;
|
|
44
|
+
};
|
|
39
45
|
types?: string[];
|
|
40
46
|
}
|
|
@@ -2,6 +2,93 @@ import { log } from '@unchainedshop/logger';
|
|
|
2
2
|
import { UserWeb3AddressNotFoundError, UserWeb3AddressSignatureError } from '../../../errors.js';
|
|
3
3
|
import { Context } from '../../../context.js';
|
|
4
4
|
|
|
5
|
+
import type { keccak_256 as Keccak256Type } from '@noble/hashes/sha3.js';
|
|
6
|
+
import type { bytesToHex as BytesToHex, hexToBytes as HexToBytes } from '@noble/hashes/utils.js';
|
|
7
|
+
import type { secp256k1 as Secp256k1Type } from '@noble/curves/secp256k1.js';
|
|
8
|
+
|
|
9
|
+
// Dynamic imports for optional peer dependencies
|
|
10
|
+
let secp256k1: typeof Secp256k1Type;
|
|
11
|
+
let keccak_256: typeof Keccak256Type;
|
|
12
|
+
let bytesToHex: typeof BytesToHex;
|
|
13
|
+
let hexToBytes: typeof HexToBytes;
|
|
14
|
+
|
|
15
|
+
async function loadNoblePackages() {
|
|
16
|
+
try {
|
|
17
|
+
// eslint-disable-next-line
|
|
18
|
+
// @ts-ignore
|
|
19
|
+
const curves = await import('@noble/curves/secp256k1.js');
|
|
20
|
+
|
|
21
|
+
// eslint-disable-next-line
|
|
22
|
+
// @ts-ignore
|
|
23
|
+
const hashes = await import('@noble/hashes/sha3.js');
|
|
24
|
+
|
|
25
|
+
// eslint-disable-next-line
|
|
26
|
+
// @ts-ignore
|
|
27
|
+
const utils = await import('@noble/hashes/utils.js');
|
|
28
|
+
|
|
29
|
+
if (!curves || !hashes || !utils) {
|
|
30
|
+
throw new Error('Missing required @noble packages for Web3 signature verification');
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
secp256k1 = curves.secp256k1;
|
|
34
|
+
keccak_256 = hashes.keccak_256;
|
|
35
|
+
bytesToHex = utils.bytesToHex;
|
|
36
|
+
hexToBytes = utils.hexToBytes;
|
|
37
|
+
|
|
38
|
+
return true;
|
|
39
|
+
} catch (error) {
|
|
40
|
+
log('Failed to load @noble packages for Web3 verification', { error: error.message });
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// Inline utility functions to replace @ethereumjs/util
|
|
46
|
+
function fromRPCSig(sig: string): { v: bigint; r: Uint8Array; s: Uint8Array } {
|
|
47
|
+
const bytes = hexToBytes(sig.startsWith('0x') ? sig.slice(2) : sig);
|
|
48
|
+
if (bytes.length !== 65) throw new Error('Invalid signature length');
|
|
49
|
+
|
|
50
|
+
const r = bytes.slice(0, 32);
|
|
51
|
+
const s = bytes.slice(32, 64);
|
|
52
|
+
let v = BigInt(bytes[64]);
|
|
53
|
+
|
|
54
|
+
// Handle EIP-155 encoding
|
|
55
|
+
if (v >= 35n) {
|
|
56
|
+
v = v - 35n - 2n * 1n; // chainId = 1 for mainnet, adjust if needed
|
|
57
|
+
} else if (v >= 27n) {
|
|
58
|
+
v = v - 27n;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return { v, r, s };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function hashPersonalMessage(message: Uint8Array): Uint8Array {
|
|
65
|
+
const prefix = new TextEncoder().encode('\x19Ethereum Signed Message:\n');
|
|
66
|
+
const lengthBytes = new TextEncoder().encode(message.length.toString());
|
|
67
|
+
const combined = new Uint8Array(prefix.length + lengthBytes.length + message.length);
|
|
68
|
+
combined.set(prefix, 0);
|
|
69
|
+
combined.set(lengthBytes, prefix.length);
|
|
70
|
+
combined.set(message, prefix.length + lengthBytes.length);
|
|
71
|
+
return keccak_256(combined);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function ecrecover(msgHash: Uint8Array, v: bigint, r: Uint8Array, s: Uint8Array): Uint8Array {
|
|
75
|
+
const recovery = Number(v);
|
|
76
|
+
const signature = new Uint8Array(64);
|
|
77
|
+
signature.set(r, 0);
|
|
78
|
+
signature.set(s, 32);
|
|
79
|
+
|
|
80
|
+
const publicKey = secp256k1.Signature.fromBytes(signature)
|
|
81
|
+
.addRecoveryBit(recovery)
|
|
82
|
+
.recoverPublicKey(msgHash);
|
|
83
|
+
|
|
84
|
+
return publicKey.toBytes(false).slice(1); // Remove the 0x04 prefix for uncompressed key
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function publicToAddress(publicKey: Uint8Array): Uint8Array {
|
|
88
|
+
const hash = keccak_256(publicKey);
|
|
89
|
+
return hash.slice(-20); // Take last 20 bytes
|
|
90
|
+
}
|
|
91
|
+
|
|
5
92
|
export default async function verifyWeb3Address(
|
|
6
93
|
root: never,
|
|
7
94
|
{ address, hash }: { address: string; hash: `0x${string}` },
|
|
@@ -11,6 +98,14 @@ export default async function verifyWeb3Address(
|
|
|
11
98
|
userId,
|
|
12
99
|
});
|
|
13
100
|
|
|
101
|
+
// Load noble packages dynamically
|
|
102
|
+
const packagesLoaded = await loadNoblePackages();
|
|
103
|
+
if (!packagesLoaded) {
|
|
104
|
+
throw new Error(
|
|
105
|
+
'Web3 signature verification is not available. Please install the required @noble packages: @noble/curves, @noble/hashes',
|
|
106
|
+
);
|
|
107
|
+
}
|
|
108
|
+
|
|
14
109
|
const foundCredentials = user.services?.web3?.find(
|
|
15
110
|
(service) => service.address.toLowerCase() === address.toLowerCase(),
|
|
16
111
|
);
|
|
@@ -20,17 +115,15 @@ export default async function verifyWeb3Address(
|
|
|
20
115
|
|
|
21
116
|
// eslint-disable-next-line
|
|
22
117
|
// @ts-ignore
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const message = `0x${Buffer.from(foundCredentials.nonce, 'utf8').toString('hex')}`;
|
|
27
|
-
const messageHash = hashPersonalMessage(toBuffer(message));
|
|
118
|
+
const messageHash = hashPersonalMessage(
|
|
119
|
+
hexToBytes(`0x${Buffer.from(foundCredentials.nonce, 'utf8').toString('hex')}`),
|
|
120
|
+
);
|
|
28
121
|
|
|
29
|
-
const sigParams =
|
|
122
|
+
const sigParams = fromRPCSig(hash);
|
|
30
123
|
const publicKey = ecrecover(messageHash, sigParams.v, sigParams.r, sigParams.s);
|
|
31
124
|
|
|
32
125
|
const sender = publicToAddress(publicKey);
|
|
33
|
-
const recoveredAddr =
|
|
126
|
+
const recoveredAddr = `0x${bytesToHex(sender)}`;
|
|
34
127
|
|
|
35
128
|
const isSignatureCorrectForAddress =
|
|
36
129
|
recoveredAddr.toLowerCase() === foundCredentials.address.toLowerCase();
|
|
@@ -5,12 +5,12 @@ import { DateFilterInput } from '@unchainedshop/utils';
|
|
|
5
5
|
export default async function orderStatistics(
|
|
6
6
|
root: never,
|
|
7
7
|
params: { dateRange?: DateFilterInput },
|
|
8
|
-
{
|
|
8
|
+
{ userId }: Context,
|
|
9
9
|
) {
|
|
10
|
+
const { dateRange } = params || {};
|
|
10
11
|
log(`query orderStatistics `, {
|
|
11
12
|
userId,
|
|
12
13
|
...(params?.dateRange || {}),
|
|
13
14
|
});
|
|
14
|
-
|
|
15
|
-
return modules.orders.getReport(params);
|
|
15
|
+
return { dateRange };
|
|
16
16
|
}
|
|
@@ -67,6 +67,7 @@ import { Token } from './token-types.js';
|
|
|
67
67
|
import { Web3Address } from './web3-address.js';
|
|
68
68
|
import { LoginMethodResponse } from './login-method-response-types.js';
|
|
69
69
|
import { ProductSearchResult } from './product-search-result-types.js';
|
|
70
|
+
import { OrderStatistics } from './order/order-statistics-types.js';
|
|
70
71
|
|
|
71
72
|
const types = {
|
|
72
73
|
Assortment,
|
|
@@ -138,6 +139,7 @@ const types = {
|
|
|
138
139
|
Media,
|
|
139
140
|
Web3Address,
|
|
140
141
|
LoginMethodResponse,
|
|
142
|
+
OrderStatistics,
|
|
141
143
|
};
|
|
142
144
|
|
|
143
145
|
export default types;
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { Context } from '../../../context.js';
|
|
2
|
+
|
|
3
|
+
function buildDateMatch(dateField: string, dateRange?: { start?: string; end?: string }) {
|
|
4
|
+
if (!dateRange?.start && !dateRange?.end) return { [dateField]: { $exists: true } };
|
|
5
|
+
|
|
6
|
+
const rangeMatch: Record<string, any> = {};
|
|
7
|
+
if (dateRange?.start) rangeMatch.$gte = new Date(dateRange.start);
|
|
8
|
+
if (dateRange?.end) rangeMatch.$lte = new Date(dateRange.end);
|
|
9
|
+
|
|
10
|
+
return { [dateField]: rangeMatch };
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
async function aggregateOrders(
|
|
14
|
+
modules: Context['modules'],
|
|
15
|
+
dateField: string,
|
|
16
|
+
dateRange?: { start?: string; end?: string },
|
|
17
|
+
options?: { includeAmount?: boolean; includeCarts?: boolean },
|
|
18
|
+
) {
|
|
19
|
+
const match = buildDateMatch(dateField, dateRange);
|
|
20
|
+
|
|
21
|
+
const pipeline: any[] = [{ $match: match }];
|
|
22
|
+
|
|
23
|
+
if (options?.includeCarts) {
|
|
24
|
+
match.status = null;
|
|
25
|
+
match.orderNumber = null;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
if (options?.includeAmount) {
|
|
29
|
+
pipeline.push({
|
|
30
|
+
$addFields: {
|
|
31
|
+
orderTotal: {
|
|
32
|
+
$reduce: {
|
|
33
|
+
input: { $ifNull: ['$calculation', []] },
|
|
34
|
+
initialValue: 0,
|
|
35
|
+
in: { $add: ['$$value', { $ifNull: ['$$this.amount', 0] }] },
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
pipeline.push({
|
|
42
|
+
$group: {
|
|
43
|
+
_id: {
|
|
44
|
+
date: { $dateToString: { format: '%Y-%m-%d', date: `$${dateField}` } },
|
|
45
|
+
currency: '$currencyCode',
|
|
46
|
+
},
|
|
47
|
+
totalAmount: { $sum: '$orderTotal' },
|
|
48
|
+
count: { $sum: 1 },
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
pipeline.push({
|
|
53
|
+
$project: {
|
|
54
|
+
_id: 0,
|
|
55
|
+
date: '$_id.date',
|
|
56
|
+
total: { amount: '$totalAmount', currencyCode: '$_id.currency' },
|
|
57
|
+
count: 1,
|
|
58
|
+
},
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
pipeline.push({ $sort: { date: 1 } });
|
|
62
|
+
return modules.orders.aggregateOrders({ pipeline });
|
|
63
|
+
}
|
|
64
|
+
// Just count total orders
|
|
65
|
+
pipeline.push({ $count: 'count' });
|
|
66
|
+
const result = await modules.orders.aggregateOrders({ pipeline });
|
|
67
|
+
return result[0]?.count ?? 0;
|
|
68
|
+
}
|
|
69
|
+
export const OrderStatistics = {
|
|
70
|
+
newCount: async ({ dateRange }, _p, { modules }: Context) =>
|
|
71
|
+
aggregateOrders(modules, 'created', dateRange, { includeCarts: true }),
|
|
72
|
+
|
|
73
|
+
checkoutCount: async ({ dateRange }, _p, { modules }: Context) =>
|
|
74
|
+
aggregateOrders(modules, 'ordered', dateRange),
|
|
75
|
+
|
|
76
|
+
rejectCount: async ({ dateRange }, _p, { modules }: Context) =>
|
|
77
|
+
aggregateOrders(modules, 'rejected', dateRange),
|
|
78
|
+
|
|
79
|
+
confirmCount: async ({ dateRange }, _p, { modules }: Context) =>
|
|
80
|
+
aggregateOrders(modules, 'confirmed', dateRange),
|
|
81
|
+
|
|
82
|
+
fulfillCount: async ({ dateRange }, _p, { modules }: Context) =>
|
|
83
|
+
aggregateOrders(modules, 'fullfilled', dateRange),
|
|
84
|
+
|
|
85
|
+
newRecords: async ({ dateRange }, _p, { modules }: Context) =>
|
|
86
|
+
aggregateOrders(modules, 'created', dateRange, { includeAmount: true, includeCarts: true }),
|
|
87
|
+
|
|
88
|
+
checkoutRecords: async ({ dateRange }, _p, { modules }: Context) =>
|
|
89
|
+
aggregateOrders(modules, 'ordered', dateRange, { includeAmount: true }),
|
|
90
|
+
|
|
91
|
+
rejectRecords: async ({ dateRange }, _p, { modules }: Context) =>
|
|
92
|
+
aggregateOrders(modules, 'rejected', dateRange, { includeAmount: true }),
|
|
93
|
+
|
|
94
|
+
confirmRecords: async ({ dateRange }, _p, { modules }: Context) =>
|
|
95
|
+
aggregateOrders(modules, 'confirmed', dateRange, { includeAmount: true }),
|
|
96
|
+
|
|
97
|
+
fulfilledRecords: async ({ dateRange }, _p, { modules }: Context) =>
|
|
98
|
+
aggregateOrders(modules, 'fullfilled', dateRange, { includeAmount: true }),
|
|
99
|
+
};
|
package/src/schema/query.ts
CHANGED
|
@@ -480,14 +480,14 @@ export default [
|
|
|
480
480
|
limit: Int = 10
|
|
481
481
|
offset: Int = 0
|
|
482
482
|
queryString: String
|
|
483
|
-
created:
|
|
483
|
+
created: DateFilterInput
|
|
484
484
|
sort: [SortOptionInput!]
|
|
485
485
|
): [Event!]!
|
|
486
486
|
|
|
487
487
|
"""
|
|
488
488
|
Get total count of all emitted events
|
|
489
489
|
"""
|
|
490
|
-
eventsCount(types: [String!], queryString: String, created:
|
|
490
|
+
eventsCount(types: [String!], queryString: String, created: DateFilterInput): Int!
|
|
491
491
|
|
|
492
492
|
"""
|
|
493
493
|
Determines if a token is valid/active for reset password
|
|
@@ -11,9 +11,15 @@ export default [
|
|
|
11
11
|
created: Timestamp!
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
+
type EventStatisticReport {
|
|
15
|
+
date: Date!
|
|
16
|
+
count: Int!
|
|
17
|
+
}
|
|
18
|
+
|
|
14
19
|
type EventStatistics {
|
|
15
|
-
|
|
20
|
+
detail: [EventStatisticReport!]!
|
|
16
21
|
emitCount: Int!
|
|
22
|
+
type: String
|
|
17
23
|
}
|
|
18
24
|
`,
|
|
19
25
|
];
|
|
@@ -81,13 +81,21 @@ export default [
|
|
|
81
81
|
updated: DateTime
|
|
82
82
|
user: User
|
|
83
83
|
}
|
|
84
|
-
|
|
84
|
+
type OrderStatisticsRecord {
|
|
85
|
+
date: String!
|
|
86
|
+
total: Price!
|
|
87
|
+
}
|
|
85
88
|
type OrderStatistics {
|
|
86
89
|
newCount: Int!
|
|
87
90
|
checkoutCount: Int!
|
|
88
91
|
rejectCount: Int!
|
|
89
92
|
confirmCount: Int!
|
|
90
93
|
fulfillCount: Int!
|
|
94
|
+
confirmRecords: [OrderStatisticsRecord!]!
|
|
95
|
+
checkoutRecords: [OrderStatisticsRecord!]!
|
|
96
|
+
rejectRecords: [OrderStatisticsRecord!]!
|
|
97
|
+
newRecords: [OrderStatisticsRecord!]!
|
|
98
|
+
fulfilledRecords: [OrderStatisticsRecord!]!
|
|
91
99
|
}
|
|
92
100
|
`,
|
|
93
101
|
];
|