@unchainedshop/api 1.2.18 → 1.2.21
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/createBulkImportServer.js +3 -3
- package/lib/createBulkImportServer.js.map +1 -1
- package/lib/resolvers/queries/events/eventsCounts.js +4 -3
- package/lib/resolvers/queries/events/eventsCounts.js.map +1 -1
- package/lib/resolvers/queries/filters/searchProducts.d.ts +1 -0
- package/lib/resolvers/queries/filters/searchProducts.js +3 -3
- package/lib/resolvers/queries/filters/searchProducts.js.map +1 -1
- package/lib/resolvers/type/assortment/assortment-types.d.ts +1 -0
- package/lib/resolvers/type/assortment/assortment-types.js.map +1 -1
- package/package.json +11 -11
- package/src/createBulkImportServer.ts +3 -3
- package/src/resolvers/queries/events/eventsCounts.ts +4 -6
- package/src/resolvers/queries/filters/searchProducts.ts +5 -3
- package/src/resolvers/type/assortment/assortment-types.ts +1 -0
|
@@ -3,8 +3,8 @@ import fs from 'fs';
|
|
|
3
3
|
import { checkAction } from './acl';
|
|
4
4
|
import { actions } from './roles';
|
|
5
5
|
import { useMiddlewareWithCurrentContext } from './context';
|
|
6
|
-
const logger = createLogger('unchained:
|
|
7
|
-
const { BULK_IMPORT_API_PATH = '/bulk-import' } = process.env;
|
|
6
|
+
const logger = createLogger('unchained:bulk-import');
|
|
7
|
+
const { BULK_IMPORT_API_PATH = '/bulk-import', BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
|
|
8
8
|
const errorHandler = (res) => (e) => {
|
|
9
9
|
logger.error(e.message);
|
|
10
10
|
res.writeHead(503);
|
|
@@ -39,7 +39,7 @@ const bulkImportMiddleware = async (req, res) => {
|
|
|
39
39
|
const input = {
|
|
40
40
|
createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
|
|
41
41
|
skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
|
|
42
|
-
fsPayloadCacheDirectory:
|
|
42
|
+
fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
|
|
43
43
|
remoteAddress: resolvedContext.remoteAddress,
|
|
44
44
|
};
|
|
45
45
|
const stream = input.fsPayloadCacheDirectory
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBulkImportServer.js","sourceRoot":"","sources":["../src/createBulkImportServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,+BAA+B,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,MAAM,GAAG,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"createBulkImportServer.js","sourceRoot":"","sources":["../src/createBulkImportServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
const logger = createLogger('unchained:api');
|
|
1
|
+
import { log } from '@unchainedshop/logger';
|
|
3
2
|
export default async function eventsCount(root, params, { modules, userId }) {
|
|
4
|
-
|
|
3
|
+
log(`query eventsCount queryString: ${params.queryString} types: ${params.types} ${userId}`, {
|
|
4
|
+
userId,
|
|
5
|
+
});
|
|
5
6
|
return modules.events.count(params);
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=eventsCounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsCounts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventsCounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"eventsCounts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventsCounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,IAAU,EAAE,MAAkB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAW;IACpG,GAAG,CAAC,mCAAmC,MAAM,CAAC,WAAW,YAAY,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,EAAE;QAC9F,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { QueryStringRequiredError } from '../../../errors';
|
|
|
3
3
|
export default async function searchProducts(root, query, context) {
|
|
4
4
|
const { modules, userId } = context;
|
|
5
5
|
const forceLiveCollection = false;
|
|
6
|
-
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments } = query;
|
|
6
|
+
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments, ...rest } = query;
|
|
7
7
|
log(`query search ${assortmentId} ${JSON.stringify(query)}`, { userId });
|
|
8
8
|
if (assortmentId) {
|
|
9
9
|
const productIds = await modules.assortments.findProductIds({
|
|
@@ -14,10 +14,10 @@ export default async function searchProducts(root, query, context) {
|
|
|
14
14
|
const filterIds = await modules.assortments.filters.findFilterIds({
|
|
15
15
|
assortmentId,
|
|
16
16
|
});
|
|
17
|
-
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, productIds, filterIds }, { forceLiveCollection }, context);
|
|
17
|
+
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, productIds, filterIds, ...rest }, { forceLiveCollection }, context);
|
|
18
18
|
}
|
|
19
19
|
if (!queryString)
|
|
20
20
|
throw new QueryStringRequiredError({});
|
|
21
|
-
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery }, { forceLiveCollection }, context);
|
|
21
|
+
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, ...rest }, { forceLiveCollection }, context);
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=searchProducts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/filters/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,
|
|
1
|
+
{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/filters/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,KAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,mBAAmB,GAAG,KAAK,CAAC;IAClC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,IAAI,EAAE,GAChG,KAAK,CAAC;IAER,GAAG,CAAC,gBAAgB,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzE,IAAI,YAAY,EAAE;QAChB,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;YAC1D,YAAY;YACZ,mBAAmB;YACnB,sBAAsB;SACvB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;YAChE,YAAY;SACb,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAC1C,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAC7E,EAAE,mBAAmB,EAAE,EACvB,OAAO,CACR,CAAC;KACH;IAED,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAEzD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAC1C,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,EACtD,EAAE,mBAAmB,EAAE,EACvB,OAAO,CACR,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-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": "1.2.
|
|
3
|
+
"version": "1.2.21",
|
|
4
4
|
"main": "lib/api-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/api-index.js",
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
"graphql": "^15.x"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@unchainedshop/core": "^1.2.
|
|
38
|
-
"@unchainedshop/events": "^1.2.
|
|
39
|
-
"@unchainedshop/logger": "^1.2.
|
|
40
|
-
"@unchainedshop/roles": "^1.2.
|
|
41
|
-
"@unchainedshop/utils": "^1.2.
|
|
37
|
+
"@unchainedshop/core": "^1.2.21",
|
|
38
|
+
"@unchainedshop/events": "^1.2.21",
|
|
39
|
+
"@unchainedshop/logger": "^1.2.21",
|
|
40
|
+
"@unchainedshop/roles": "^1.2.21",
|
|
41
|
+
"@unchainedshop/utils": "^1.2.21",
|
|
42
42
|
"accounting": "0.4.1",
|
|
43
43
|
"dataloader": "^2.1.0",
|
|
44
44
|
"graphql-scalars": "^1.18.0",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/graphql-upload": "^8.0.11",
|
|
52
52
|
"@types/locale": "^0.1.1",
|
|
53
|
-
"@types/node": "^16.11.
|
|
54
|
-
"@unchainedshop/types": "^1.2.
|
|
53
|
+
"@types/node": "^16.11.57",
|
|
54
|
+
"@unchainedshop/types": "^1.2.21",
|
|
55
55
|
"apollo-server-express": "2.x",
|
|
56
56
|
"graphql": "^15.8.0",
|
|
57
|
-
"jest": "^
|
|
57
|
+
"jest": "^29.0.2",
|
|
58
58
|
"ts-jest": "^28.0.8",
|
|
59
|
-
"typescript": "^4.
|
|
59
|
+
"typescript": "^4.8.2"
|
|
60
60
|
}
|
|
61
|
-
}
|
|
61
|
+
}
|
|
@@ -7,9 +7,9 @@ import { actions } from './roles';
|
|
|
7
7
|
|
|
8
8
|
import { useMiddlewareWithCurrentContext } from './context';
|
|
9
9
|
|
|
10
|
-
const logger = createLogger('unchained:
|
|
10
|
+
const logger = createLogger('unchained:bulk-import');
|
|
11
11
|
|
|
12
|
-
const { BULK_IMPORT_API_PATH = '/bulk-import' } = process.env;
|
|
12
|
+
const { BULK_IMPORT_API_PATH = '/bulk-import', BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
|
|
13
13
|
|
|
14
14
|
const errorHandler = (res) => (e) => {
|
|
15
15
|
logger.error(e.message);
|
|
@@ -51,7 +51,7 @@ const bulkImportMiddleware = async (req, res) => {
|
|
|
51
51
|
const input: any = {
|
|
52
52
|
createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
|
|
53
53
|
skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
|
|
54
|
-
fsPayloadCacheDirectory:
|
|
54
|
+
fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
|
|
55
55
|
remoteAddress: resolvedContext.remoteAddress,
|
|
56
56
|
};
|
|
57
57
|
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { log } from '@unchainedshop/logger';
|
|
2
2
|
import { Root, Context } from '@unchainedshop/types/api';
|
|
3
3
|
import { EventQuery } from '@unchainedshop/types/events';
|
|
4
4
|
|
|
5
|
-
const logger = createLogger('unchained:api');
|
|
6
|
-
|
|
7
5
|
export default async function eventsCount(root: Root, params: EventQuery, { modules, userId }: Context) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
);
|
|
6
|
+
log(`query eventsCount queryString: ${params.queryString} types: ${params.types} ${userId}`, {
|
|
7
|
+
userId,
|
|
8
|
+
});
|
|
11
9
|
|
|
12
10
|
return modules.events.count(params);
|
|
13
11
|
}
|
|
@@ -11,12 +11,14 @@ export default async function searchProducts(
|
|
|
11
11
|
ignoreChildAssortments: boolean;
|
|
12
12
|
includeInactive: boolean;
|
|
13
13
|
queryString?: string;
|
|
14
|
+
orderBy?: string;
|
|
14
15
|
},
|
|
15
16
|
context: Context,
|
|
16
17
|
) {
|
|
17
18
|
const { modules, userId } = context;
|
|
18
19
|
const forceLiveCollection = false;
|
|
19
|
-
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments } =
|
|
20
|
+
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments, ...rest } =
|
|
21
|
+
query;
|
|
20
22
|
|
|
21
23
|
log(`query search ${assortmentId} ${JSON.stringify(query)}`, { userId });
|
|
22
24
|
|
|
@@ -30,7 +32,7 @@ export default async function searchProducts(
|
|
|
30
32
|
assortmentId,
|
|
31
33
|
});
|
|
32
34
|
return modules.filters.search.searchProducts(
|
|
33
|
-
{ queryString, includeInactive, filterQuery, productIds, filterIds },
|
|
35
|
+
{ queryString, includeInactive, filterQuery, productIds, filterIds, ...rest },
|
|
34
36
|
{ forceLiveCollection },
|
|
35
37
|
context,
|
|
36
38
|
);
|
|
@@ -39,7 +41,7 @@ export default async function searchProducts(
|
|
|
39
41
|
if (!queryString) throw new QueryStringRequiredError({});
|
|
40
42
|
|
|
41
43
|
return modules.filters.search.searchProducts(
|
|
42
|
-
{ queryString, includeInactive, filterQuery },
|
|
44
|
+
{ queryString, includeInactive, filterQuery, ...rest },
|
|
43
45
|
{ forceLiveCollection },
|
|
44
46
|
context,
|
|
45
47
|
);
|