@unchainedshop/api 1.2.32 → 1.2.41

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.
@@ -7,6 +7,6 @@ export default async function emptyCart(root, { orderId }, context) {
7
7
  if (!cart)
8
8
  return null;
9
9
  await modules.orders.positions.removePositions({ orderId: cart._id }, context);
10
- return cart;
10
+ return modules.orders.findOrder({ orderId: cart._id });
11
11
  }
12
12
  //# sourceMappingURL=emptyCart.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAU,EACV,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAE/E,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAU,EACV,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE1C,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AACzD,CAAC"}
@@ -16,11 +16,10 @@ export const Assortment = {
16
16
  });
17
17
  const assortmentIds = assortmentChildrenIds.map(({ childAssortmentId }) => childAssortmentId);
18
18
  const selector = {
19
- _id: { $in: assortmentIds },
19
+ assortmentIds,
20
+ includeInactive,
21
+ includeLeaves: true,
20
22
  };
21
- if (!includeInactive) {
22
- selector.isActive = true;
23
- }
24
23
  return modules.assortments.count(selector);
25
24
  },
26
25
  filterAssignments: async (obj, _, { modules }) => {
@@ -1 +1 @@
1
- {"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"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"}
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.32",
3
+ "version": "1.2.41",
4
4
  "main": "lib/api-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/api-index.js",
@@ -34,28 +34,28 @@
34
34
  "graphql": "^15.x"
35
35
  },
36
36
  "dependencies": {
37
- "@unchainedshop/core": "^1.2.31",
38
- "@unchainedshop/events": "^1.2.31",
39
- "@unchainedshop/logger": "^1.2.31",
40
- "@unchainedshop/roles": "^1.2.31",
41
- "@unchainedshop/utils": "^1.2.31",
37
+ "@unchainedshop/core": "^1.2.41",
38
+ "@unchainedshop/events": "^1.2.41",
39
+ "@unchainedshop/logger": "^1.2.41",
40
+ "@unchainedshop/roles": "^1.2.41",
41
+ "@unchainedshop/utils": "^1.2.41",
42
42
  "accounting": "0.4.1",
43
43
  "dataloader": "^2.1.0",
44
- "graphql-scalars": "^1.18.0",
44
+ "graphql-scalars": "^1.20.0",
45
45
  "graphql-upload": "^13.0.0",
46
46
  "locale": "0.1.0",
47
47
  "lodash.isnumber": "3.0.3",
48
48
  "lru-cache": "^7.14.0"
49
49
  },
50
50
  "devDependencies": {
51
- "@types/graphql-upload": "^8.0.11",
51
+ "@types/graphql-upload": "^8.0.12",
52
52
  "@types/locale": "^0.1.1",
53
- "@types/node": "^16.11.64",
54
- "@unchainedshop/types": "^1.2.32",
55
- "apollo-server-express": "2.x",
53
+ "@types/node": "^16.18.0",
54
+ "@unchainedshop/types": "^1.2.41",
55
+ "apollo-server-express": "^2.26.0",
56
56
  "graphql": "^15.8.0",
57
- "jest": "^29.0.2",
58
- "ts-jest": "^28.0.8",
57
+ "jest": "^29.2.1",
58
+ "ts-jest": "^29.0.3",
59
59
  "typescript": "^4.8.4"
60
60
  }
61
61
  }
@@ -15,6 +15,5 @@ export default async function emptyCart(
15
15
  if (!cart) return null;
16
16
 
17
17
  await modules.orders.positions.removePositions({ orderId: cart._id }, context);
18
-
19
- return cart;
18
+ return modules.orders.findOrder({ orderId: cart._id });
20
19
  }
@@ -68,11 +68,10 @@ export const Assortment: AssortmentHelperTypes = {
68
68
  const assortmentIds = assortmentChildrenIds.map(({ childAssortmentId }) => childAssortmentId);
69
69
 
70
70
  const selector: Query = {
71
- _id: { $in: assortmentIds },
71
+ assortmentIds,
72
+ includeInactive,
73
+ includeLeaves: true,
72
74
  };
73
- if (!includeInactive) {
74
- selector.isActive = true;
75
- }
76
75
 
77
76
  return modules.assortments.count(selector);
78
77
  },